diff --git a/src/main/Experiment.cpp b/src/main/Experiment.cpp index 08016e9..64affe1 100644 --- a/src/main/Experiment.cpp +++ b/src/main/Experiment.cpp @@ -194,14 +194,6 @@ namespace platform { // // Train model // - std::cout << "X_Train.dtype: " << X_train.dtype() << "\n"; - std::cout << "y_Train.dtype: " << y_train.dtype() << "\n"; - std::cout << "X_Test.dtype: " << X_test.dtype() << "\n"; - std::cout << "y_Test.dtype: " << y_test.dtype() << "\n"; - for (int i = 0; i < features.size(); i++) { - std::cout << "Feature: " << features[i] << " states: " << states[features[i]].size() << "\n"; - } - std::cout << "className: " << className << " states: " << states[className].size() << "\n"; clf->fit(X_train, y_train, features, className, states); if (!quiet) showProgress(nfold + 1, getColor(clf->getStatus()), "b"); diff --git a/src/reports/ReportConsole.cpp b/src/reports/ReportConsole.cpp index 8f55b19..92b670c 100644 --- a/src/reports/ReportConsole.cpp +++ b/src/reports/ReportConsole.cpp @@ -23,8 +23,9 @@ namespace platform { + " random seeds. " + data["date"].get() + " " + data["time"].get() ); sheader << headerLine(data["title"].get()); + std::string algorithm = data["discretized"].get() ? " (" + data["discretization_algorithm"].get() + ")" : ""; sheader << headerLine( - "Random seeds: " + fromVector("seeds") + " Discretized: " + (data["discretized"].get() ? "True" : "False") + "Random seeds: " + fromVector("seeds") + " Discretized: " + (data["discretized"].get() ? "True" : "False") + algorithm + " Stratified: " + (data["stratified"].get() ? "True" : "False") ); oss << "Execution took " << std::setprecision(2) << std::fixed << data["duration"].get() diff --git a/src/reports/ReportExcel.cpp b/src/reports/ReportExcel.cpp index 01579bc..0a63b5a 100644 --- a/src/reports/ReportExcel.cpp +++ b/src/reports/ReportExcel.cpp @@ -65,7 +65,8 @@ namespace platform { worksheet_merge_range(worksheet, 3, 10, 3, 11, oss.str().c_str(), styles["headerSmall"]); oss.str(""); oss.clear(); - oss << "Discretized: " << (data["discretized"].get() ? "True" : "False"); + std::string algorithm = data["discretized"].get() ? " (" + data["discretization_algorithm"].get() + ")" : ""; + oss << "Discretized: " << (data["discretized"].get() ? "True" : "False") << algorithm; worksheet_write_string(worksheet, 3, 12, oss.str().c_str(), styles["headerSmall"]); } void ReportExcel::header_notes(int row)