From 238fa819f8f49c43b6d7123a2d92c0ca4e485ee0 Mon Sep 17 00:00:00 2001 From: Connor Powers <20464743+connor-powers@users.noreply.github.com> Date: Sun, 11 May 2025 21:24:21 -0700 Subject: [PATCH] Adjusted formatting in utils file line, which made test coverage script no longer hit that "suspicious hit" warning --- include/utils.h | 6 +++--- test_coverage.sh | 2 +- ....cpp.b1467fc67cdaa758f7764df5452c5918.html | 2 +- ...on.h.5b54056581927049d160ff3354b9e6f1.html | 2 +- ....cpp.bef08eb3aaec087d7cd23d21b2ecdb00.html | 2 +- ...te.h.016907876294210b00a2d880adf10425.html | 2 +- tests/test_coverage_detailed.functions.html | 6 +++--- tests/test_coverage_detailed.html | 12 +++++------ ....cpp.4d3039dff574b788948119de402ca8d9.html | 2 +- ...ls.h.0924fa377d356c0f9a6a386ccdf5fa6d.html | 21 ++++++++++++------- tests/test_coverage_summary.json | 2 +- 11 files changed, 33 insertions(+), 26 deletions(-) diff --git a/include/utils.h b/include/utils.h index 3f931d7..11409f5 100644 --- a/include/utils.h +++ b/include/utils.h @@ -408,9 +408,9 @@ std::pair, std::pair> RK45_step( std::array k_vec_at_this_s; for (size_t s_ind = 0; s_ind < k_ind; s_ind++) { for (size_t y_val_ind = 0; y_val_ind < y_n.size(); y_val_ind++) { - y_n_evaluated_value.at(y_val_ind) += input_step_size * - RK_matrix(k_ind, s_ind) * - k_vec_vec.at(s_ind).at(y_val_ind); + y_n_evaluated_value.at(y_val_ind) += + input_step_size * RK_matrix(k_ind, s_ind) + * k_vec_vec.at(s_ind).at(y_val_ind); } } std::array derivative_function_output = diff --git a/test_coverage.sh b/test_coverage.sh index 7a92de2..9a6d1bc 100755 --- a/test_coverage.sh +++ b/test_coverage.sh @@ -6,6 +6,6 @@ cmake --build . ./Satellite_tests ./utils_tests ./gs_tests -gcovr -r .. --filter ../src/ --filter ../include/ --json-summary ../tests/test_coverage_summary.json --html-details ../tests/test_coverage_detailed.html --gcov-ignore-parse-errors=suspicious_hits.warn +gcovr -r .. --filter ../src/ --filter ../include/ --json-summary ../tests/test_coverage_summary.json --html-details ../tests/test_coverage_detailed.html cd .. rm test_plot.png \ No newline at end of file diff --git a/tests/test_coverage_detailed.PhasedArrayGroundStation.cpp.b1467fc67cdaa758f7764df5452c5918.html b/tests/test_coverage_detailed.PhasedArrayGroundStation.cpp.b1467fc67cdaa758f7764df5452c5918.html index 9960e9a..3460536 100644 --- a/tests/test_coverage_detailed.PhasedArrayGroundStation.cpp.b1467fc67cdaa758f7764df5452c5918.html +++ b/tests/test_coverage_detailed.PhasedArrayGroundStation.cpp.b1467fc67cdaa758f7764df5452c5918.html @@ -26,7 +26,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 diff --git a/tests/test_coverage_detailed.PhasedArrayGroundStation.h.5b54056581927049d160ff3354b9e6f1.html b/tests/test_coverage_detailed.PhasedArrayGroundStation.h.5b54056581927049d160ff3354b9e6f1.html index 7924704..c2d5950 100644 --- a/tests/test_coverage_detailed.PhasedArrayGroundStation.h.5b54056581927049d160ff3354b9e6f1.html +++ b/tests/test_coverage_detailed.PhasedArrayGroundStation.h.5b54056581927049d160ff3354b9e6f1.html @@ -26,7 +26,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 diff --git a/tests/test_coverage_detailed.Satellite.cpp.bef08eb3aaec087d7cd23d21b2ecdb00.html b/tests/test_coverage_detailed.Satellite.cpp.bef08eb3aaec087d7cd23d21b2ecdb00.html index 8ac5560..ec29dd8 100644 --- a/tests/test_coverage_detailed.Satellite.cpp.bef08eb3aaec087d7cd23d21b2ecdb00.html +++ b/tests/test_coverage_detailed.Satellite.cpp.bef08eb3aaec087d7cd23d21b2ecdb00.html @@ -26,7 +26,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 diff --git a/tests/test_coverage_detailed.Satellite.h.016907876294210b00a2d880adf10425.html b/tests/test_coverage_detailed.Satellite.h.016907876294210b00a2d880adf10425.html index 4b543eb..b61a902 100644 --- a/tests/test_coverage_detailed.Satellite.h.016907876294210b00a2d880adf10425.html +++ b/tests/test_coverage_detailed.Satellite.h.016907876294210b00a2d880adf10425.html @@ -26,7 +26,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 diff --git a/tests/test_coverage_detailed.functions.html b/tests/test_coverage_detailed.functions.html index 4eddd2e..3fcc3be 100644 --- a/tests/test_coverage_detailed.functions.html +++ b/tests/test_coverage_detailed.functions.html @@ -22,7 +22,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 @@ -37,9 +37,9 @@

GCC Code Coverage Report

Lines: - 1729 + 1730 1841 - 93.9% + 94.0% Functions: diff --git a/tests/test_coverage_detailed.html b/tests/test_coverage_detailed.html index 23a27ed..8306fe9 100644 --- a/tests/test_coverage_detailed.html +++ b/tests/test_coverage_detailed.html @@ -22,7 +22,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 Coverage: @@ -45,9 +45,9 @@

GCC Code Coverage Report

Lines: - 1729 + 1730 1841 - 93.9% + 94.0% Functions: @@ -121,10 +121,10 @@

GCC Code Coverage Report

include/utils.h - 93.0 + 93.8 - 93.0% - 120 / 129 + 93.8% + 121 / 129 100.0% 3 / 3 50.9% diff --git a/tests/test_coverage_detailed.utils.cpp.4d3039dff574b788948119de402ca8d9.html b/tests/test_coverage_detailed.utils.cpp.4d3039dff574b788948119de402ca8d9.html index 65efed8..b137e23 100644 --- a/tests/test_coverage_detailed.utils.cpp.4d3039dff574b788948119de402ca8d9.html +++ b/tests/test_coverage_detailed.utils.cpp.4d3039dff574b788948119de402ca8d9.html @@ -26,7 +26,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 diff --git a/tests/test_coverage_detailed.utils.h.0924fa377d356c0f9a6a386ccdf5fa6d.html b/tests/test_coverage_detailed.utils.h.0924fa377d356c0f9a6a386ccdf5fa6d.html index eb758d5..739a3f1 100644 --- a/tests/test_coverage_detailed.utils.h.0924fa377d356c0f9a6a386ccdf5fa6d.html +++ b/tests/test_coverage_detailed.utils.h.0924fa377d356c0f9a6a386ccdf5fa6d.html @@ -26,7 +26,7 @@

GCC Code Coverage Report

Date: - 2025-05-11 15:08:12 + 2025-05-11 21:11:47 @@ -40,9 +40,9 @@

GCC Code Coverage Report

Lines: - 120 + 121 129 - 93.0% + 93.8% Functions: @@ -3250,9 +3250,16 @@

GCC Code Coverage Report

411 +
+ 1/2 +
+
✓ Branch 0 taken 2659516470 times.
+
✗ Branch 1 not taken.
+
+
- ✗ - y_n_evaluated_value.at(y_val_ind) += input_step_size * + 2659516470 + y_n_evaluated_value.at(y_val_ind) += 412 @@ -3266,7 +3273,7 @@

GCC Code Coverage Report

2659516470 - RK_matrix(k_ind, s_ind) * + input_step_size * RK_matrix(k_ind, s_ind) 413 @@ -3282,7 +3289,7 @@

GCC Code Coverage Report

2659516470 - k_vec_vec.at(s_ind).at(y_val_ind); + * k_vec_vec.at(s_ind).at(y_val_ind); 414 diff --git a/tests/test_coverage_summary.json b/tests/test_coverage_summary.json index c607e3d..46b986c 100644 --- a/tests/test_coverage_summary.json +++ b/tests/test_coverage_summary.json @@ -1 +1 @@ -{"root": "..", "gcovr/summary_format_version": "0.6", "files": [{"filename": "include/PhasedArrayGroundStation.h", "line_total": 11, "line_covered": 11, "line_percent": 100.0, "function_total": 3, "function_covered": 3, "function_percent": 100.0, "branch_total": 2, "branch_covered": 1, "branch_percent": 50.0}, {"filename": "include/Satellite.h", "line_total": 201, "line_covered": 201, "line_percent": 100.0, "function_total": 20, "function_covered": 20, "function_percent": 100.0, "branch_total": 178, "branch_covered": 110, "branch_percent": 61.8}, {"filename": "include/utils.h", "line_total": 129, "line_covered": 120, "line_percent": 93.0, "function_total": 3, "function_covered": 3, "function_percent": 100.0, "branch_total": 222, "branch_covered": 113, "branch_percent": 50.9}, {"filename": "src/PhasedArrayGroundStation.cpp", "line_total": 79, "line_covered": 78, "line_percent": 98.7, "function_total": 6, "function_covered": 6, "function_percent": 100.0, "branch_total": 57, "branch_covered": 41, "branch_percent": 71.9}, {"filename": "src/Satellite.cpp", "line_total": 425, "line_covered": 406, "line_percent": 95.5, "function_total": 22, "function_covered": 21, "function_percent": 95.5, "branch_total": 130, "branch_covered": 104, "branch_percent": 80.0}, {"filename": "src/utils.cpp", "line_total": 996, "line_covered": 913, "line_percent": 91.7, "function_total": 28, "function_covered": 28, "function_percent": 100.0, "branch_total": 746, "branch_covered": 437, "branch_percent": 58.6}], "line_total": 1841, "line_covered": 1729, "line_percent": 93.9, "function_total": 82, "function_covered": 81, "function_percent": 98.8, "branch_total": 1335, "branch_covered": 806, "branch_percent": 60.4} \ No newline at end of file +{"root": "..", "gcovr/summary_format_version": "0.6", "files": [{"filename": "include/PhasedArrayGroundStation.h", "line_total": 11, "line_covered": 11, "line_percent": 100.0, "function_total": 3, "function_covered": 3, "function_percent": 100.0, "branch_total": 2, "branch_covered": 1, "branch_percent": 50.0}, {"filename": "include/Satellite.h", "line_total": 201, "line_covered": 201, "line_percent": 100.0, "function_total": 20, "function_covered": 20, "function_percent": 100.0, "branch_total": 178, "branch_covered": 110, "branch_percent": 61.8}, {"filename": "include/utils.h", "line_total": 129, "line_covered": 121, "line_percent": 93.8, "function_total": 3, "function_covered": 3, "function_percent": 100.0, "branch_total": 222, "branch_covered": 113, "branch_percent": 50.9}, {"filename": "src/PhasedArrayGroundStation.cpp", "line_total": 79, "line_covered": 78, "line_percent": 98.7, "function_total": 6, "function_covered": 6, "function_percent": 100.0, "branch_total": 57, "branch_covered": 41, "branch_percent": 71.9}, {"filename": "src/Satellite.cpp", "line_total": 425, "line_covered": 406, "line_percent": 95.5, "function_total": 22, "function_covered": 21, "function_percent": 95.5, "branch_total": 130, "branch_covered": 104, "branch_percent": 80.0}, {"filename": "src/utils.cpp", "line_total": 996, "line_covered": 913, "line_percent": 91.7, "function_total": 28, "function_covered": 28, "function_percent": 100.0, "branch_total": 746, "branch_covered": 437, "branch_percent": 58.6}], "line_total": 1841, "line_covered": 1730, "line_percent": 94.0, "function_total": 82, "function_covered": 81, "function_percent": 98.8, "branch_total": 1335, "branch_covered": 806, "branch_percent": 60.4} \ No newline at end of file