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

Add SPODENew to models

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2023-08-05 23:11:36 +02:00
parent 506ef34c6f
commit 1d0fd629c9
7 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Platform/Models.h
View File

@@ -8,6 +8,7 @@
#include "SPODE.h"
#include "TANNew.h"
#include "KDBNew.h"
#include "SPODENew.h"
namespace platform {
class Models {
private:

6
src/Platform/Report.cc
View File

@@ -48,9 +48,9 @@ namespace platform {
cout << setw(6) << right << r["samples"].get<int>() << " ";
cout << setw(5) << right << r["features"].get<int>() << " ";
cout << setw(3) << right << r["classes"].get<int>() << " ";
cout << setw(7) << right << r["nodes"].get<float>() << " ";
cout << setw(7) << right << r["leaves"].get<float>() << " ";
cout << setw(7) << right << r["depth"].get<float>() << " ";
cout << setw(7) << setprecision(2) << fixed << r["nodes"].get<float>() << " ";
cout << setw(7) << setprecision(2) << fixed << r["leaves"].get<float>() << " ";
cout << setw(7) << setprecision(2) << fixed << r["depth"].get<float>() << " ";
cout << setw(8) << right << setprecision(6) << fixed << r["score_test"].get<double>() << "±" << setw(6) << setprecision(4) << fixed << r["score_test_std"].get<double>() << " ";
cout << setw(10) << right << setprecision(6) << fixed << r["test_time"].get<double>() << "±" << setw(6) << setprecision(4) << fixed << r["test_time_std"].get<double>() << " ";
cout << " " << r["hyperparameters"].get<string>();

2
src/Platform/modelRegister.h
View File

@@ -6,6 +6,8 @@ static platform::Registrar registrarTN("TANNew",
[](void) -> bayesnet::BaseClassifier* { return new bayesnet::TANNew();});
static platform::Registrar registrarS("SPODE",
[](void) -> bayesnet::BaseClassifier* { return new bayesnet::SPODE(2);});
static platform::Registrar registrarSN("SPODENew",
[](void) -> bayesnet::BaseClassifier* { return new bayesnet::SPODENew(2);});
static platform::Registrar registrarK("KDB",
[](void) -> bayesnet::BaseClassifier* { return new bayesnet::KDB(2);});
static platform::Registrar registrarKN("KDBNew",