From 083a56b311bc0e06e9349c333b35ecc9a5937b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Sun, 12 Mar 2023 11:27:02 +0100 Subject: [PATCH] Change seconds for milliseconds in sample change path of coverage report in build --- .github/workflows/build.yml | 2 +- .vscode/settings.json | 3 ++- sample/sample.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 404d5c2..d042490 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,4 +41,4 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \ - --define sonar.coverageReportPaths=tests/coverage.xml + --define sonar.coverageReportPaths=coverage.xml diff --git a/.vscode/settings.json b/.vscode/settings.json index acd9b53..b89d404 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,6 @@ "sonarlint.connectedMode.project": { "connectionId": "sonarcloud", "projectKey": "rmontanana_mdlp" - } + }, + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools" } \ No newline at end of file diff --git a/sample/sample.cpp b/sample/sample.cpp index aab29f9..d8c7b3f 100644 --- a/sample/sample.cpp +++ b/sample/sample.cpp @@ -121,25 +121,25 @@ void process_file(string path, string file_name, bool class_last, int max_depth, void process_all_files(map datasets, string path, int max_depth, int min_length) { cout << "Results: " << "Max_depth: " << max_depth << " Min_length: " << min_length << endl << endl; - printf("%-20s %4s %4s\n", "Dataset", "Feat", "Cuts Time(s)"); - printf("==================== ==== ==== =======\n"); + printf("%-20s %4s %4s\n", "Dataset", "Feat", "Cuts Time(ms)"); + printf("==================== ==== ==== ========\n"); for (auto dataset : datasets) { ArffFiles file; file.load(path + dataset.first + ".arff", dataset.second); auto attributes = file.getAttributes(); vector& X = file.getX(); labels_t& y = file.getY(); - float timing = 0; + size_t timing = 0; int cut_points = 0; for (auto i = 0; i < attributes.size(); i++) { mdlp::CPPFImdlp test = mdlp::CPPFImdlp(min_length, max_depth); std::chrono::steady_clock::time_point begin = std::chrono::steady_clock::now(); test.fit(X[i], y); std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now(); - timing += std::chrono::duration_cast(end - begin).count(); + timing += std::chrono::duration_cast(end - begin).count(); cut_points += test.getCutPoints().size(); } - printf("%-20s %4lu %4d %7.2f\n", dataset.first.c_str(), attributes.size(), cut_points, timing); + printf("%-20s %4lu %4d %8zu\n", dataset.first.c_str(), attributes.size(), cut_points, timing); } }