rmontanana/BayesNet
rmontanana/BayesNet
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 3 Wiki Activity

Remove unused code in BestResults

Browse Source
This commit is contained in:
Ricardo Montañana Gómez 2023-10-02 15:31:02 +02:00
parent a434d7f1ae
commit 57c27f739c
Signed by: rmontanana
GPG Key ID: 46064262FD9A7ADE
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Platform/BestResults.cc
View File

@ -40,15 +40,17 @@ namespace platform {
auto data = result.load(); auto data = result.load();
for (auto const& item : data.at("results")) { for (auto const& item : data.at("results")) {
bool update = false; bool update = false;
if (bests.contains(item.at("dataset").get<string>())) { // Check if results file contains only one dataset
if (item.at("score").get<double>() > bests[item.at("dataset").get<string>()].at(0).get<double>()) { auto datasetName = item.at("dataset").get<string>();
if (bests.contains(datasetName)) {
if (item.at("score").get<double>() > bests[datasetName].at(0).get<double>()) {
update = true; update = true;
} }
} else { } else {
update = true; update = true;
} }
if (update) { if (update) {
bests[item.at("dataset").get<string>()] = { item.at("score").get<double>(), item.at("hyperparameters"), file }; bests[datasetName] = { item.at("score").get<double>(), item.at("hyperparameters"), file };
} }
} }
} }
@ -177,9 +179,6 @@ namespace platform {
} }
json BestResults::buildTableResults(vector<string> models) json BestResults::buildTableResults(vector<string> models)
{ {
int numberOfDatasets = 0;
bool first = true;
json origin;
json table; json table;
auto maxDate = filesystem::file_time_type::max(); auto maxDate = filesystem::file_time_type::max();
for (const auto& model : models) { for (const auto& model : models) {
@ -196,17 +195,6 @@ namespace platform {
maxDate = dateWrite; maxDate = dateWrite;
} }
auto data = loadFile(bestFileName); auto data = loadFile(bestFileName);
if (first) {
// Get the number of datasets of the first file and check that is the same for all the models
first = false;
numberOfDatasets = data.size();
origin = data;
} else {
if (numberOfDatasets != data.size()) {
cerr << Colors::MAGENTA() << "The number of datasets in the best results files is not the same for all the models." << Colors::RESET() << endl;
exit(1);
}
}
table[model] = data; table[model] = data;
} }
table["dateTable"] = ftime_to_string(maxDate); table["dateTable"] = ftime_to_string(maxDate);
@ -234,15 +222,15 @@ namespace platform {
for (const auto& model : models) { for (const auto& model : models) {
totals[model] = 0.0; totals[model] = 0.0;
} }
json origin = table.begin().value(); auto datasets = getDatasets(table.begin().value());
for (auto const& item : origin.items()) { for (auto const& dataset : datasets) {
auto color = odd ? Colors::BLUE() : Colors::CYAN(); auto color = odd ? Colors::BLUE() : Colors::CYAN();
cout << color << setw(3) << fixed << right << i++ << " "; cout << color << setw(3) << fixed << right << i++ << " ";
cout << setw(maxDatasetName) << left << item.key() << " "; cout << setw(maxDatasetName) << left << dataset << " ";
double maxValue = 0; double maxValue = 0;
// Find out the max value for this dataset // Find out the max value for this dataset
for (const auto& model : models) { for (const auto& model : models) {
double value = table[model].at(item.key()).at(0).get<double>(); double value = table[model].at(dataset).at(0).get<double>();
if (value > maxValue) { if (value > maxValue) {
maxValue = value; maxValue = value;
} }
@ -250,7 +238,7 @@ namespace platform {
// Print the row with red colors on max values // Print the row with red colors on max values
for (const auto& model : models) { for (const auto& model : models) {
string efectiveColor = color; string efectiveColor = color;
double value = table[model].at(item.key()).at(0).get<double>(); double value = table[model].at(dataset).at(0).get<double>();
if (value == maxValue) { if (value == maxValue) {
efectiveColor = Colors::RED(); efectiveColor = Colors::RED();
} }