From b9e0c92334dc9756cf80e5e9a4a7c1ce03623c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Sat, 18 May 2024 18:41:17 +0200 Subject: [PATCH] Move ResultsDatasetConsole to results folder --- src/CMakeLists.txt | 10 +++++----- src/commands/b_list.cpp | 2 +- src/main/Scores.h | 2 +- src/reports/ReportBase.h | 2 +- src/reports/ReportConsole.cpp | 1 + src/reports/ReportExcel.cpp | 13 ++++++++++++- src/reports/ReportExcel.h | 2 -- src/{reports => results}/ResultsDatasetConsole.cpp | 0 src/{reports => results}/ResultsDatasetConsole.h | 4 ++-- 9 files changed, 23 insertions(+), 13 deletions(-) rename src/{reports => results}/ResultsDatasetConsole.cpp (100%) rename src/{reports => results}/ResultsDatasetConsole.h (87%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 90244b7..47de3a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,9 +40,9 @@ target_link_libraries(b_grid ${MPI_CXX_LIBRARIES} "${PyClassifiers}" "${BayesNet # b_list add_executable(b_list commands/b_list.cpp common/Datasets.cpp common/Dataset.cpp - main/Models.cpp - reports/ReportExcel.cpp reports/ExcelFile.cpp reports/ReportBase.cpp reports/DatasetsExcel.cpp reports/DatasetsConsole.cpp reports/ResultsDatasetConsole.cpp reports/ReportsPaged.cpp - results/Result.cpp results/ResultsDatasetExcel.cpp results/ResultsDataset.cpp + main/Models.cpp main/Scores.cpp + reports/ReportExcel.cpp reports/ExcelFile.cpp reports/ReportBase.cpp reports/DatasetsExcel.cpp reports/DatasetsConsole.cpp reports/ReportsPaged.cpp + results/Result.cpp results/ResultsDatasetExcel.cpp results/ResultsDataset.cpp results/ResultsDatasetConsole.cpp ) target_link_libraries(b_list "${PyClassifiers}" "${BayesNet}" ArffFiles mdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy "${XLSXWRITER_LIB}") @@ -62,8 +62,8 @@ list(TRANSFORM manage_sources PREPEND manage/) add_executable( b_manage commands/b_manage.cpp ${manage_sources} common/Datasets.cpp common/Dataset.cpp - reports/ReportConsole.cpp reports/ReportExcel.cpp reports/ReportExcelCompared.cpp reports/ReportBase.cpp reports/ExcelFile.cpp reports/DatasetsConsole.cpp reports/ResultsDatasetConsole.cpp reports/ReportsPaged.cpp - results/Result.cpp results/ResultsDataset.cpp + reports/ReportConsole.cpp reports/ReportExcel.cpp reports/ReportExcelCompared.cpp reports/ReportBase.cpp reports/ExcelFile.cpp reports/DatasetsConsole.cpp reports/ReportsPaged.cpp + results/Result.cpp results/ResultsDataset.cpp results/ResultsDatasetConsole.cpp main/Scores.cpp ) target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp "${BayesNet}") diff --git a/src/commands/b_list.cpp b/src/commands/b_list.cpp index b044d04..851bca8 100644 --- a/src/commands/b_list.cpp +++ b/src/commands/b_list.cpp @@ -10,7 +10,7 @@ #include "common/Datasets.h" #include "reports/DatasetsExcel.h" #include "reports/DatasetsConsole.h" -#include "reports/ResultsDatasetConsole.h" +#include "results/ResultsDatasetConsole.h" #include "results/ResultsDataset.h" #include "results/ResultsDatasetExcel.h" #include "config.h" diff --git a/src/main/Scores.h b/src/main/Scores.h index 2de7e2a..c6fff97 100644 --- a/src/main/Scores.h +++ b/src/main/Scores.h @@ -1,9 +1,9 @@ #ifndef SCORES_H #define SCORES_H +#include #include #include #include -#include #include namespace platform { diff --git a/src/reports/ReportBase.h b/src/reports/ReportBase.h index bc689fd..f57a20a 100644 --- a/src/reports/ReportBase.h +++ b/src/reports/ReportBase.h @@ -1,7 +1,7 @@ #ifndef REPORTBASE_H #define REPORTBASE_H - #include +#include #include #include "common/Paths.h" #include "common/Symbols.h" diff --git a/src/reports/ReportConsole.cpp b/src/reports/ReportConsole.cpp index e48fc54..8f55b19 100644 --- a/src/reports/ReportConsole.cpp +++ b/src/reports/ReportConsole.cpp @@ -3,6 +3,7 @@ #include "best/BestScore.h" #include "common/CLocale.h" #include "ReportConsole.h" +#include "main/Scores.h" namespace platform { std::string ReportConsole::headerLine(const std::string& text, int utf = 0) diff --git a/src/reports/ReportExcel.cpp b/src/reports/ReportExcel.cpp index 1b2fed2..77dd2de 100644 --- a/src/reports/ReportExcel.cpp +++ b/src/reports/ReportExcel.cpp @@ -3,7 +3,6 @@ #include "best/BestScore.h" #include "ReportExcel.h" namespace platform { - ReportExcel::ReportExcel(json data_, bool compare, lxw_workbook* workbook, lxw_worksheet* worksheet) : ReportBase(data_, compare), ExcelFile(workbook, worksheet) { createFile(); @@ -194,6 +193,18 @@ namespace platform { writeDouble(row, ++col, item, style); } } + // Classificacion report + if (lastResult.find("confusion_matrices") != lastResult.end()) { + // auto score = platform2::Scores::create_aggregate(lastResult, "confusion_matrices"); + // row++; + // writeString(row, 1, "Classification Report", "bodyHeader"); + // row++; + // auto output = platform2::Scores::classification_report("", "test"); + // for (const auto& item : output) { + // writeString(row, 1, item, "text"); + // row++; + // } + } // Set with of columns to show those totals completely worksheet_set_column(worksheet, 1, 1, 12, NULL); for (int i = 2; i < 7; ++i) { diff --git a/src/reports/ReportExcel.h b/src/reports/ReportExcel.h index 94923a6..e2755a2 100644 --- a/src/reports/ReportExcel.h +++ b/src/reports/ReportExcel.h @@ -1,7 +1,5 @@ #ifndef REPORT_EXCEL_H #define REPORT_EXCEL_H -#include -#include #include "common/Colors.h" #include "ReportBase.h" #include "ExcelFile.h" diff --git a/src/reports/ResultsDatasetConsole.cpp b/src/results/ResultsDatasetConsole.cpp similarity index 100% rename from src/reports/ResultsDatasetConsole.cpp rename to src/results/ResultsDatasetConsole.cpp diff --git a/src/reports/ResultsDatasetConsole.h b/src/results/ResultsDatasetConsole.h similarity index 87% rename from src/reports/ResultsDatasetConsole.h rename to src/results/ResultsDatasetConsole.h index 787edec..a201811 100644 --- a/src/reports/ResultsDatasetConsole.h +++ b/src/results/ResultsDatasetConsole.h @@ -4,8 +4,8 @@ #include #include #include -#include "results/ResultsDataset.h" -#include "ReportsPaged.h" +#include "reports/ReportsPaged.h" +#include "ResultsDataset.h" namespace platform { class ResultsDatasetsConsole : public ReportsPaged {