Skip to content

Adjusted formatting in utils file line, which made test coverage script no longer hit that parse error #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2025
Merged

Adjusted formatting in utils file line, which made test coverage script no longer hit that parse error #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,9 @@ std::pair<std::array<double, T>, std::pair<double, double>> RK45_step(
std::array<double, T> 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<double, T> derivative_function_output =
Expand Down
2 changes: 1 addition & 1 deletion test_coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...test_coverage_detailed.PhasedArrayGroundStation.cpp.b1467fc67cdaa758f7764df5452c5918.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
</table>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...s/test_coverage_detailed.PhasedArrayGroundStation.h.5b54056581927049d160ff3354b9e6f1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
</table>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_coverage_detailed.Satellite.cpp.bef08eb3aaec087d7cd23d21b2ecdb00.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
</table>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_coverage_detailed.Satellite.h.016907876294210b00a2d880adf10425.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
</table>
</div>
Expand Down
6 changes: 3 additions & 3 deletions tests/test_coverage_detailed.functions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
</table>
</div>
Expand All @@ -37,9 +37,9 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Lines:</th>
<td>1729</td>
<td>1730</td>
<td>1841</td>
<td class="coverage-high">93.9%</td>
<td class="coverage-high">94.0%</td>
</tr>
<tr>
<th scope="row">Functions:</th>
Expand Down
12 changes: 6 additions & 6 deletions tests/test_coverage_detailed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
<tr>
<th scope="row">Coverage:</th>
Expand All @@ -45,9 +45,9 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Lines:</th>
<td>1729</td>
<td>1730</td>
<td>1841</td>
<td class="coverage-high">93.9%</td>
<td class="coverage-high">94.0%</td>
</tr>
<tr>
<th scope="row">Functions:</th>
Expand Down Expand Up @@ -121,10 +121,10 @@ <h1>GCC Code Coverage Report</h1>
<a href="test_coverage_detailed.utils.h.0924fa377d356c0f9a6a386ccdf5fa6d.html">include/utils.h</a>
</th>
<td>
<meter class="coverage-high" min="0" max="100" value="93.0" title="93.0%">93.0</meter>
<meter class="coverage-high" min="0" max="100" value="93.8" title="93.8%">93.8</meter>
</td>
<td class="CoverValue line-coverage coverage-high">93.0%</td>
<td class="CoverValue line-coverage coverage-high">120 / 129</td>
<td class="CoverValue line-coverage coverage-high">93.8%</td>
<td class="CoverValue line-coverage coverage-high">121 / 129</td>
<td class="CoverValue function-coverage coverage-high">100.0%</td>
<td class="CoverValue function-coverage coverage-high">3 / 3</td>
<td class="CoverValue branch-coverage coverage-low">50.9%</td>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_coverage_detailed.utils.cpp.4d3039dff574b788948119de402ca8d9.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
</table>
</div>
Expand Down
21 changes: 14 additions & 7 deletions tests/test_coverage_detailed.utils.h.0924fa377d356c0f9a6a386ccdf5fa6d.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Date:</th>
<td>2025-05-11 15:08:12</td>
<td>2025-05-11 21:11:47</td>
</tr>
</table>
</div>
Expand All @@ -40,9 +40,9 @@ <h1>GCC Code Coverage Report</h1>
</tr>
<tr>
<th scope="row">Lines:</th>
<td>120</td>
<td>121</td>
<td>129</td>
<td class="coverage-high">93.0%</td>
<td class="coverage-high">93.8%</td>
</tr>
<tr>
<th scope="row">Functions:</th>
Expand Down Expand Up @@ -3250,9 +3250,16 @@ <h1>GCC Code Coverage Report</h1>
<tr class="source-line">
<td class="lineno"><a id="l411" href="#l411">411</a></td>
<td class="linebranch">
<details class="linebranchDetails">
<summary class="linebranchSummary">1/2</summary>
<div class="linebranchContents">
<div class="takenBranch">&check; Branch 0 taken 2659516470 times.</div>
<div class="notTakenBranch">&cross; Branch 1 not taken.</div>
</div>
</details>
</td>
<td class="linecount uncoveredLine">&cross;</td>
<td class="src uncoveredLine"><span class="w"> </span><span class="n">y_n_evaluated_value</span><span class="p">.</span><span class="n">at</span><span class="p">(</span><span class="n">y_val_ind</span><span class="p">)</span><span class="w"> </span><span class="o">+=</span><span class="w"> </span><span class="n">input_step_size</span><span class="w"> </span><span class="o">*</span></td>
<td class="linecount partialCoveredLine">2659516470</td>
<td class="src partialCoveredLine"><span class="w"> </span><span class="n">y_n_evaluated_value</span><span class="p">.</span><span class="n">at</span><span class="p">(</span><span class="n">y_val_ind</span><span class="p">)</span><span class="w"> </span><span class="o">+=</span><span class="w"> </span></td>
</tr>
<tr class="source-line">
<td class="lineno"><a id="l412" href="#l412">412</a></td>
Expand All @@ -3266,7 +3273,7 @@ <h1>GCC Code Coverage Report</h1>
</details>
</td>
<td class="linecount partialCoveredLine">2659516470</td>
<td class="src partialCoveredLine"><span class="w"> </span><span class="n">RK_matrix</span><span class="p">(</span><span class="n">k_ind</span><span class="p">,</span><span class="w"> </span><span class="n">s_ind</span><span class="p">)</span><span class="w"> </span><span class="o">*</span></td>
<td class="src partialCoveredLine"><span class="w"> </span><span class="n">input_step_size</span><span class="w"> </span><span class="o">*</span><span class="w"> </span><span class="n">RK_matrix</span><span class="p">(</span><span class="n">k_ind</span><span class="p">,</span><span class="w"> </span><span class="n">s_ind</span><span class="p">)</span><span class="w"> </span></td>
</tr>
<tr class="source-line">
<td class="lineno"><a id="l413" href="#l413">413</a></td>
Expand All @@ -3282,7 +3289,7 @@ <h1>GCC Code Coverage Report</h1>
</details>
</td>
<td class="linecount partialCoveredLine">2659516470</td>
<td class="src partialCoveredLine"><span class="w"> </span><span class="n">k_vec_vec</span><span class="p">.</span><span class="n">at</span><span class="p">(</span><span class="n">s_ind</span><span class="p">).</span><span class="n">at</span><span class="p">(</span><span class="n">y_val_ind</span><span class="p">);</span></td>
<td class="src partialCoveredLine"><span class="w"> </span><span class="o">*</span><span class="w"> </span><span class="n">k_vec_vec</span><span class="p">.</span><span class="n">at</span><span class="p">(</span><span class="n">s_ind</span><span class="p">).</span><span class="n">at</span><span class="p">(</span><span class="n">y_val_ind</span><span class="p">);</span></td>
</tr>
<tr class="source-line">
<td class="lineno"><a id="l414" href="#l414">414</a></td>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_coverage_summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
{"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}