rmontanana/Platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix b_main order of datasets if --datasets parameter used

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2025-01-18 20:31:58 +01:00
parent 3397d0962f
commit 2a9652b450
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/commands/b_grid.cpp
View File

@@ -33,7 +33,6 @@ void assignModel(argparse::ArgumentParser& parser)
} }
); );
} }
void add_search_args(argparse::ArgumentParser& program) void add_search_args(argparse::ArgumentParser& program)
{ {
auto env = platform::DotEnv(); auto env = platform::DotEnv();

18
src/main/Experiment.cpp
View File

@@ -43,6 +43,22 @@ namespace platform {
} }
} }
} }
Experiment& Experiment::setSmoothSrategy(const std::string& smooth_strategy)
{
this->smooth_strategy = smooth_strategy;
this->result.setSmoothStrategy(smooth_strategy);
if (smooth_strategy == "ORIGINAL")
smooth_type = bayesnet::Smoothing_t::ORIGINAL;
else if (smooth_strategy == "LAPLACE")
smooth_type = bayesnet::Smoothing_t::LAPLACE;
else if (smooth_strategy == "CESTNIK")
smooth_type = bayesnet::Smoothing_t::CESTNIK;
else {
std::cerr << "Experiment: Unknown smoothing strategy: " << smooth_strategy << std::endl;
exit(1);
}
return *this;
}
void Experiment::go() void Experiment::go()
{ {
for (auto fileName : filesToTest) { for (auto fileName : filesToTest) {
@@ -64,6 +80,8 @@ namespace platform {
std::cout << " --- " << string(max_name, '-') << " ----- ----- ---- " << string(4 + 3 * nfolds, '-') << " ----------" << Colors::RESET() << std::endl; std::cout << " --- " << string(max_name, '-') << " ----- ----- ---- " << string(4 + 3 * nfolds, '-') << " ----------" << Colors::RESET() << std::endl;
} }
int num = 0; int num = 0;
// Sort files to test to have a consistent order even if --datasets is used
std::stable_sort(filesToTest.begin(), filesToTest.end());
for (auto fileName : filesToTest) { for (auto fileName : filesToTest) {
if (!quiet) if (!quiet)
std::cout << " " << setw(3) << right << num++ << " " << setw(max_name) << left << fileName << right << flush; std::cout << " " << setw(3) << right << num++ << " " << setw(max_name) << left << fileName << right << flush;

17
src/main/Experiment.h
View File

@@ -25,22 +25,7 @@ namespace platform {
{ {
this->discretization_algo = discretization_algo; this->result.setDiscretizationAlgorithm(discretization_algo); return *this; this->discretization_algo = discretization_algo; this->result.setDiscretizationAlgorithm(discretization_algo); return *this;
} }
Experiment& setSmoothSrategy(const std::string& smooth_strategy) Experiment& setSmoothSrategy(const std::string& smooth_strategy);
{
this->smooth_strategy = smooth_strategy;
this->result.setSmoothStrategy(smooth_strategy);
if (smooth_strategy == "ORIGINAL")
smooth_type = bayesnet::Smoothing_t::ORIGINAL;
else if (smooth_strategy == "LAPLACE")
smooth_type = bayesnet::Smoothing_t::LAPLACE;
else if (smooth_strategy == "CESTNIK")
smooth_type = bayesnet::Smoothing_t::CESTNIK;
else {
std::cerr << "Experiment: Unknown smoothing strategy: " << smooth_strategy << std::endl;
exit(1);
}
return *this;
}
Experiment& setLanguageVersion(const std::string& language_version) { this->result.setLanguageVersion(language_version); return *this; } Experiment& setLanguageVersion(const std::string& language_version) { this->result.setLanguageVersion(language_version); return *this; }
Experiment& setDiscretized(bool discretized) { this->discretized = discretized; result.setDiscretized(discretized); return *this; } Experiment& setDiscretized(bool discretized) { this->discretized = discretized; result.setDiscretized(discretized); return *this; }
Experiment& setStratified(bool stratified) { this->stratified = stratified; result.setStratified(stratified); return *this; } Experiment& setStratified(bool stratified) { this->stratified = stratified; result.setStratified(stratified); return *this; }