add explicit random engine

shogun-toolbox · Feb 22, 2018 · 2270774 · 2270774
1 parent 8524a78
commit 2270774
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/shogun/distributions/classical/GaussianDistribution.cpp b/src/shogun/distributions/classical/GaussianDistribution.cpp
@@ -165,7 +165,7 @@ SGVector<float64_t> CGaussianDistribution::log_pdf_multiple(SGMatrix<float64_t>
 
 void CGaussianDistribution::init()
 {
-	m_rng = get_prng();
+	m_rng = get_prng<std::mt19937_64>();
 	SG_ADD(&m_mean, "mean", "Mean of the Gaussian.", MS_NOT_AVAILABLE);
 	SG_ADD(&m_L, "L", "Lower factor of covariance matrix, "
 			"depending on the factorization type.", MS_NOT_AVAILABLE);

diff --git a/src/shogun/features/streaming/generators/GaussianBlobsDataGenerator.cpp b/src/shogun/features/streaming/generators/GaussianBlobsDataGenerator.cpp
@@ -70,7 +70,7 @@ void CGaussianBlobsDataGenerator::init()
 	m_stretch=1;
 	m_angle=0;
 	m_cholesky=SGMatrix<float64_t>(2, 2);
-	m_rng = get_prng();
+	m_rng = get_prng<std::mt19937_64>();
 	m_cholesky(0, 0)=1;
 	m_cholesky(0, 1)=0;
 	m_cholesky(1, 0)=0;

diff --git a/src/shogun/features/streaming/generators/MeanShiftDataGenerator.cpp b/src/shogun/features/streaming/generators/MeanShiftDataGenerator.cpp
@@ -47,7 +47,7 @@ void CMeanShiftDataGenerator::init()
 	SG_ADD(&m_dimension_shift, "m_dimension_shift", "Dimension of mean shift",
 			MS_NOT_AVAILABLE);
 
-	m_rng = get_prng();
+	m_rng = get_prng<std::mt19937_64>();
 	m_dimension=0;
 	m_mean_shift=0;
 	m_dimension_shift=0;

diff --git a/src/shogun/mathematics/Math.h b/src/shogun/mathematics/Math.h
@@ -812,8 +812,8 @@ class CMath : public CSGObject
 		}
 
 		template <
-		    class T,
-		    class RandomGenerator = std::uniform_int_distribution<index_t>>
+			class T,
+			class RandomGenerator = std::uniform_int_distribution<index_t>>
 		static void permute(SGVector<T> v)
 		{
 			auto prng = get_prng();
@@ -825,8 +825,8 @@ class CMath : public CSGObject
 		}
 
 		template <
-		    class T, class RandomGenerator,
-		    class Distribution = std::uniform_int_distribution<index_t>>
+			class T, class RandomGenerator,
+			class Distribution = std::uniform_int_distribution<index_t>>
 		static void permute(SGVector<T> v, RandomGenerator prng)
 		{
 			for (index_t i = 0; i < v.vlen; ++i)

diff --git a/src/shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h b/src/shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h
@@ -97,7 +97,7 @@ class CTraceSampler : public CSGObject
 	{
 		m_num_samples=0;
 		m_dimension=0;
-		m_rng = get_prng();
+		m_rng = get_prng<std::mt19937_64>();
 
 		SG_ADD(&m_num_samples, "num_samples",
 			"Number of samples this sampler can generate", MS_NOT_AVAILABLE);

diff --git a/src/shogun/neuralnets/RBM.cpp b/src/shogun/neuralnets/RBM.cpp
@@ -623,7 +623,7 @@ void CRBM::init()
 	m_visible_state_offsets = new CDynamicArray<int32_t>();
 	m_num_params = 0;
 	m_batch_size = 0;
-	m_rng = get_prng();
+	m_rng = get_prng<std::mt19937_64>();
 
 	SG_ADD(&cd_num_steps, "cd_num_steps", "Number of CD Steps", MS_NOT_AVAILABLE);
 	SG_ADD(&cd_persistent, "cd_persistent", "Whether to use PCD", MS_NOT_AVAILABLE);