From 7e4ee0a9a952fa8471ff7654ec8a7bc359720988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Fri, 8 Mar 2024 22:20:13 +0100 Subject: [PATCH] Refactor to accept new Library structure --- config/config.h.in | 14 +++++--------- gcovr.cfg | 2 +- sample/CMakeLists.txt | 5 ++--- sample/sample.cc | 6 +++--- src/CMakeLists.txt | 10 ++-------- src/best/BestResults.cc | 10 +++++----- src/best/BestResultsExcel.cc | 6 +++--- src/best/BestResultsExcel.h | 2 +- src/best/BestScore.h | 2 +- src/best/Statistics.cc | 8 ++++---- src/best/b_best.cc | 6 +++--- src/common/Colors.h | 1 + src/common/Dataset.cc | 4 ++-- src/common/Dataset.h | 2 +- src/common/Datasets.cc | 2 +- src/grid/GridData.cc | 2 +- src/grid/GridSearch.cc | 8 ++++---- src/grid/GridSearch.h | 6 +++--- src/grid/b_grid.cc | 14 +++++++------- src/list/DatasetsExcel.cc | 2 +- src/list/DatasetsExcel.h | 2 +- src/list/b_list.cc | 8 ++++---- src/main/Experiment.cc | 8 ++++---- src/main/Experiment.h | 4 ++-- src/main/HyperParameters.cc | 2 +- src/main/Models.h | 30 +++++++++++++++--------------- src/main/Result.cc | 12 ++++++------ src/main/Result.h | 6 +++--- src/main/b_main.cc | 8 ++++---- src/manage/CommandParser.cc | 4 ++-- src/manage/ManageResults.cc | 16 ++++++++-------- src/manage/ManageResults.h | 2 +- src/manage/Results.cc | 2 +- src/manage/Results.h | 2 +- src/manage/b_manage.cc | 2 +- src/reports/ExcelFile.cc | 2 +- src/reports/ExcelFile.h | 2 +- src/reports/ReportBase.cc | 4 ++-- src/reports/ReportBase.h | 4 ++-- src/reports/ReportConsole.cc | 4 ++-- src/reports/ReportConsole.h | 2 +- src/reports/ReportExcel.cc | 2 +- src/reports/ReportExcel.h | 6 +++--- tests/CMakeLists.txt | 4 ++-- tests/TestPlatform.cc | 2 +- tests/TestUtils.cc | 2 +- 46 files changed, 122 insertions(+), 132 deletions(-) diff --git a/config/config.h.in b/config/config.h.in index 31ab60e..73db51c 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -3,12 +3,8 @@ #include #include -#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR @ -#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR @ -#define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH @ - -static constexpr std::string_view project_name = "@PROJECT_NAME@"; -static constexpr std::string_view project_version = "@PROJECT_VERSION@"; -static constexpr std::string_view project_description = "@PROJECT_DESCRIPTION@"; -static constexpr std::string_view git_sha = "@GIT_SHA@"; -static constexpr std::string_view data_path = "@Platform_SOURCE_DIR@/tests/data/"; +static constexpr std::string_view platform_project_name = "@PROJECT_NAME@"; +static constexpr std::string_view platform_project_version = "@PROJECT_VERSION@"; +static constexpr std::string_view platform_project_description = "@PROJECT_DESCRIPTION@"; +static constexpr std::string_view platform_git_sha = "@GIT_SHA@"; +static constexpr std::string_view platform_data_path = "@Platform_SOURCE_DIR@/tests/data/"; diff --git a/gcovr.cfg b/gcovr.cfg index c1518ad..89e0877 100644 --- a/gcovr.cfg +++ b/gcovr.cfg @@ -1,4 +1,4 @@ filter = src/ -exclude-directories = build/lib/ +exclude-directories = build_debug/lib/ print-summary = yes sort-percentage = yes diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index b02a23b..70bf585 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -7,9 +7,8 @@ include_directories( ${Platform_SOURCE_DIR}/lib/argparse/include ${Platform_SOURCE_DIR}/lib/folding ${Platform_SOURCE_DIR}/lib/json/include - /usr/local/include/bayesnet - /usr/local/include/pyclassifiers + ${CMAKE_BINARY_DIR}/configured_files/include + /usr/local/include ) add_executable(PlatformSample sample.cc ${Platform_SOURCE_DIR}/src/main/Models.cc) -# target_link_libraries(PlatformSample "${PyClassifiers}" "${BayesNet}" ArffFiles mdlp "${TORCH_LIBRARIES}") target_link_libraries(PlatformSample "${PyClassifiers}" "${BayesNet}" ArffFiles mdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy) \ No newline at end of file diff --git a/sample/sample.cc b/sample/sample.cc index 1ec56d0..7074846 100644 --- a/sample/sample.cc +++ b/sample/sample.cc @@ -1,19 +1,19 @@ #include -#include #include #include #include +#include #include #include #include -#include #include #include +#include #include "Models.h" #include "modelRegister.h" #include "config.h" -const std::string PATH = { data_path.begin(), data_path.end() }; +const std::string PATH = { platform_data_path.begin(), platform_data_path.end() }; pair, map> discretize(std::vector& X, mdlp::labels_t& y, std::vector features) { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index af0fb18..da0686f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,15 +10,9 @@ include_directories( ${MPI_CXX_INCLUDE_DIRS} ${TORCH_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/configured_files/include - /usr/local/include/bayesnet - /usr/local/include/pyclassifiers + /usr/local/include ## Platform - ${Platform_SOURCE_DIR}/src/common - ${Platform_SOURCE_DIR}/src/best - ${Platform_SOURCE_DIR}/src/grid - ${Platform_SOURCE_DIR}/src/main - ${Platform_SOURCE_DIR}/src/manage - ${Platform_SOURCE_DIR}/src/reports + ${Platform_SOURCE_DIR}/src ) # b_best diff --git a/src/best/BestResults.cc b/src/best/BestResults.cc index 33cd26b..c4a624d 100644 --- a/src/best/BestResults.cc +++ b/src/best/BestResults.cc @@ -4,12 +4,12 @@ #include #include #include -#include "BestResults.h" -#include "Result.h" -#include "Colors.h" -#include "Statistics.h" +#include "common/Colors.h" +#include "common/CLocale.h" +#include "main/Result.h" #include "BestResultsExcel.h" -#include "CLocale.h" +#include "Statistics.h" +#include "BestResults.h" namespace fs = std::filesystem; diff --git a/src/best/BestResultsExcel.cc b/src/best/BestResultsExcel.cc index b70c04b..4250ec7 100644 --- a/src/best/BestResultsExcel.cc +++ b/src/best/BestResultsExcel.cc @@ -1,10 +1,10 @@ #include -#include "BestResultsExcel.h" -#include "Paths.h" #include #include +#include "common/Paths.h" +#include "reports/ReportExcel.h" #include "Statistics.h" -#include "ReportExcel.h" +#include "BestResultsExcel.h" namespace platform { json loadResultData(const std::string& fileName) diff --git a/src/best/BestResultsExcel.h b/src/best/BestResultsExcel.h index b700547..587e72c 100644 --- a/src/best/BestResultsExcel.h +++ b/src/best/BestResultsExcel.h @@ -1,9 +1,9 @@ #ifndef BESTRESULTS_EXCEL_H #define BESTRESULTS_EXCEL_H -#include "ExcelFile.h" #include #include #include +#include "reports/ExcelFile.h" using json = nlohmann::json; diff --git a/src/best/BestScore.h b/src/best/BestScore.h index f1b552f..d42772c 100644 --- a/src/best/BestScore.h +++ b/src/best/BestScore.h @@ -3,7 +3,7 @@ #include #include #include -#include "DotEnv.h" +#include "common/DotEnv.h" namespace platform { class BestScore { public: diff --git a/src/best/Statistics.cc b/src/best/Statistics.cc index f61f54f..0fbff1e 100644 --- a/src/best/Statistics.cc +++ b/src/best/Statistics.cc @@ -1,10 +1,10 @@ #include -#include "Statistics.h" -#include "Colors.h" -#include "Symbols.h" #include #include -#include "CLocale.h" +#include "common/Colors.h" +#include "common/Symbols.h" +#include "common/CLocale.h" +#include "Statistics.h" namespace platform { diff --git a/src/best/b_best.cc b/src/best/b_best.cc index aee3cc4..1e83969 100644 --- a/src/best/b_best.cc +++ b/src/best/b_best.cc @@ -1,8 +1,8 @@ #include #include -#include "Paths.h" +#include "common/Paths.h" +#include "common/Colors.h" #include "BestResults.h" -#include "Colors.h" #include "config.h" void manageArguments(argparse::ArgumentParser& program) @@ -29,7 +29,7 @@ void manageArguments(argparse::ArgumentParser& program) int main(int argc, char** argv) { - argparse::ArgumentParser program("b_best", { project_version.begin(), project_version.end() }); + argparse::ArgumentParser program("b_best", { platform_project_version.begin(), platform_project_version.end() }); manageArguments(program); std::string model, score; bool build, report, friedman, excel; diff --git a/src/common/Colors.h b/src/common/Colors.h index c6c8ef3..8a7a0af 100644 --- a/src/common/Colors.h +++ b/src/common/Colors.h @@ -1,5 +1,6 @@ #ifndef COLORS_H #define COLORS_H +#include class Colors { public: static std::string MAGENTA() { return "\033[1;35m"; } diff --git a/src/common/Dataset.cc b/src/common/Dataset.cc index 0322249..cb16b0b 100644 --- a/src/common/Dataset.cc +++ b/src/common/Dataset.cc @@ -1,6 +1,6 @@ -#include "Dataset.h" -#include "ArffFiles.h" +#include #include +#include "Dataset.h" namespace platform { Dataset::Dataset(const Dataset& dataset) : path(dataset.path), name(dataset.name), className(dataset.className), n_samples(dataset.n_samples), n_features(dataset.n_features), features(dataset.features), states(dataset.states), loaded(dataset.loaded), discretize(dataset.discretize), X(dataset.X), y(dataset.y), Xv(dataset.Xv), Xd(dataset.Xd), yv(dataset.yv), fileType(dataset.fileType) { diff --git a/src/common/Dataset.h b/src/common/Dataset.h index dd75351..092f75c 100644 --- a/src/common/Dataset.h +++ b/src/common/Dataset.h @@ -4,7 +4,7 @@ #include #include #include -#include "CPPFImdlp.h" +#include #include "Utils.h" namespace platform { enum fileType_t { CSV, ARFF, RDATA }; diff --git a/src/common/Datasets.cc b/src/common/Datasets.cc index af5457d..bfb419f 100644 --- a/src/common/Datasets.cc +++ b/src/common/Datasets.cc @@ -1,5 +1,5 @@ -#include "Datasets.h" #include +#include "Datasets.h" namespace platform { void Datasets::load() { diff --git a/src/grid/GridData.cc b/src/grid/GridData.cc index e93ee17..948fbdc 100644 --- a/src/grid/GridData.cc +++ b/src/grid/GridData.cc @@ -1,5 +1,5 @@ -#include "GridData.h" #include +#include "GridData.h" namespace platform { GridData::GridData(const std::string& fileName) diff --git a/src/grid/GridSearch.cc b/src/grid/GridSearch.cc index 2ef0ad1..ef8b8da 100644 --- a/src/grid/GridSearch.cc +++ b/src/grid/GridSearch.cc @@ -1,11 +1,11 @@ #include #include #include +#include +#include "main/Models.h" +#include "common/Paths.h" +#include "common/Colors.h" #include "GridSearch.h" -#include "Models.h" -#include "Paths.h" -#include "folding.hpp" -#include "Colors.h" namespace platform { std::string get_date() diff --git a/src/grid/GridSearch.h b/src/grid/GridSearch.h index ec1b3cb..4e10735 100644 --- a/src/grid/GridSearch.h +++ b/src/grid/GridSearch.h @@ -4,10 +4,10 @@ #include #include #include -#include "Datasets.h" -#include "HyperParameters.h" +#include "common/Datasets.h" +#include "common/Timer.h" +#include "main/HyperParameters.h" #include "GridData.h" -#include "Timer.h" namespace platform { using json = nlohmann::json; diff --git a/src/grid/b_grid.cc b/src/grid/b_grid.cc index c344bf6..c621460 100644 --- a/src/grid/b_grid.cc +++ b/src/grid/b_grid.cc @@ -4,13 +4,13 @@ #include #include #include -#include "DotEnv.h" -#include "Models.h" -#include "modelRegister.h" +#include "main/Models.h" +#include "main/modelRegister.h" +#include "common/Paths.h" +#include "common/Timer.h" +#include "common/Colors.h" +#include "common/DotEnv.h" #include "GridSearch.h" -#include "Paths.h" -#include "Timer.h" -#include "Colors.h" #include "config.h" using json = nlohmann::json; @@ -223,7 +223,7 @@ int main(int argc, char** argv) // // Manage arguments // - argparse::ArgumentParser program("b_grid", { project_version.begin(), project_version.end() }); + argparse::ArgumentParser program("b_grid", { platform_project_version.begin(), platform_project_version.end() }); // grid dump subparser argparse::ArgumentParser dump_command("dump"); dump_command.add_description("Dump the combinations of hyperparameters of a model."); diff --git a/src/list/DatasetsExcel.cc b/src/list/DatasetsExcel.cc index 8aa8615..7a0c89c 100644 --- a/src/list/DatasetsExcel.cc +++ b/src/list/DatasetsExcel.cc @@ -1,6 +1,6 @@ #include +#include "common/Paths.h" #include "DatasetsExcel.h" -#include "Paths.h" namespace platform { diff --git a/src/list/DatasetsExcel.h b/src/list/DatasetsExcel.h index 4d4daaa..f7a520d 100644 --- a/src/list/DatasetsExcel.h +++ b/src/list/DatasetsExcel.h @@ -1,9 +1,9 @@ #ifndef DATASETS_EXCEL_H #define DATASETS_EXCEL_H -#include "ExcelFile.h" #include #include #include +#include "reports/ExcelFile.h" using json = nlohmann::json; diff --git a/src/list/b_list.cc b/src/list/b_list.cc index 90ffcb3..24240d7 100644 --- a/src/list/b_list.cc +++ b/src/list/b_list.cc @@ -2,9 +2,9 @@ #include #include #include -#include "Paths.h" -#include "Colors.h" -#include "Datasets.h" +#include "common/Paths.h" +#include "common/Colors.h" +#include "common/Datasets.h" #include "DatasetsExcel.h" #include "config.h" @@ -31,7 +31,7 @@ std::string outputBalance(const std::string& balance) int main(int argc, char** argv) { auto datasets = platform::Datasets(false, platform::Paths::datasets()); - argparse::ArgumentParser program("b_list", { project_version.begin(), project_version.end() }); + argparse::ArgumentParser program("b_list", { platform_project_version.begin(), platform_project_version.end() }); program.add_argument("--excel") .help("Output in Excel format") .default_value(false) diff --git a/src/main/Experiment.cc b/src/main/Experiment.cc index 74dd253..63aa2cd 100644 --- a/src/main/Experiment.cc +++ b/src/main/Experiment.cc @@ -1,8 +1,8 @@ -#include "Experiment.h" -#include "Datasets.h" +#include "common/Datasets.h" +#include "reports/ReportConsole.h" +#include "common/Paths.h" #include "Models.h" -#include "ReportConsole.h" -#include "Paths.h" +#include "Experiment.h" namespace platform { using json = nlohmann::json; diff --git a/src/main/Experiment.h b/src/main/Experiment.h index f645b40..fc9a8f3 100644 --- a/src/main/Experiment.h +++ b/src/main/Experiment.h @@ -3,8 +3,8 @@ #include #include #include -#include "folding.hpp" -#include "BaseClassifier.h" +#include +#include "bayesnet/BaseClassifier.h" #include "HyperParameters.h" #include "Result.h" diff --git a/src/main/HyperParameters.cc b/src/main/HyperParameters.cc index 530ac03..f10113e 100644 --- a/src/main/HyperParameters.cc +++ b/src/main/HyperParameters.cc @@ -1,7 +1,7 @@ -#include "HyperParameters.h" #include #include #include +#include "HyperParameters.h" namespace platform { HyperParameters::HyperParameters(const std::vector& datasets, const json& hyperparameters_) diff --git a/src/main/Models.h b/src/main/Models.h index f347211..f303854 100644 --- a/src/main/Models.h +++ b/src/main/Models.h @@ -1,21 +1,21 @@ #ifndef MODELS_H #define MODELS_H #include -#include "BaseClassifier.h" -#include "ensembles/AODE.h" -#include "ensembles/AODELd.h" -#include "ensembles/BoostAODE.h" -#include "classifiers/TAN.h" -#include "classifiers/KDB.h" -#include "classifiers/SPODE.h" -#include "classifiers/TANLd.h" -#include "classifiers/KDBLd.h" -#include "classifiers/SPODELd.h" -#include "STree.h" -#include "ODTE.h" -#include "SVC.h" -#include "XGBoost.h" -#include "RandomForest.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace platform { class Models { private: diff --git a/src/main/Result.cc b/src/main/Result.cc index ec5f584..b070641 100644 --- a/src/main/Result.cc +++ b/src/main/Result.cc @@ -1,12 +1,12 @@ -#include "Result.h" #include #include #include -#include "BestScore.h" -#include "Colors.h" -#include "DotEnv.h" -#include "CLocale.h" -#include "Paths.h" +#include "best/BestScore.h" +#include "common/Colors.h" +#include "common/DotEnv.h" +#include "common/CLocale.h" +#include "common/Paths.h" +#include "Result.h" namespace platform { std::string get_actual_date() diff --git a/src/main/Result.h b/src/main/Result.h index 6e1d4bd..bbf0eec 100644 --- a/src/main/Result.h +++ b/src/main/Result.h @@ -4,9 +4,9 @@ #include #include #include -#include "HyperParameters.h" -#include "PartialResult.h" -#include "Timer.h" +#include "common/Timer.h" +#include "main/HyperParameters.h" +#include "main/PartialResult.h" namespace platform { using json = nlohmann::json; diff --git a/src/main/b_main.cc b/src/main/b_main.cc index 3c5c46f..1999fff 100644 --- a/src/main/b_main.cc +++ b/src/main/b_main.cc @@ -2,11 +2,11 @@ #include #include #include "Experiment.h" -#include "Datasets.h" -#include "DotEnv.h" +#include "common/Datasets.h" +#include "common/DotEnv.h" +#include "common/Paths.h" #include "Models.h" #include "modelRegister.h" -#include "Paths.h" #include "config.h" @@ -55,7 +55,7 @@ void manageArguments(argparse::ArgumentParser& program) int main(int argc, char** argv) { - argparse::ArgumentParser program("b_main", { project_version.begin(), project_version.end() }); + argparse::ArgumentParser program("b_main", { platform_project_version.begin(), platform_project_version.end() }); manageArguments(program); std::string file_name, model_name, title, hyperparameters_file; json hyperparameters_json; diff --git a/src/manage/CommandParser.cc b/src/manage/CommandParser.cc index 5c58f3e..f4bce28 100644 --- a/src/manage/CommandParser.cc +++ b/src/manage/CommandParser.cc @@ -2,8 +2,8 @@ #include #include #include -#include "Colors.h" -#include "Utils.h" +#include "common/Colors.h" +#include "common/Utils.h" namespace platform { void CommandParser::messageError(const std::string& message) diff --git a/src/manage/ManageResults.cc b/src/manage/ManageResults.cc index ba4d73a..c3b4299 100644 --- a/src/manage/ManageResults.cc +++ b/src/manage/ManageResults.cc @@ -1,13 +1,13 @@ -#include "ManageResults.h" -#include "CommandParser.h" #include #include -#include "Colors.h" -#include "CLocale.h" -#include "Paths.h" -#include "ReportConsole.h" -#include "ReportExcel.h" -#include "ReportExcelCompared.h" +#include "common/Colors.h" +#include "common/CLocale.h" +#include "common/Paths.h" +#include "reports/ReportConsole.h" +#include "reports/ReportExcel.h" +#include "reports/ReportExcelCompared.h" +#include "CommandParser.h" +#include "ManageResults.h" namespace platform { diff --git a/src/manage/ManageResults.h b/src/manage/ManageResults.h index ba14f27..fc28cc9 100644 --- a/src/manage/ManageResults.h +++ b/src/manage/ManageResults.h @@ -1,7 +1,7 @@ #ifndef MANAGE_RESULTS_H #define MANAGE_RESULTS_H +#include #include "Results.h" -#include "xlsxwriter.h" namespace platform { class ManageResults { diff --git a/src/manage/Results.cc b/src/manage/Results.cc index cb7c41a..241bad6 100644 --- a/src/manage/Results.cc +++ b/src/manage/Results.cc @@ -1,5 +1,5 @@ -#include "Results.h" #include +#include "Results.h" namespace platform { Results::Results(const std::string& path, const std::string& model, const std::string& score, bool complete, bool partial) : diff --git a/src/manage/Results.h b/src/manage/Results.h index 9f9023f..d03c0e1 100644 --- a/src/manage/Results.h +++ b/src/manage/Results.h @@ -4,7 +4,7 @@ #include #include #include -#include "Result.h" +#include "main/Result.h" namespace platform { using json = nlohmann::json; class Results { diff --git a/src/manage/b_manage.cc b/src/manage/b_manage.cc index 3b499c6..51ab93e 100644 --- a/src/manage/b_manage.cc +++ b/src/manage/b_manage.cc @@ -33,7 +33,7 @@ void manageArguments(argparse::ArgumentParser& program, int argc, char** argv) int main(int argc, char** argv) { - auto program = argparse::ArgumentParser("b_manage", { project_version.begin(), project_version.end() }); + auto program = argparse::ArgumentParser("b_manage", { platform_project_version.begin(), platform_project_version.end() }); manageArguments(program, argc, argv); int number = program.get("number"); std::string model = program.get("model"); diff --git a/src/reports/ExcelFile.cc b/src/reports/ExcelFile.cc index 611db74..ec87ee9 100644 --- a/src/reports/ExcelFile.cc +++ b/src/reports/ExcelFile.cc @@ -1,5 +1,5 @@ +#include "common/Paths.h" #include "ExcelFile.h" -#include "Paths.h" namespace platform { ExcelFile::ExcelFile() diff --git a/src/reports/ExcelFile.h b/src/reports/ExcelFile.h index 3d07bef..41c4e74 100644 --- a/src/reports/ExcelFile.h +++ b/src/reports/ExcelFile.h @@ -3,7 +3,7 @@ #include #include #include -#include "xlsxwriter.h" +#include namespace platform { struct separated : std::numpunct { diff --git a/src/reports/ReportBase.cc b/src/reports/ReportBase.cc index 49e6617..1abcc27 100644 --- a/src/reports/ReportBase.cc +++ b/src/reports/ReportBase.cc @@ -1,8 +1,8 @@ #include #include -#include "Datasets.h" +#include "common/Datasets.h" +#include "common/DotEnv.h" #include "ReportBase.h" -#include "DotEnv.h" namespace platform { ReportBase::ReportBase(json data_, bool compare) : data(data_), compare(compare), margin(0.1) diff --git a/src/reports/ReportBase.h b/src/reports/ReportBase.h index 35cde6b..466ed30 100644 --- a/src/reports/ReportBase.h +++ b/src/reports/ReportBase.h @@ -2,9 +2,9 @@ #define REPORTBASE_H #include #include -#include "Paths.h" -#include "Symbols.h" #include +#include "common/Paths.h" +#include "common/Symbols.h" using json = nlohmann::json; namespace platform { diff --git a/src/reports/ReportConsole.cc b/src/reports/ReportConsole.cc index d483c6a..33398f6 100644 --- a/src/reports/ReportConsole.cc +++ b/src/reports/ReportConsole.cc @@ -1,9 +1,9 @@ #include #include #include +#include "best/BestScore.h" +#include "common/CLocale.h" #include "ReportConsole.h" -#include "BestScore.h" -#include "CLocale.h" namespace platform { std::string ReportConsole::headerLine(const std::string& text, int utf = 0) diff --git a/src/reports/ReportConsole.h b/src/reports/ReportConsole.h index 8ba3ffe..5b0f846 100644 --- a/src/reports/ReportConsole.h +++ b/src/reports/ReportConsole.h @@ -1,8 +1,8 @@ #ifndef REPORTCONSOLE_H #define REPORTCONSOLE_H #include +#include "common/Colors.h" #include "ReportBase.h" -#include "Colors.h" namespace platform { const int MAXL = 133; diff --git a/src/reports/ReportExcel.cc b/src/reports/ReportExcel.cc index 28ef068..b93306b 100644 --- a/src/reports/ReportExcel.cc +++ b/src/reports/ReportExcel.cc @@ -1,7 +1,7 @@ #include #include +#include "best/BestScore.h" #include "ReportExcel.h" -#include "BestScore.h" namespace platform { diff --git a/src/reports/ReportExcel.h b/src/reports/ReportExcel.h index 5052378..8940d6d 100644 --- a/src/reports/ReportExcel.h +++ b/src/reports/ReportExcel.h @@ -1,10 +1,10 @@ #ifndef REPORTEXCEL_H #define REPORTEXCEL_H -#include -#include "xlsxwriter.h" +#include +#include +#include "common/Colors.h" #include "ReportBase.h" #include "ExcelFile.h" -#include "Colors.h" namespace platform { class ReportExcel : public ReportBase, public ExcelFile { public: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3066c7e..e856e49 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,8 +5,8 @@ if(ENABLE_TESTING) ${Platform_SOURCE_DIR}/lib/argparse/include ${Platform_SOURCE_DIR}/lib/mdlp ${Platform_SOURCE_DIR}/lib/Files - /usr/local/include/bayesnet - /usr/local/include/pyclassifiers + ${CMAKE_BINARY_DIR}/configured_files/include + /usr/local/include ) set(TEST_SOURCES_PLATFORM TestUtils.cc TestPlatform.cc) add_executable(${TEST_PLATFORM} ${TEST_SOURCES_PLATFORM}) diff --git a/tests/TestPlatform.cc b/tests/TestPlatform.cc index 35fed79..ea906aa 100644 --- a/tests/TestPlatform.cc +++ b/tests/TestPlatform.cc @@ -11,6 +11,6 @@ TEST_CASE("Test Python Classifiers score", "[PyClassifiers]") { - std::string version = { project_version.begin(), project_version.end() }; + std::string version = { platform_project_version.begin(), platform_project_version.end() }; REQUIRE(version == "1.0.4"); } \ No newline at end of file diff --git a/tests/TestUtils.cc b/tests/TestUtils.cc index 5a0910e..80f9893 100644 --- a/tests/TestUtils.cc +++ b/tests/TestUtils.cc @@ -5,7 +5,7 @@ class Paths { public: static std::string datasets() { - return { data_path.begin(), data_path.end() }; + return { platform_data_path.begin(), platform_data_path.end() }; } };