From 4006974684e5a0c9bfc750356cd237290a0bd2d3 Mon Sep 17 00:00:00 2001 From: Viktor Gal Date: Thu, 22 Feb 2018 12:16:24 +0100 Subject: [PATCH] check deserialization result --- data | 2 +- examples/meta/src/multiclass/random_forest.sg | 2 ++ tests/meta/tester.cpp | 18 +++++++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/data b/data index 7fecaa29f5a..94d2b33267f 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 7fecaa29f5a2eb34191b05613e7f7ce717e64d0b +Subproject commit 94d2b33267f9cb4d84d0d4fa2ecb93920c46710a diff --git a/examples/meta/src/multiclass/random_forest.sg b/examples/meta/src/multiclass/random_forest.sg index ceb4a4437aa..920d2387ce9 100644 --- a/examples/meta/src/multiclass/random_forest.sg +++ b/examples/meta/src/multiclass/random_forest.sg @@ -3,6 +3,8 @@ 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) +Parallel p = get_global_parallel() +p.set_num_threads(1) #![create_features] RealFeatures features_train(f_feats_train) diff --git a/tests/meta/tester.cpp b/tests/meta/tester.cpp index 7a1bb6da618..d436fd2418d 100644 --- a/tests/meta/tester.cpp +++ b/tests/meta/tester.cpp @@ -12,34 +12,38 @@ int main(int argc, const char *argv[]) { if (argc != 6) cout << "Usage: tester REL_DIR NAME TARGET GENERATED_RESULTS_DIR REFERENCE_RESULTS_DIR" << endl; - + string rel_dir = argv[1]; string name = argv[2]; string target = argv[3]; string generated_results_dir = argv[4]; string reference_results_dir = argv[5]; - + stringstream os; os << generated_results_dir << "/" << target << "/" << rel_dir << "/" << name; string fname_full_generated = os.str(); os.str(""); os << reference_results_dir << "/" << rel_dir << "/" << name; string fname_full_reference = os.str(); - + init_shogun_with_defaults(); CSerializableAsciiFile* f = new CSerializableAsciiFile(fname_full_generated.c_str(), 'r'); CSerializableAsciiFile* f_ref = new CSerializableAsciiFile(fname_full_reference.c_str(), 'r'); SG_REF(f); SG_REF(f_ref); - + CDynamicObjectArray* a = new CDynamicObjectArray(); CDynamicObjectArray* a_ref = new CDynamicObjectArray(); SG_REF(a); SG_REF(a_ref); - - a->load_serializable(f); - a_ref->load_serializable(f_ref); + + if (!a->load_serializable(f)) + SG_SERROR("Error while deserializing the generated input: %s\n", + fname_full_generated.c_str()); + if (!a_ref->load_serializable(f_ref)) + SG_SERROR("Error while deserializing the reference input: %s\n", + fname_full_reference.c_str()); // allow for lossy serialization format set_global_fequals_epsilon(1e-7);