Refactor report folder

src/CMakeLists.txt

@@ -40,8 +40,8 @@ target_link_libraries(b_grid ${MPI_CXX_LIBRARIES} "${PyClassifiers}" "${BayesNet
 add_executable(b_list commands/b_list.cpp ${list_sources} 
     common/Datasets.cpp common/Dataset.cpp 
     main/Models.cpp
-    reports/ReportExcel.cpp reports/ExcelFile.cpp reports/ReportBase.cpp reports/DatasetsExcel.cpp reports/DatasetsConsole.cpp
-    results/Result.cpp results/ResultsDatasetExcel.cpp results/ResultsDataset.cpp results/ResultsDatasetConsole.cpp
+    reports/ReportExcel.cpp reports/ExcelFile.cpp reports/ReportBase.cpp reports/DatasetsExcel.cpp reports/DatasetsConsole.cpp reports/ResultsDatasetConsole.cpp
+    results/Result.cpp results/ResultsDatasetExcel.cpp results/ResultsDataset.cpp
 )
 target_link_libraries(b_list "${PyClassifiers}" "${BayesNet}" ArffFiles mdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy "${XLSXWRITER_LIB}")
 
@@ -61,7 +61,7 @@ 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
-    results/Result.cpp results/ResultsDatasetConsole.cpp results/ResultsDataset.cpp
+    reports/ReportConsole.cpp reports/ReportExcel.cpp reports/ReportExcelCompared.cpp reports/ReportBase.cpp reports/ExcelFile.cpp reports/DatasetsConsole.cpp reports/ResultsDatasetConsole.cpp
+    results/Result.cpp results/ResultsDataset.cpp
 )
 target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp)

src/commands/b_list.cpp

@@ -10,9 +10,9 @@
 #include "common/Datasets.h"
 #include "reports/DatasetsExcel.h"
 #include "reports/DatasetsConsole.h"
+#include "reports/ResultsDatasetConsole.h"
 #include "results/ResultsDataset.h"
 #include "results/ResultsDatasetExcel.h"
-#include "results/ResultsDatasetConsole.h"
 #include "config.h"
 
 

src/manage/CommandParser.cpp

@@ -36,7 +36,7 @@ namespace platform {
                 index = stoi(line);
                 if (index > maxIndex || index < minIndex) {
                     errorMessage = "Index out of range";
-                    return { command, index, true };
+                    return { ' ', -1, true };
                 }
                 finished = true;
                 break;

src/manage/ManageScreen.cpp

@@ -105,6 +105,13 @@ namespace platform {
     void ManageScreen::list_result(const std::string& status_message, const std::string& status_color)
     {
 
+        //auto report = DatasetsConsole();
+        //report.report();
+        //paginator[static_cast<int>(output_type)].setTotal(report.getNumLines());
+        // We need to subtract 8 from the page size to make room for the extra header in report
+        auto page_size = paginator[static_cast<int>(OutputType::EXPERIMENTS)].getPageSize();
+        paginator[static_cast<int>(output_type)].setPage(page_size - 8);
+
         //
         // header
         //