add regulators to test

Signed-off-by: Nitish Bharambe <nitish.bharambe@alliander.com>

Author: nitbharambe

tests/cpp_unit_tests/test_tap_position_optimizer.cpp

@@ -24,11 +24,12 @@ using TestComponentContainer =
               ThreeWindingTransformer, TransformerTapRegulator, Source>;
 using TestState = main_core::MainModelState<TestComponentContainer>;
 
-TransformerInput get_transformer(ID id, ID from, ID to, BranchSide tap_side, IntS tap_pos = na_IntS) {
+TransformerInput get_transformer(ID id, ID from, ID to, BranchSide tap_side, IntS tap_pos = na_IntS,
+                                 IntS from_status = 1) {
     return TransformerInput{.id = id,
                             .from_node = from,
                             .to_node = to,
-                            .from_status = 1,
+                            .from_status = from_status,
                             .to_status = 1,
                             .u1 = nan,
                             .u2 = nan,
@@ -267,7 +268,7 @@ TEST_CASE("Test Transformer ranking") {
         std::vector<TransformerInput> transformers{
             get_transformer(11, 0, 1, BranchSide::from),     get_transformer(12, 0, 1, BranchSide::from),
             get_transformer(13, 5, 7, BranchSide::from),     get_transformer(14, 2, 3, BranchSide::from),
-            get_transformer(15, 8, 9, BranchSide::from),     get_transformer(103, 9, 100, BranchSide::from),
+            get_transformer(15, 8, 9, BranchSide::from),     get_transformer(103, 9, 100, BranchSide::from, na_IntS, 0),
             get_transformer(104, 101, 102, BranchSide::from)};
         main_core::add_component<Transformer>(state, transformers.begin(), transformers.end(), 50.0);
 
@@ -285,9 +286,10 @@ TEST_CASE("Test Transformer ranking") {
         main_core::add_component<Source>(state, sources.begin(), sources.end(), 50.0);
 
         std::vector<TransformerTapRegulatorInput> regulators{
-            get_regulator(23, 11, ControlSide::to), get_regulator(24, 12, ControlSide::to),
-            get_regulator(25, 13, ControlSide::to), get_regulator(26, 14, ControlSide::to),
-            get_regulator(27, 15, ControlSide::to), get_regulator(28, 16, ControlSide::side_2)};
+            get_regulator(23, 11, ControlSide::to),     get_regulator(24, 12, ControlSide::to),
+            get_regulator(25, 13, ControlSide::to),     get_regulator(26, 14, ControlSide::to),
+            get_regulator(27, 15, ControlSide::to),     get_regulator(28, 16, ControlSide::side_2),
+            get_regulator(105, 103, ControlSide::from), get_regulator(106, 104, ControlSide::from)};
         main_core::add_component<TransformerTapRegulator>(state, regulators.begin(), regulators.end(), 50.0);
 
         state.components.set_construction_complete();
@@ -300,10 +302,10 @@ TEST_CASE("Test Transformer ranking") {
             // reference graph creation
             pgm_tap::TrafoGraphEdgeProperties expected_edges_prop;
             expected_edges_prop.insert(expected_edges_prop.end(),
-                                       {{{3, 0}, 1}, {{3, 1}, 1}, {{3, 2}, 1}, {{3, 3}, 1}, {{3, 4}, 1}});
+                                       {{{3, 0}, 1}, {{3, 1}, 1}, {{3, 2}, 1}, {{3, 3}, 1}, {{3, 4}, 1}, {{3, 6}, 1}});
             expected_edges_prop.insert(expected_edges_prop.end(),
                                        {{{4, 0}, 1}, {{4, 0}, 1}, {unregulated_idx, 0}, {unregulated_idx, 0}});
-            expected_edges_prop.insert(expected_edges_prop.end(), 14, {unregulated_idx, 0});
+            expected_edges_prop.insert(expected_edges_prop.end(), 10, {unregulated_idx, 0});
 
             std::vector<pgm_tap::TrafoGraphVertex> const expected_vertex_props{
                 {true},  {false}, {false}, {false}, {false}, {false}, {false},
@@ -353,11 +355,14 @@ TEST_CASE("Test Transformer ranking") {
                                      {10, 10e3}, {100, 10e3}, {101, 10e3}, {102, 10e3}};
         main_core::add_component<Node>(state, nodes.begin(), nodes.end(), 50.0);
 
-        std::vector<TransformerInput> transformers{
-            get_transformer(11, 0, 1, BranchSide::to),      get_transformer(12, 0, 1, BranchSide::from),
-            get_transformer(13, 2, 3, BranchSide::from),    get_transformer(14, 6, 7, BranchSide::from),
-            get_transformer(15, 5, 8, BranchSide::from),    get_transformer(16, 9, 10, BranchSide::from),
-            get_transformer(103, 9, 100, BranchSide::from), get_transformer(104, 101, 102, BranchSide::from)};
+        std::vector<TransformerInput> transformers{get_transformer(11, 0, 1, BranchSide::to),
+                                                   get_transformer(12, 0, 1, BranchSide::from),
+                                                   get_transformer(13, 2, 3, BranchSide::from),
+                                                   get_transformer(14, 6, 7, BranchSide::from),
+                                                   get_transformer(15, 5, 8, BranchSide::from),
+                                                   get_transformer(16, 9, 10, BranchSide::from),
+                                                   get_transformer(103, 9, 100, BranchSide::from, na_IntS, 0),
+                                                   get_transformer(104, 101, 102, BranchSide::from)};
         main_core::add_component<Transformer>(state, transformers.begin(), transformers.end(), 50.0);
 
         std::vector<ThreeWindingTransformerInput> transformers3w{
@@ -374,10 +379,11 @@ TEST_CASE("Test Transformer ranking") {
         main_core::add_component<Source>(state, sources.begin(), sources.end(), 50.0);
 
         std::vector<TransformerTapRegulatorInput> regulators{
-            get_regulator(24, 11, ControlSide::to),    get_regulator(25, 12, ControlSide::to),
-            get_regulator(26, 13, ControlSide::to),    get_regulator(27, 14, ControlSide::to),
-            get_regulator(28, 15, ControlSide::to),    get_regulator(29, 16, ControlSide::to),
-            get_regulator(30, 17, ControlSide::side_2)};
+            get_regulator(24, 11, ControlSide::to),     get_regulator(25, 12, ControlSide::to),
+            get_regulator(26, 13, ControlSide::to),     get_regulator(27, 14, ControlSide::to),
+            get_regulator(28, 15, ControlSide::to),     get_regulator(29, 16, ControlSide::to),
+            get_regulator(30, 17, ControlSide::side_2), get_regulator(105, 103, ControlSide::from),
+            get_regulator(106, 104, ControlSide::from)};
         main_core::add_component<TransformerTapRegulator>(state, regulators.begin(), regulators.end(), 50.0);
 
         state.components.set_construction_complete();