Refactor report folder

2024-03-17 00:06:00 +01:00
parent 37eba57765
commit 106a36109e
6 changed files with 13 additions and 6 deletions
--- a/src/reports/ResultsDatasetConsole.cpp
+++ b/src/reports/ResultsDatasetConsole.cpp
@@ -0,0 +1,82 @@
+
+#include "common/Colors.h"
+#include "results/ResultsDataset.h"
+#include "ResultsDatasetConsole.h"
+namespace platform {
+    void ResultsDatasetsConsole::list_results(const std::string& dataset, const std::string& score, const std::string& model)
+    {
+        output.str("");
+        auto loc = std::locale("es_ES");
+        output.imbue(loc);
+        auto results = platform::ResultsDataset(dataset, model, score);
+        results.load();
+        results.sortModel();
+        if (results.empty()) {
+            output << Colors::RED() << "No results found for dataset " << dataset << " and model " << model << Colors::RESET() << std::endl;
+            return;
+        }
+        int maxModel = results.maxModelSize();
+        int maxHyper = results.maxHyperSize();
+        double maxResult = results.maxResultScore();
+        //
+        // Build data for the Report
+        //
+        data = json::object();
+        data["dataset"] = dataset;
+        data["score"] = score;
+        data["model"] = model;
+        data["lengths"]["maxModel"] = maxModel;
+        data["lengths"]["maxHyper"] = maxHyper;
+        data["maxResult"] = maxResult;
+        data["results"] = json::array();
+        data["max_models"] = json::object(); // Max score per model
+        for (const auto& result : results) {
+            auto results = result.getData();
+            if (!data["max_models"].contains(result.getModel())) {
+                data["max_models"][result.getModel()] = 0;
+            }
+            for (const auto& item : results["results"]) {
+                if (item["dataset"] == dataset) {
+                    // Store data for Excel report
+                    json res = json::object();
+                    res["date"] = result.getDate();
+                    res["time"] = result.getTime();
+                    res["model"] = result.getModel();
+                    res["score"] = item["score"].get<double>();
+                    res["hyperparameters"] = item["hyperparameters"].dump();
+                    data["results"].push_back(res);
+                    if (item["score"].get<double>() > data["max_models"][result.getModel()]) {
+                        data["max_models"][result.getModel()] = item["score"].get<double>();
+                    }
+                    break;
+                }
+            }
+        }
+        //
+        // List the results
+        //
+        output << Colors::GREEN() << "Results of dataset " << dataset << " - for " << model << " model" << std::endl;
+        output << "There are " << results.size() << " results" << std::endl;
+        output << Colors::GREEN() << " #  " << std::setw(maxModel + 1) << std::left << "Model" << "Date       Time     Score       Hyperparameters" << std::endl;
+        output << "=== " << std::string(maxModel, '=') << " ========== ======== =========== " << std::string(maxHyper, '=') << std::endl;
+        numLines = 4;
+        auto i = 0;
+        for (const auto& item : data["results"]) {
+            auto color = (i % 2) ? Colors::BLUE() : Colors::CYAN();
+            auto score = item["score"].get<double>();
+            color = score == data["max_models"][item["model"].get<std::string>()] ? Colors::YELLOW() : color;
+            color = score == maxResult ? Colors::RED() : color;
+            output << color << std::setw(3) << std::fixed << std::right << i++ << " ";
+            output << std::setw(maxModel) << std::left << item["model"].get<std::string>() << " ";
+            output << color << item["date"].get<std::string>() << " ";
+            output << color << item["time"].get<std::string>() << " ";
+            output << std::setw(11) << std::setprecision(9) << std::fixed << score << " ";
+            output << item["hyperparameters"].get<std::string>() << std::endl;
+            numLines++;
+        }
+    }
+}
+
+
+
+
--- a/src/reports/ResultsDatasetConsole.h
+++ b/src/reports/ResultsDatasetConsole.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <locale>
+#include <string>
+#include <sstream>
+#include <nlohmann/json.hpp>
+#include "results/ResultsDataset.h"
+
+namespace platform {
+    class ResultsDatasetsConsole {
+    public:
+        ResultsDatasetsConsole() = default;
+        ~ResultsDatasetsConsole() = default;
+        std::string getOutput() const { return output.str(); }
+        int getNumLines() const { return numLines; }
+        json& getData() { return data; }
+        void list_results(const std::string& dataset, const std::string& score, const std::string& model);
+    private:
+        std::stringstream output;
+        json data;
+        int numLines = 0;
+    };
+}
+
+
+
+