rmontanana/Pyclassifiers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fit & predict with discretized datasets

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2024-05-27 12:00:09 +02:00
parent 99c57d95f3
commit 235c345e87
5 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/TestPythonClassifiers.cc
View File

@@ -13,7 +13,7 @@
#include "pyclfs/ODTE.h"
#include "TestUtils.h"
const std::string ACTUAL_VERSION = "1.0.4";
const std::string ACTUAL_VERSION = "1.0.5";
TEST_CASE("Test Python Classifiers score", "[PyClassifiers]")
{
@@ -60,19 +60,27 @@ TEST_CASE("Test Python Classifiers score", "[PyClassifiers]")
}
TEST_CASE("Classifiers features", "[PyClassifiers]")
{
auto raw = RawDatasets("iris", true);
auto raw = RawDatasets("iris", false);
auto clf = pywrap::STree();
clf.fit(raw.Xt, raw.yt, raw.featurest, raw.classNamet, raw.statest);
REQUIRE(clf.getNumberOfNodes() == 3);
REQUIRE(clf.getNumberOfEdges() == 2);
REQUIRE(clf.getNumberOfNodes() == 5);
REQUIRE(clf.getNumberOfEdges() == 3);
}
TEST_CASE("Get num features & num edges", "[PyClassifiers]")
{
auto raw = RawDatasets("iris", true);
auto raw = RawDatasets("iris", false);
auto clf = pywrap::ODTE();
clf.fit(raw.Xt, raw.yt, raw.featurest, raw.classNamet, raw.statest);
REQUIRE(clf.getNumberOfNodes() == 10);
REQUIRE(clf.getNumberOfEdges() == 10);
REQUIRE(clf.getNumberOfNodes() == 50);
REQUIRE(clf.getNumberOfEdges() == 30);
}
TEST_CASE("Classifier with discretized dataset", "[PyClassifiers]")
{
auto raw = RawDatasets("iris", true);
auto clf = pywrap::SVC();
clf.fit(raw.Xt, raw.yt, raw.featurest, raw.classNamet, raw.statest);
auto score = clf.score(raw.Xt, raw.yt);
REQUIRE(score == Catch::Approx(0.96667f).epsilon(raw.epsilon));
}
// TEST_CASE("XGBoost", "[PyClassifiers]")
// {