resolve some sonar-cloud issues

Signed-off-by: Martijn Govers <[email protected]>
PowerGridModel · Jan 23, 2025 · 7b67212 · 7b67212
1 parent d58735e
commit 7b67212
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/observability.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/observability.hpp
@@ -158,8 +158,9 @@ inline ObservabilityResult necessary_observability_check(MeasuredValues<sym> con
     if (topo.is_radial && n_voltage_phasor_sensor == 0) {
         detail::assign_injection_sensor_radial(y_bus_structure, flow_sensors);
         // count flow sensors again
-        Idx const n_flow_sensor_new = std::reduce(flow_sensors.cbegin(), flow_sensors.cend(), Idx{}, std::plus<Idx>{});
-        if (n_flow_sensor_new < n_bus - 1) {
+        if (Idx const n_flow_sensor_new =
+                std::reduce(flow_sensors.cbegin(), flow_sensors.cend(), Idx{}, std::plus<Idx>{});
+            n_flow_sensor_new < n_bus - 1) {
             throw NotObservableError{"The number of power sensors appears sufficient, but they are not independent "
                                      "enough. The system is still not observable.\n"};
         }

diff --git a/...r_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp b/...r_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp
@@ -83,16 +83,14 @@ template <rk2_tensor Matrix> class DenseLUFactor {
             assert(col_biggest_eigen + pivot < size);
 
             // check absolute singular matrix
-            if (biggest_score == 0.0) {
+            if (biggest_score == 0.0 && !use_pivot_perturbation) {
                 // pivot perturbation not possible, cannot proceed
                 // set identity permutation and break the loop
-                if (!use_pivot_perturbation) {
-                    for (int8_t remaining_rows_cols = pivot; remaining_rows_cols != size; ++remaining_rows_cols) {
-                        row_transpositions[remaining_rows_cols] = remaining_rows_cols;
-                        col_transpositions[remaining_rows_cols] = remaining_rows_cols;
-                    }
-                    break;
+                for (int8_t remaining_rows_cols = pivot; remaining_rows_cols != size; ++remaining_rows_cols) {
+                    row_transpositions[remaining_rows_cols] = remaining_rows_cols;
+                    col_transpositions[remaining_rows_cols] = remaining_rows_cols;
                 }
+                break;
             }
 
             // perturb pivot if needed
@@ -571,7 +569,7 @@ template <class Tensor, class RHSVector, class XVector> class SparseLUSolver {
 
     void solve_once(std::vector<Tensor> const& data,        // pre-factoirzed data, const ref
                     BlockPermArray const& block_perm_array, // pre-calculated permutation, const ref
-                    std::vector<RHSVector> const& rhs, std::vector<XVector>& x) {
+                    std::vector<RHSVector> const& rhs, std::vector<XVector>& x) const {
         // local reference
         auto const& row_indptr = *row_indptr_;
         auto const& col_indices = *col_indices_;