w.i.p.

Signed-off-by: Jerry Guo <[email protected]>
PowerGridModel · Feb 12, 2025 · 0de631b · 0de631b
1 parent fc64e4a
commit 0de631b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 46 deletions.
diff --git a/...id_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp b/...id_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp
@@ -711,7 +711,7 @@ class TapPositionOptimizerImpl<std::tuple<TransformerTypes...>, StateCalculator,
             //  - tap_max > tap_min && strategy_max == true
             //  - tap_max < tap_min && strategy_max == false
             // Upper bound should be updated to the current tap position if the rest is the case.
-            bool invert_strategy = control_at_tap_side_ ? !strategy_max : strategy_max;
+            bool const invert_strategy = control_at_tap_side_ ? !strategy_max : strategy_max;
             if (tap_reverse_ == invert_strategy) {
                 lower_bound_ = current_;
                 last_down_ = false;

diff --git a/tests/cpp_unit_tests/test_optimizer.hpp b/tests/cpp_unit_tests/test_optimizer.hpp
@@ -217,64 +217,36 @@ constexpr auto strategy_search_and_sides = [] {
 }();
 
 constexpr auto strategy_search_and_sides_xs = std::array{
-    // OptimizerStrategySearchSide{OptimizerStrategy::any, SearchMethod::linear_search, ControlSide::side_1},  // v tf
-    // control_at_tap_side_a=true
-    // OptimizerStrategySearchSide{OptimizerStrategy::any, SearchMethod::linear_search, ControlSide::side_2},  // v ft
-    // control_at_tap_side_b=true
-    // OptimizerStrategySearchSide{OptimizerStrategy::any, SearchMethod::linear_search, ControlSide::side_3},  // v ff
-    // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::linear_search, ControlSide::side_1},
-    // // v tf control_at_tap_side_a=true
-    OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::linear_search,
-                                ControlSide::side_2}, // x ft control_at_tap_side_b=true
-    // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::linear_search, ControlSide::side_3},
-    // // v ff
-    // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::linear_search, ControlSide::side_1},
-    // // v
-    OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::linear_search,
-                                ControlSide::side_2}, // x control_at_tap_side_b=true
-    // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::linear_search, ControlSide::side_3},
-    // // v
+    // OptimizerStrategySearchSide{OptimizerStrategy::any, SearchMethod::linear_search, ControlSide::side_1},  // v 
+    // OptimizerStrategySearchSide{OptimizerStrategy::any, SearchMethod::linear_search, ControlSide::side_2},  // v 
+    // OptimizerStrategySearchSide{OptimizerStrategy::any, SearchMethod::linear_search, ControlSide::side_3},  // v 
+    // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::linear_search, ControlSide::side_1}, // x
+    OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::linear_search, ControlSide::side_2}, // v
+    // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::linear_search, ControlSide::side_3}, // 
+    // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::linear_search, ControlSide::side_1}, // 
+    // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::linear_search, ControlSide::side_2}, // v
+    // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::linear_search, ControlSide::side_3}, 
     // OptimizerStrategySearchSide{OptimizerStrategy::global_maximum, SearchMethod::linear_search, ControlSide::side_1},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::global_maximum, SearchMethod::linear_search, ControlSide::side_2},
-    // // x control_at_tap_side_b=true
     // OptimizerStrategySearchSide{OptimizerStrategy::global_maximum, SearchMethod::linear_search, ControlSide::side_3},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::global_minimum, SearchMethod::linear_search, ControlSide::side_1},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::global_minimum, SearchMethod::linear_search, ControlSide::side_2},
-    // // x control_at_tap_side_b=true
     // OptimizerStrategySearchSide{OptimizerStrategy::global_minimum, SearchMethod::linear_search, ControlSide::side_3},
-    // // v
-    // OptimizerStrategySearchSide{OptimizerStrategy::fast_any, SearchMethod::binary_search, ControlSide::side_1}, // x
-    // control_at_tap_side_a=true
-    // OptimizerStrategySearchSide{OptimizerStrategy::fast_any, SearchMethod::binary_search, ControlSide::side_2}, // x
-    // control_at_tap_side_b=true
-    // OptimizerStrategySearchSide{OptimizerStrategy::fast_any, SearchMethod::binary_search, ControlSide::side_3}, // x
-    // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::binary_search, ControlSide::side_1},
-    // // v
+    // OptimizerStrategySearchSide{OptimizerStrategy::fast_any, SearchMethod::binary_search, ControlSide::side_1}, // 
+    // OptimizerStrategySearchSide{OptimizerStrategy::fast_any, SearchMethod::binary_search, ControlSide::side_2}, // 
+    // OptimizerStrategySearchSide{OptimizerStrategy::fast_any, SearchMethod::binary_search, ControlSide::side_3}, // 
+    // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::binary_search, ControlSide::side_1}, // x
     // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::binary_search, ControlSide::side_2},
-    // // x
     // OptimizerStrategySearchSide{OptimizerStrategy::local_maximum, SearchMethod::binary_search, ControlSide::side_3},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::binary_search, ControlSide::side_1},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::binary_search, ControlSide::side_2},
-    // // x
     // OptimizerStrategySearchSide{OptimizerStrategy::local_minimum, SearchMethod::binary_search, ControlSide::side_3},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::global_maximum, SearchMethod::binary_search, ControlSide::side_1},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::global_maximum, SearchMethod::binary_search, ControlSide::side_2},
-    // // x
     // OptimizerStrategySearchSide{OptimizerStrategy::global_maximum, SearchMethod::binary_search, ControlSide::side_3},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::global_minimum, SearchMethod::binary_search, ControlSide::side_1},
-    // // v
     // OptimizerStrategySearchSide{OptimizerStrategy::global_minimum, SearchMethod::binary_search, ControlSide::side_2},
-    // // x
     // OptimizerStrategySearchSide{OptimizerStrategy::global_minimum, SearchMethod::binary_search, ControlSide::side_3},
-    // // v
 };
 
 struct OptStrategyMethodSearch {

diff --git a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp
@@ -640,6 +640,7 @@ auto check_exact_per_strategy(IntS tap_pos_any, IntS tap_pos_min, IntS tap_pos_m
 
         switch (strategy) {
         case any:
+        case fast_any:
             CHECK(value == tap_pos_any);
             break;
         case local_maximum:
@@ -953,7 +954,7 @@ TEST_CASE("Test Tap position optimizer") {
 
             SUBCASE("voltage band") { // xx // needs update to take into account the control side
                 state_b.rank = 0;
-                state_b.u_pu = [&state_b, &regulator_b](ControlSide side) {
+                state_b.u_pu = [&state_b, &regulator_b](ControlSide /*side*/) {
                     return static_cast<DoubleComplex>(
                         test::normalized_lerp(state_b.tap_pos, state_b.tap_min, state_b.tap_max));
                 };
@@ -965,9 +966,9 @@ TEST_CASE("Test Tap position optimizer") {
                 SUBCASE("normal tap range") {
                     checkNormalTapRange(state_b, update_data, check_b, control_at_tap_side);
                 } // xx needs dual case
-                SUBCASE("inverted tap range") {
-                    checkInvertedTapRange(state_b, update_data, check_b, control_at_tap_side);
-                } // xx
+                // SUBCASE("inverted tap range") {
+                //     checkInvertedTapRange(state_b, update_data, check_b, control_at_tap_side);
+                // } // xx
 
                 regulator_b.update(update_data);
             }