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

Fix report format

Browse Source
This commit is contained in:
Ricardo Montañana Gómez 2023-08-19 21:26:48 +02:00
parent 9972738deb
commit 59ffd179f4
Signed by: rmontanana
GPG Key ID: 46064262FD9A7ADE
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BayesNet/BoostAODE.cc
View File

@ -16,7 +16,7 @@ namespace bayesnet {
auto X_ = dataset.index({ torch::indexing::Slice(0, dataset.size(0) - 1), "..." }); auto X_ = dataset.index({ torch::indexing::Slice(0, dataset.size(0) - 1), "..." });
auto y_ = dataset.index({ -1, "..." }); auto y_ = dataset.index({ -1, "..." });
bool exitCondition = false; bool exitCondition = false;
bool repeatSparent = true; bool repeatSparent = false;
vector<int> featuresUsed; vector<int> featuresUsed;
// Step 0: Set the finish condition // Step 0: Set the finish condition
// if not repeatSparent a finish condition is run out of features // if not repeatSparent a finish condition is run out of features

31
src/Platform/Report.cc
View File

@ -13,20 +13,27 @@ namespace platform {
} }
string Report::fromVector(const string& key) string Report::fromVector(const string& key)
{ {
string result = ""; stringstream oss;
string sep = "";
oss << "[" << fixed << setprecision(16);
for (auto& item : data[key]) { for (auto& item : data[key]) {
result += to_string(item) + ", "; oss << sep << item.get<double>();
sep = ", ";
} }
return "[" + result.substr(0, result.size() - 2) + "]"; oss << "]";
return oss.str();
} }
string fVector(const json& data) string fVector(const string& title, const json& data)
{ {
string result = ""; stringstream oss;
string sep = "";
oss << title << "[" << fixed << setprecision(16);
for (const auto& item : data) { for (const auto& item : data) {
result += to_string(item) + ", "; oss << sep << item.get<double>();
sep = ", ";
} }
return "[" + result.substr(0, result.size() - 2) + "]"; oss << "]";
return oss.str();
} }
void Report::show() void Report::show()
{ {
@ -86,10 +93,10 @@ namespace platform {
} }
if (data["results"].size() == 1) { if (data["results"].size() == 1) {
cout << string(MAXL, '*') << endl; cout << string(MAXL, '*') << endl;
cout << headerLine("Train scores: " + fVector(lastResult["scores_train"])); cout << headerLine(fVector("Train scores: ", lastResult["scores_train"]));
cout << headerLine("Test scores: " + fVector(lastResult["scores_test"])); cout << headerLine(fVector("Test scores: ", lastResult["scores_test"]));
cout << headerLine("Train times: " + fVector(lastResult["times_train"])); cout << headerLine(fVector("Train times: ", lastResult["times_train"]));
cout << headerLine("Test times: " + fVector(lastResult["times_test"])); cout << headerLine(fVector("Test times: ", lastResult["times_test"]));
cout << string(MAXL, '*') << endl; cout << string(MAXL, '*') << endl;
} }
} }