Refactors master seed mechanism in System

Renames the seed random number gen
fzenke · May 10, 2018 · 9ca0409 · 9ca0409
1 parent 82b0f11
commit 9ca0409
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/auryn/System.cpp b/src/auryn/System.cpp
@@ -112,8 +112,8 @@ void System::init() {
 
 	// init random number generator
 	// gen  = boost::mt19937();
-	dist = new boost::random::uniform_int_distribution<> ();
-	die  = new boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> > ( gen, *dist );
+	seed_dist = new boost::random::uniform_int_distribution<> ();
+	seed_die  = new boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> > ( seed_gen, *seed_dist );
 	unsigned int hardcoded_seed = 3521;
 	set_master_seed(hardcoded_seed);
 
@@ -203,8 +203,8 @@ void System::free()
 		delete syncbuffer;
 #endif // AURYN_CODE_USE_MPI
 
-    delete dist;
-	delete die;
+    delete seed_dist;
+	delete seed_die;
 }
 
 void System::step()
@@ -1006,12 +1006,12 @@ void System::set_master_seed( unsigned int seed )
 	oss << "Seeding this rank with master seed " << rank_master_seed;
 	auryn::logger->msg(oss.str(),INFO);
 
-	gen.seed(rank_master_seed);
+	seed_gen.seed(rank_master_seed);
 }
 
 unsigned int System::get_seed()
 {
-	return (*die)();
+	return (*seed_die)();
 }
 
 unsigned int System::get_synced_seed()

diff --git a/src/auryn/System.h b/src/auryn/System.h
@@ -89,9 +89,9 @@ namespace auryn {
 
 		string outputdir;
 
-		boost::mt19937 gen; 
-		boost::random::uniform_int_distribution<> * dist;
-		boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> > * die;
+		boost::mt19937 seed_gen; 
+		boost::random::uniform_int_distribution<> * seed_dist;
+		boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> > * seed_die;
 
 		double simulation_time_realtime_ratio;