diff --git a/lib/folding b/lib/folding index 2ac43e3..9652853 160000 --- a/lib/folding +++ b/lib/folding @@ -1 +1 @@ -Subproject commit 2ac43e32ac1eac0c986702ec526cf5367a565ef0 +Subproject commit 9652853d692ed3b8a38d89f70559209ffb988020 diff --git a/lib/json b/lib/json index 378e091..620034e 160000 --- a/lib/json +++ b/lib/json @@ -1 +1 @@ -Subproject commit 378e091795a70fced276cd882bd8a6a428668fe5 +Subproject commit 620034ececc93991c5c1183b73c3768d81ca84b3 diff --git a/tests/TestBoostAODE.cc b/tests/TestBoostAODE.cc index 73d9048..625ff7f 100644 --- a/tests/TestBoostAODE.cc +++ b/tests/TestBoostAODE.cc @@ -130,14 +130,21 @@ TEST_CASE("Oddities", "[BoostAODE]") { { "select_features","IWSS" }, { "threshold", 0.51 } }, { { "select_features","FCBF" }, { "threshold", 1e-8 } }, { { "select_features","FCBF" }, { "threshold", 1.01 } }, - { { "alpha_block", true }, { "block_update", true } }, - { { "bisection", false }, { "block_update", true } }, }; for (const auto& hyper : bad_hyper_fit.items()) { INFO("BoostAODE hyper: " << hyper.value().dump()); clf.setHyperparameters(hyper.value()); REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing), std::invalid_argument); } + + auto bad_hyper_fit2 = nlohmann::json{ + { { "alpha_block", true }, { "block_update", true } }, + { { "bisection", false }, { "block_update", true } }, + }; + for (const auto& hyper : bad_hyper_fit2.items()) { + INFO("BoostAODE hyper: " << hyper.value().dump()); + REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument); + } } TEST_CASE("Bisection Best", "[BoostAODE]") { diff --git a/tests/TestModulesVersions.cc b/tests/TestModulesVersions.cc index b53167f..cea50aa 100644 --- a/tests/TestModulesVersions.cc +++ b/tests/TestModulesVersions.cc @@ -17,7 +17,7 @@ std::map modules = { { "mdlp", "2.0.1" }, - { "Folding", "1.1.0" }, + { "Folding", "1.1.1" }, { "json", "3.11" }, { "ArffFiles", "1.1.0" } }; diff --git a/tests/lib/catch2 b/tests/lib/catch2 index 506276c..0321d2f 160000 --- a/tests/lib/catch2 +++ b/tests/lib/catch2 @@ -1 +1 @@ -Subproject commit 506276c59217429c93abd2fe9507c7f45eb81072 +Subproject commit 0321d2fce328b5e2ad106a8230ff20e0d5bf5501