Merge pull request #885 from PowerGridModel/bug/auto-tap-inf-loop

petersalemink95 · web-flow · commit c167b261d584 · 2025-01-28T09:52:15.000+01:00
fix for infinite loop in automatic tap changer
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp
@@ -899,13 +899,14 @@ class TapPositionOptimizerImpl<std::tuple<TransformerTypes...>, StateCalculator,
                         adjust_transformer(regulator, state, result, update_data, search, options) || tap_changed;
                 }
                 if (tap_changed) {
+                    iterations_per_rank[rank_index + 1] = 0;
+                    ++iterations_per_rank[rank_index];
                     break;
                 }
-                iterations_per_rank[++rank_index] = 0; // NOSONAR
+                ++rank_index;
             }
             if (tap_changed) {
-                if (static_cast<uint64_t>(++iterations_per_rank[rank_index]) >
-                    2 * max_tap_ranges_per_rank[rank_index]) {
+                if (static_cast<uint64_t>(iterations_per_rank[rank_index]) > 2 * max_tap_ranges_per_rank[rank_index]) {
                     throw MaxIterationReached{"TapPositionOptimizer::iterate"};
                 }
                 update_state(update_data);

Original file line number	Diff line number	Diff line change
`@@ -899,13 +899,14 @@ class TapPositionOptimizerImpl<std::tuple<TransformerTypes...>, StateCalculator,`
`899`	`899`	`adjust_transformer(regulator, state, result, update_data, search, options) \|\| tap_changed;`
`900`	`900`	`}`
`901`	`901`	`if (tap_changed) {`
	`902`	`+ iterations_per_rank[rank_index + 1] = 0;`
	`903`	`+ ++iterations_per_rank[rank_index];`
`902`	`904`	`break;`
`903`	`905`	`}`
`904`		`- iterations_per_rank[++rank_index] = 0; // NOSONAR`
	`906`	`+ ++rank_index;`
`905`	`907`	`}`
`906`	`908`	`if (tap_changed) {`
`907`		`- if (static_cast<uint64_t>(++iterations_per_rank[rank_index]) >`
`908`		`- 2 * max_tap_ranges_per_rank[rank_index]) {`
	`909`	`+ if (static_cast<uint64_t>(iterations_per_rank[rank_index]) > 2 * max_tap_ranges_per_rank[rank_index]) {`
`909`	`910`	`throw MaxIterationReached{"TapPositionOptimizer::iterate"};`
`910`	`911`	`}`
`911`	`912`	`update_state(update_data);`