diff --git a/examples/meta/generator/translate.py b/examples/meta/generator/translate.py index 10b4c4a16ac..c3886eaeb40 100644 --- a/examples/meta/generator/translate.py +++ b/examples/meta/generator/translate.py @@ -81,7 +81,7 @@ def getSGTypesToStore(): def getSGTypeToStoreMethodName(sgType): """ Translates given SG* type into meta language type """ assert sgType in getSGTypesToStore() - + if sgType=="RealVector": return "real_vector" elif sgType=="FloatVector": @@ -90,10 +90,10 @@ def getSGTypeToStoreMethodName(sgType): return "real_matrix" elif sgType=="FloatMatrix": return "float_matrix" - + else: raise RuntimeError("Given Shogun type \"%s\" cannot be translated to meta type", sgType) - + def getVarsToStore(program): """ Extracts all variables in program that should be stored """ @@ -489,7 +489,7 @@ def translateInit(self, init): ) normalArgs = [ - arg for arg in initialisation["ArgumentList"] + arg for arg in initialisation["ArgumentList"] if not "KeywordArgument" in arg ] kwargsString = self.translateKwargs( @@ -560,7 +560,7 @@ def translateExpr(self, expr, returnKwargs=False): elif key == "StringLiteral": template = Template(self.targetDict["Expr"]["StringLiteral"]) return template.substitute(literal=expr[key]) - + elif key == "CharLiteral": template = Template(self.targetDict["Expr"]["CharLiteral"]) return template.substitute(literal=expr[key]) @@ -651,7 +651,7 @@ def translateGlobalCall(self, globalCall, returnKwargs): ) normalArgs = [ - arg for arg in argsList["ArgumentList"] + arg for arg in argsList["ArgumentList"] if not "KeywordArgument" in arg ] kwargsString = self.translateKwargs( diff --git a/examples/meta/src/clustering/gaussian_mixture_models.sg b/examples/meta/src/clustering/gaussian_mixture_models.sg index 7d120b211e1..5dcf462ce5a 100644 --- a/examples/meta/src/clustering/gaussian_mixture_models.sg +++ b/examples/meta/src/clustering/gaussian_mixture_models.sg @@ -1,6 +1,6 @@ CSVFile f_feats_train("../../data/classifier_4class_2d_linear_features_train.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/examples/meta/src/clustering/kmeans.sg b/examples/meta/src/clustering/kmeans.sg index fc452590ef0..6bc5f69e461 100644 --- a/examples/meta/src/clustering/kmeans.sg +++ b/examples/meta/src/clustering/kmeans.sg @@ -1,5 +1,5 @@ CSVFile f_feats_train("../../data/classifier_binary_2d_linear_features_train.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/examples/meta/src/converter/independent_component_analysis_fast.sg b/examples/meta/src/converter/independent_component_analysis_fast.sg index 616f6767275..e053b166608 100644 --- a/examples/meta/src/converter/independent_component_analysis_fast.sg +++ b/examples/meta/src/converter/independent_component_analysis_fast.sg @@ -1,6 +1,6 @@ CSVFile f_feats("../../data/ica_2_sources.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features(f_feats) diff --git a/examples/meta/src/converter/independent_component_analysis_ff_sep.sg b/examples/meta/src/converter/independent_component_analysis_ff_sep.sg index c8d6b47af0d..8732d3520b8 100644 --- a/examples/meta/src/converter/independent_component_analysis_ff_sep.sg +++ b/examples/meta/src/converter/independent_component_analysis_ff_sep.sg @@ -1,6 +1,6 @@ CSVFile f_feats("../../data/ica_2_sources.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features(f_feats) diff --git a/examples/meta/src/converter/independent_component_analysis_jade.sg b/examples/meta/src/converter/independent_component_analysis_jade.sg index 633e0eedf45..7e31c78a06d 100644 --- a/examples/meta/src/converter/independent_component_analysis_jade.sg +++ b/examples/meta/src/converter/independent_component_analysis_jade.sg @@ -1,6 +1,6 @@ CSVFile f_feats("../../data/ica_2_sources.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features(f_feats) diff --git a/examples/meta/src/converter/independent_component_analysis_jedi_sep.sg b/examples/meta/src/converter/independent_component_analysis_jedi_sep.sg index 68501bc9ab5..aea98215566 100644 --- a/examples/meta/src/converter/independent_component_analysis_jedi_sep.sg +++ b/examples/meta/src/converter/independent_component_analysis_jedi_sep.sg @@ -1,6 +1,6 @@ CSVFile f_feats("../../data/ica_2_sources.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features(f_feats) diff --git a/examples/meta/src/converter/independent_component_analysis_sobi.sg b/examples/meta/src/converter/independent_component_analysis_sobi.sg index 51ddd07c713..1d9031933df 100644 --- a/examples/meta/src/converter/independent_component_analysis_sobi.sg +++ b/examples/meta/src/converter/independent_component_analysis_sobi.sg @@ -1,6 +1,6 @@ CSVFile f_feats("../../data/ica_2_sources.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features(f_feats) diff --git a/examples/meta/src/gaussian_process/classifier.sg b/examples/meta/src/gaussian_process/classifier.sg index 65c50803c73..b57c5194976 100644 --- a/examples/meta/src/gaussian_process/classifier.sg +++ b/examples/meta/src/gaussian_process/classifier.sg @@ -2,7 +2,7 @@ CSVFile f_feats_train("../../data/classifier_4class_2d_linear_features_train.dat CSVFile f_feats_test("../../data/classifier_4class_2d_linear_features_test.dat") CSVFile f_labels_train("../../data/classifier_4class_2d_linear_labels_train.dat") CSVFile f_labels_test("../../data/classifier_4class_2d_linear_labels_test.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/examples/meta/src/meta_api/calls.sg b/examples/meta/src/meta_api/calls.sg index 14b0ef034e6..29fae042f0b 100644 --- a/examples/meta/src/meta_api/calls.sg +++ b/examples/meta/src/meta_api/calls.sg @@ -1,9 +1,11 @@ # static call -Math:init_random(1) +# Math:init_random(1) # global function call get_global_io() +set_global_seed(1) + # member function call GaussianKernel k() k.set_width(1) diff --git a/examples/meta/src/multiclass/cartree.sg b/examples/meta/src/multiclass/cartree.sg index 48772e95ec5..7ec91bc39e1 100644 --- a/examples/meta/src/multiclass/cartree.sg +++ b/examples/meta/src/multiclass/cartree.sg @@ -2,7 +2,7 @@ CSVFile f_feats_train("../../data/classifier_4class_2d_linear_features_train.dat CSVFile f_feats_test("../../data/classifier_4class_2d_linear_features_test.dat") CSVFile f_labels_train("../../data/classifier_4class_2d_linear_labels_train.dat") CSVFile f_labels_test("../../data/classifier_4class_2d_linear_labels_test.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/examples/meta/src/multiclass/ecoc_random.sg b/examples/meta/src/multiclass/ecoc_random.sg index 8d9f459ae19..1e91ef0b569 100644 --- a/examples/meta/src/multiclass/ecoc_random.sg +++ b/examples/meta/src/multiclass/ecoc_random.sg @@ -1,4 +1,4 @@ -Math:init_random(1) +set_global_seed(1) CSVFile f_feats_train("../../data/classifier_4class_2d_linear_features_train.dat") CSVFile f_feats_test("../../data/classifier_4class_2d_linear_features_test.dat") diff --git a/examples/meta/src/multiclass/random_forest.sg b/examples/meta/src/multiclass/random_forest.sg index ceb4a4437aa..92857016ebb 100644 --- a/examples/meta/src/multiclass/random_forest.sg +++ b/examples/meta/src/multiclass/random_forest.sg @@ -2,7 +2,7 @@ CSVFile f_feats_train("../../data/classifier_4class_2d_linear_features_train.dat CSVFile f_feats_test("../../data/classifier_4class_2d_linear_features_test.dat") CSVFile f_labels_train("../../data/classifier_4class_2d_linear_labels_train.dat") CSVFile f_labels_test("../../data/classifier_4class_2d_linear_labels_test.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/examples/meta/src/neural_nets/feedforward_net_classification.sg b/examples/meta/src/neural_nets/feedforward_net_classification.sg index bef86f66715..e983bb9a898 100644 --- a/examples/meta/src/neural_nets/feedforward_net_classification.sg +++ b/examples/meta/src/neural_nets/feedforward_net_classification.sg @@ -3,7 +3,7 @@ CSVFile f_feats_test("../../data/classifier_binary_2d_nonlinear_features_test.da CSVFile f_labels_train("../../data/classifier_binary_2d_nonlinear_labels_train.dat") CSVFile f_labels_test("../../data/classifier_binary_2d_nonlinear_labels_test.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/examples/meta/src/neural_nets/feedforward_net_regression.sg b/examples/meta/src/neural_nets/feedforward_net_regression.sg index fca6427d76a..05df346cdce 100644 --- a/examples/meta/src/neural_nets/feedforward_net_regression.sg +++ b/examples/meta/src/neural_nets/feedforward_net_regression.sg @@ -3,7 +3,7 @@ CSVFile f_feats_test("../../data/regression_1d_sinc_features_test_with_9d_noise. CSVFile f_labels_train("../../data/regression_1d_sinc_labels_train.dat") CSVFile f_labels_test("../../data/regression_1d_sinc_labels_test.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/examples/meta/src/regression/random_forest_regression.sg b/examples/meta/src/regression/random_forest_regression.sg index 4f8aa2f3a8e..c659d3d9a53 100644 --- a/examples/meta/src/regression/random_forest_regression.sg +++ b/examples/meta/src/regression/random_forest_regression.sg @@ -2,7 +2,7 @@ CSVFile f_feats_train("../../data/regression_1d_linear_features_train.dat") CSVFile f_feats_test("../../data/regression_1d_linear_features_test.dat") CSVFile f_labels_train("../../data/regression_1d_linear_labels_train.dat") CSVFile f_labels_test("../../data/regression_1d_linear_labels_test.dat") -Math:init_random(1) +set_global_seed(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/tests/unit/environments/RegressionTestEnvironment.h b/tests/unit/environments/RegressionTestEnvironment.h index abba24cc702..7e2632b8d25 100644 --- a/tests/unit/environments/RegressionTestEnvironment.h +++ b/tests/unit/environments/RegressionTestEnvironment.h @@ -54,7 +54,7 @@ class RegressionTestEnvironment : public ::testing::Environment public: virtual void SetUp() { - sg_rand->set_seed(57); + set_global_seed(57); SGMatrix feat_train_data = CDataGenerator::generate_gaussians(n_train, 1, n_dim); diff --git a/tests/unit/lib/DynamicArray_unittest.cc b/tests/unit/lib/DynamicArray_unittest.cc index 3224688ccf7..a5e0305f020 100644 --- a/tests/unit/lib/DynamicArray_unittest.cc +++ b/tests/unit/lib/DynamicArray_unittest.cc @@ -62,9 +62,10 @@ TYPED_TEST(CDynamicArrayFixture, set_array) this->wrapper_array->reset_array(); EXPECT_EQ(this->wrapper_array->get_num_elements(), 0); TypeParam* array = SG_MALLOC(TypeParam, 5); + auto prng = std::unique_ptr(new CRandom()); for (int32_t i = 0; i < 5; i++) { - array[i] = (TypeParam)CMath::random(1, 10); + array[i] = (TypeParam)prng->random(1, 10); } this->wrapper_array->set_array(array, 5); @@ -79,9 +80,10 @@ TYPED_TEST(CDynamicArrayFixture, set_array) TYPED_TEST(CDynamicArrayFixture, const_set_array) { TypeParam* array = SG_MALLOC(TypeParam, 5); + auto prng = std::unique_ptr(new CRandom()); for (int32_t i = 0; i < 5; i++) { - array[i] = (TypeParam)CMath::random(1, 10); + array[i] = (TypeParam)prng->random(1, 10); } const TypeParam* const_array = array; this->wrapper_array->reset_array(); diff --git a/tests/unit/statistical_testing/KernelSelection_unittest.cc b/tests/unit/statistical_testing/KernelSelection_unittest.cc index 8f3816fdfe6..f4433a7a06c 100644 --- a/tests/unit/statistical_testing/KernelSelection_unittest.cc +++ b/tests/unit/statistical_testing/KernelSelection_unittest.cc @@ -320,7 +320,7 @@ TEST(KernelSelectionMaxCrossValidation, quadratic_time_single_kernel_dense) mmd->set_train_test_mode(false); auto selected_kernel=static_cast(mmd->get_kernel()); - EXPECT_NEAR(selected_kernel->get_width(), 0.03125, 1E-10); + EXPECT_NEAR(selected_kernel->get_width(), 0.125, 1E-10); } TEST(KernelSelectionMaxCrossValidation, linear_time_single_kernel_dense) diff --git a/tests/unit/statistical_testing/internals/CrossValidationMMD_unittest.cc b/tests/unit/statistical_testing/internals/CrossValidationMMD_unittest.cc index 8bc81354d28..2cb7d17cd23 100644 --- a/tests/unit/statistical_testing/internals/CrossValidationMMD_unittest.cc +++ b/tests/unit/statistical_testing/internals/CrossValidationMMD_unittest.cc @@ -62,6 +62,7 @@ TEST(CrossValidationMMD, biased_full) const float64_t difference=0.5; const float64_t alpha=0.05; const auto stype=ST_BIASED_FULL; + set_global_seed(12345); auto gen_p=some(0, dim, 0); auto gen_q=some(difference, dim, 0); @@ -92,7 +93,6 @@ TEST(CrossValidationMMD, biased_full) cv.m_num_runs=num_runs; cv.m_rejections=SGMatrix(num_runs*num_folds, num_kernels); - set_global_seed(12345); cv(kernel_mgr); kernel_mgr.unset_precomputed_distance(); @@ -106,7 +106,6 @@ TEST(CrossValidationMMD, biased_full) permutation_mmd.m_stype=stype; permutation_mmd.m_num_null_samples=num_null_samples; - set_global_seed(12345); for (auto k=0; k