Move ResultsDatasetConsole to results folder

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
+    main/Models.cpp main/Scores.cpp
-    reports/ReportExcel.cpp reports/ExcelFile.cpp reports/ReportBase.cpp reports/DatasetsExcel.cpp reports/DatasetsConsole.cpp reports/ResultsDatasetConsole.cpp reports/ReportsPaged.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/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
+    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/Result.cpp results/ResultsDataset.cpp results/ResultsDatasetConsole.cpp
     main/Scores.cpp
 )
 target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp "${BayesNet}")

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"

src/main/Scores.h

@@ -1,9 +1,9 @@
 #ifndef SCORES_H
 #define SCORES_H
+#include <torch/torch.h>
 #include <vector>
 #include <string>
 #include <nlohmann/json.hpp>
-#include <torch/torch.h>
 #include <xlsxwriter.h>
 
 namespace platform {

src/reports/ReportBase.h

@@ -1,7 +1,7 @@
 #ifndef REPORTBASE_H
 #define REPORTBASE_H
-
 #include <string>
+#include <map>
 #include <nlohmann/json.hpp>
 #include "common/Paths.h"
 #include "common/Symbols.h"

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)

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) {

src/reports/ReportExcel.h

@@ -1,7 +1,5 @@
 #ifndef REPORT_EXCEL_H
 #define REPORT_EXCEL_H
-#include <map>
-#include <xlsxwriter.h>
 #include "common/Colors.h"
 #include "ReportBase.h"
 #include "ExcelFile.h"

src/results/ResultsDatasetConsole.h

@@ -4,8 +4,8 @@
 #include <string>
 #include <sstream>
 #include <nlohmann/json.hpp>
-#include "results/ResultsDataset.h"
+#include "reports/ReportsPaged.h"
-#include "ReportsPaged.h"
+#include "ResultsDataset.h"
 
 namespace platform {
     class ResultsDatasetsConsole : public ReportsPaged {