From 515389663edbe8154c093c656802f6ddc0ae484a Mon Sep 17 00:00:00 2001 From: AYESDIE <34449856+AYESDIE@users.noreply.github.com> Date: Fri, 9 Nov 2018 14:27:58 +0530 Subject: [PATCH 1/2] updated main_test/cf_test.cpp --- src/mlpack/tests/main_tests/cf_test.cpp | 32 +++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/mlpack/tests/main_tests/cf_test.cpp b/src/mlpack/tests/main_tests/cf_test.cpp index 2d6bb925d5..3ee819ed38 100644 --- a/src/mlpack/tests/main_tests/cf_test.cpp +++ b/src/mlpack/tests/main_tests/cf_test.cpp @@ -476,7 +476,7 @@ BOOST_AUTO_TEST_CASE(CFInterpolationTest) // Query with different interpolation types. ResetSettings(); - // Using average interplation algorithm. + // Using average interpolation algorithm. SetInputParam("training", dataset); SetInputParam("max_iterations", int(10)); SetInputParam("query", query); @@ -490,11 +490,14 @@ BOOST_AUTO_TEST_CASE(CFInterpolationTest) BOOST_REQUIRE_EQUAL(output1.n_rows, 5); BOOST_REQUIRE_EQUAL(output1.n_cols, 7); - ResetSettings(); + // Reset passed parameters. + CLI::GetSingleton().Parameters()["training"].wasPassed = false; + CLI::GetSingleton().Parameters()["max_iterations"].wasPassed = false; + CLI::GetSingleton().Parameters()["algorithm"].wasPassed = false; // Using regression interpolation algorithm. - SetInputParam("training", dataset); - SetInputParam("max_iterations", int(10)); + SetInputParam("input_model", + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("interpolation", std::string("regression")); SetInputParam("recommendations", 5); @@ -506,11 +509,9 @@ BOOST_AUTO_TEST_CASE(CFInterpolationTest) BOOST_REQUIRE_EQUAL(output2.n_rows, 5); BOOST_REQUIRE_EQUAL(output2.n_cols, 7); - ResetSettings(); - // Using similarity interpolation algorithm. - SetInputParam("training", dataset); - SetInputParam("max_iterations", int(10)); + SetInputParam("input_model", + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("interpolation", std::string("similarity")); SetInputParam("recommendations", 5); @@ -577,11 +578,14 @@ BOOST_AUTO_TEST_CASE(CFNeighborSearchTest) BOOST_REQUIRE_EQUAL(output1.n_rows, 5); BOOST_REQUIRE_EQUAL(output1.n_cols, 7); - ResetSettings(); + // Reset passed parameters. + CLI::GetSingleton().Parameters()["training"].wasPassed = false; + CLI::GetSingleton().Parameters()["max_iterations"].wasPassed = false; + CLI::GetSingleton().Parameters()["algorithm"].wasPassed = false; // Using cosine neighbor search algorithm. - SetInputParam("training", dataset); - SetInputParam("max_iterations", int(10)); + SetInputParam("input_model", + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("neighbor_search", std::string("cosine")); SetInputParam("recommendations", 5); @@ -593,11 +597,9 @@ BOOST_AUTO_TEST_CASE(CFNeighborSearchTest) BOOST_REQUIRE_EQUAL(output2.n_rows, 5); BOOST_REQUIRE_EQUAL(output2.n_cols, 7); - ResetSettings(); - // Using pearson neighbor search algorithm. - SetInputParam("training", dataset); - SetInputParam("max_iterations", int(10)); + SetInputParam("input_model", + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("neighbor_search", std::string("pearson")); SetInputParam("recommendations", 5); From 9296282c90c9628f73074587c038263c7e2ce5c9 Mon Sep 17 00:00:00 2001 From: AYESDIE <34449856+AYESDIE@users.noreply.github.com> Date: Fri, 9 Nov 2018 14:34:12 +0530 Subject: [PATCH 2/2] syntax patch --- src/mlpack/tests/main_tests/cf_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mlpack/tests/main_tests/cf_test.cpp b/src/mlpack/tests/main_tests/cf_test.cpp index 3ee819ed38..8a9837800d 100644 --- a/src/mlpack/tests/main_tests/cf_test.cpp +++ b/src/mlpack/tests/main_tests/cf_test.cpp @@ -497,7 +497,7 @@ BOOST_AUTO_TEST_CASE(CFInterpolationTest) // Using regression interpolation algorithm. SetInputParam("input_model", - std::move(CLI::GetParam("output_model"))); + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("interpolation", std::string("regression")); SetInputParam("recommendations", 5); @@ -511,7 +511,7 @@ BOOST_AUTO_TEST_CASE(CFInterpolationTest) // Using similarity interpolation algorithm. SetInputParam("input_model", - std::move(CLI::GetParam("output_model"))); + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("interpolation", std::string("similarity")); SetInputParam("recommendations", 5); @@ -585,7 +585,7 @@ BOOST_AUTO_TEST_CASE(CFNeighborSearchTest) // Using cosine neighbor search algorithm. SetInputParam("input_model", - std::move(CLI::GetParam("output_model"))); + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("neighbor_search", std::string("cosine")); SetInputParam("recommendations", 5); @@ -599,7 +599,7 @@ BOOST_AUTO_TEST_CASE(CFNeighborSearchTest) // Using pearson neighbor search algorithm. SetInputParam("input_model", - std::move(CLI::GetParam("output_model"))); + std::move(CLI::GetParam("output_model"))); SetInputParam("query", query); SetInputParam("neighbor_search", std::string("pearson")); SetInputParam("recommendations", 5);