Merge branch 'master' of git.stim.ee.uh.edu:codebase/stimlib into merging_VS

Pavel Govyadinov
2 parents ff329642 48a7c780
Showing 3 changed files with 10 additions and 12 deletions Show diff stats
stim/biomodels/nwt_format.pptx
stim/iVote/ivote2.cuh
stim/math/random.h
@@ -64,7 +64,7 @@ namespace stim {
 		}
 		T th_step = ((Imax - Imin) / th_num);
-		vector<T> var_b;
+		std::vector<T> var_b;
 		for (unsigned int t0 = 0; t0 < th_num; t0++) {
 			T th = t0 * th_step + Imin;
 			unsigned int n_b(0), n_o(0);		//these variables save the number of elements that are below and over the threshold
@@ -86,7 +86,7 @@ namespace stim {
 			var_b.push_back(n_b * n_o * pow((m_b - m_o), 2));
 		}
-		vector<float>::iterator max_var = std::max_element(var_b.begin(), var_b.end());	//finding maximum elements in the vector
+		std::vector<float>::iterator max_var = std::max_element(var_b.begin(), var_b.end());	//finding maximum elements in the vector
 		size_t th_idx = std::distance(var_b.begin(), max_var);
 		T threshold = Imin + (T)(th_idx * th_step);
 		return threshold;
@@ -12,25 +12,23 @@ namespace stim{
 template<class T>
 class Random{
 protected:
-	void init(int seed = 0)
-	{
-		if(seed <= 0)
-			srand(time(NULL));
-		else if(seed > 0)
-			srand(time(seed));
-		else
-			std::cout << "Error: Unknown value: in STIM::RANDOM"  << std::endl;
+	void init() {
+		srand(time(NULL));
+	}
+
+	void init(unsigned int seed){
+		srand(seed);
 	}
 public:
 	/// Default Constructor
 	Random(){
-		init(-1);
+		init();
 	}
 	/// Constructor from a seed.
 	/// A positive seed sets, 0 or negative yeilds the 
-	Random(int seed){
+	Random(unsigned int seed){
 		init(seed);
 	}