Back to random behavior

Author: GiovaGa

include/graphblas/algorithms/simulated_annealing_re.hpp

@@ -147,15 +147,14 @@ namespace grb {
 			std::minstd_rand rng;
 			std::exponential_distribution< EnergyType > rand ( 1.0 );
 
-			rng.seed( seed + s*n_replicas );
+			rng.seed( seed + s );
 			const EnergyType myrand = -rand( rng );
 
 			for( size_t si = nprocs ; rc == grb::SUCCESS && si > 0; --si ){
 				if( si-1 == s ){
 					for( size_t i = n_replicas - 1 ; i > 0 ; --i ){
 						const EnergyType de = ( energies[ i ] - energies[ i-1 ]) * (betas[ i ] - betas[ i-1 ]);
 
-						rng.seed( seed + s*n_replicas + i );
 						if( -rand( rng ) < de ){
 							std::swap( states[i], states[i-1] );
 							std::swap( energies[i], energies[i-1] );
@@ -314,10 +313,6 @@ namespace grb {
 			for( size_t i_sweep = 0 ; rc == grb::SUCCESS && i_sweep < n_sweeps ; ++i_sweep ){
 				for( size_t j = 0 ; j < n_replicas ; ++j ){
 
-					const int seedi = i_sweep*n_procs*n_replicas + n_replicas*s + j;
-
-					std::get<8>(sweep_data).seed(seedi);
-
 					energies[j] += sweep( states[j], betas[j], sweep_data );
 					grb::wait();
 

tests/smoke/simulated_annealing_re_from_mpi.cpp

@@ -445,23 +445,21 @@ void grbProgram(
     }
 
     // seed RNGs (C and C++ engines) using requested seed (hardcoded default 8 if not provided)
-    std::minstd_rand rng ( data_in.seed ); // rng or std::mt19937
+    std::minstd_rand rng ( data_in.seed + s ); // rng or std::mt19937
 
     // create states storage and initialize with random 1/0 values
     const size_t n_replicas = data_in.n_replicas;
     std::vector< grb::Vector< IOType, internal_backend > > states0;
     std::vector< grb::Vector< IOType, internal_backend > > states;
     std::vector< IOType > rand_data (n);
-    for ( size_t r = 0; r < nprocs * n_replicas; ++r ) {
+    for ( size_t r = 0; r < n_replicas; ++r ) {
         // initialize with random values
         std::uniform_int_distribution< IOType > randint(0,1);
         // we use buildvectorUnique with a random set of indices
         for ( size_t i = 0; i < n; ++i ) {
             rand_data[i] = randint( rng );
         }
 
-		if( r/n_replicas != s ) continue;
-
         states.emplace_back( n );
         states0.emplace_back( n );
         rc = rc ? rc : grb::buildVector(