From 72e228f36796408db6c77b5f3648f6bca6980698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= Date: Wed, 23 Jul 2025 00:41:36 +0200 Subject: [PATCH] Remove PyClassifiers --- CMakeLists.txt | 2 +- conanfile.py | 2 +- src/CMakeLists.txt | 8 ++++---- src/main/Models.h | 12 ++++++------ src/main/modelRegister.h | 24 ++++++++++++------------ 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15b95b6..08d87d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ find_package(arff-files CONFIG REQUIRED) find_package(fimdlp CONFIG REQUIRED) find_package(folding CONFIG REQUIRED) find_package(bayesnet CONFIG REQUIRED) -find_package(pyclassifiers CONFIG REQUIRED) +# find_package(pyclassifiers CONFIG REQUIRED) find_package(libxlsxwriter CONFIG REQUIRED) find_package(Boost REQUIRED COMPONENTS python) diff --git a/conanfile.py b/conanfile.py index c9f6a79..a7996bd 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,7 +21,7 @@ class PlatformConan(ConanFile): self.requires("fimdlp/2.1.1") self.requires("arff-files/1.2.1") self.requires("bayesnet/1.2.1") - self.requires("pyclassifiers/1.0.3") + # self.requires("pyclassifiers/1.0.3") self.requires("libxlsxwriter/1.2.2") def build_requirements(self): diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f3302ce..1f5657e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,7 @@ add_executable( experimental_clfs/DecisionTree.cpp experimental_clfs/AdaBoost.cpp ) -target_link_libraries(b_best Boost::boost pyclassifiers::pyclassifiers bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy libxlsxwriter::libxlsxwriter) +target_link_libraries(b_best Boost::boost bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy libxlsxwriter::libxlsxwriter) # b_grid set(grid_sources GridSearch.cpp GridData.cpp GridExperiment.cpp GridBase.cpp ) @@ -33,7 +33,7 @@ add_executable(b_grid commands/b_grid.cpp ${grid_sources} experimental_clfs/DecisionTree.cpp experimental_clfs/AdaBoost.cpp ) -target_link_libraries(b_grid ${MPI_CXX_LIBRARIES} pyclassifiers::pyclassifiers bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy) +target_link_libraries(b_grid ${MPI_CXX_LIBRARIES} bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy) # b_list add_executable(b_list commands/b_list.cpp @@ -46,7 +46,7 @@ add_executable(b_list commands/b_list.cpp experimental_clfs/DecisionTree.cpp experimental_clfs/AdaBoost.cpp ) -target_link_libraries(b_list pyclassifiers::pyclassifiers bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy libxlsxwriter::libxlsxwriter) +target_link_libraries(b_list bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy libxlsxwriter::libxlsxwriter) # b_main set(main_sources Experiment.cpp Models.cpp HyperParameters.cpp Scores.cpp ArgumentsExperiment.cpp) @@ -61,7 +61,7 @@ add_executable(b_main commands/b_main.cpp ${main_sources} experimental_clfs/DecisionTree.cpp experimental_clfs/AdaBoost.cpp ) -target_link_libraries(b_main PRIVATE nlohmann_json::nlohmann_json pyclassifiers::pyclassifiers bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy) +target_link_libraries(b_main PRIVATE nlohmann_json::nlohmann_json bayesnet::bayesnet argparse::argparse fimdlp::fimdlp ${Python3_LIBRARIES} torch::torch Boost::python Boost::numpy) # b_manage set(manage_sources ManageScreen.cpp OptionsMenu.cpp ResultsManager.cpp) diff --git a/src/main/Models.h b/src/main/Models.h index 3640a01..bbfd7f4 100644 --- a/src/main/Models.h +++ b/src/main/Models.h @@ -19,12 +19,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +// #include +// #include +// #include +// #include +// #include +// #include #include "../experimental_clfs/XA1DE.h" #include "../experimental_clfs/AdaBoost.h" #include "../experimental_clfs/DecisionTree.h" diff --git a/src/main/modelRegister.h b/src/main/modelRegister.h index 5f44728..26b25ae 100644 --- a/src/main/modelRegister.h +++ b/src/main/modelRegister.h @@ -25,18 +25,18 @@ namespace platform { [](void) -> bayesnet::BaseClassifier* { return new bayesnet::BoostAODE();}); static Registrar registrarBA2("BoostA2DE", [](void) -> bayesnet::BaseClassifier* { return new bayesnet::BoostA2DE();}); - static Registrar registrarSt("STree", - [](void) -> bayesnet::BaseClassifier* { return new pywrap::STree();}); - static Registrar registrarOdte("Odte", - [](void) -> bayesnet::BaseClassifier* { return new pywrap::ODTE();}); - static Registrar registrarSvc("SVC", - [](void) -> bayesnet::BaseClassifier* { return new pywrap::SVC();}); - static Registrar registrarRaF("RandomForest", - [](void) -> bayesnet::BaseClassifier* { return new pywrap::RandomForest();}); - static Registrar registrarXGB("XGBoost", - [](void) -> bayesnet::BaseClassifier* { return new pywrap::XGBoost();}); - static Registrar registrarAdaPy("AdaBoostPy", - [](void) -> bayesnet::BaseClassifier* { return new pywrap::AdaBoostPy();}); + // static Registrar registrarSt("STree", + // [](void) -> bayesnet::BaseClassifier* { return new pywrap::STree();}); + // static Registrar registrarOdte("Odte", + // [](void) -> bayesnet::BaseClassifier* { return new pywrap::ODTE();}); + // static Registrar registrarSvc("SVC", + // [](void) -> bayesnet::BaseClassifier* { return new pywrap::SVC();}); + // static Registrar registrarRaF("RandomForest", + // [](void) -> bayesnet::BaseClassifier* { return new pywrap::RandomForest();}); + // static Registrar registrarXGB("XGBoost", + // [](void) -> bayesnet::BaseClassifier* { return new pywrap::XGBoost();}); + // static Registrar registrarAdaPy("AdaBoostPy", + // [](void) -> bayesnet::BaseClassifier* { return new pywrap::AdaBoostPy();}); static Registrar registrarAda("AdaBoost", [](void) -> bayesnet::BaseClassifier* { return new bayesnet::AdaBoost();}); static Registrar registrarDT("DecisionTree",