Merge links into nodes: update pf and sc tests

power_grid_model_c/power_grid_model/include/power_grid_model/calculation_parameters.hpp

@@ -506,7 +506,8 @@ struct ReducedComponentTopology {
 
 struct TopologicalNode {
     IdxVector user_nodes;
-    std::vector<BranchIdx> user_links; // TODO(figueroa1395): temporarily doesn't have user nodes, but internal nodes while exploring
+    std::vector<BranchIdx>
+        user_links; // TODO(figueroa1395): temporarily doesn't have user nodes, but internal nodes while exploring
 
     constexpr auto is_supernode() const noexcept -> bool { return user_nodes.size() > 1 && !user_links.empty(); }
 };

tests/cpp_unit_tests/test_supernodes.cpp

@@ -165,7 +165,7 @@ TEST_CASE("Test Supernodes") {
             CHECK(std::ranges::equal(
                 topo_nodes.topo_nodes |
                     std::views::transform([](TopologicalNode const& node) -> auto& { return node.user_links; }),
-                std::vector<std::vector<BranchIdx>>{{{0, disconnected}}, {{disconnected, 0}}, {{0, 1}}, {}, {}}));
+                std::vector<std::vector<BranchIdx>>{{}, {}, {{0, 1}}, {}, {}}));
 
             CHECK(std::ranges::equal(topo_nodes.coupling.user_nodes_to_topo_nodes,
                                      std::vector<Idx2D>{{.group = 0, .pos = 0},
@@ -176,10 +176,10 @@ TEST_CASE("Test Supernodes") {
                                                         {.group = 4, .pos = 0}}));
 
             CHECK(std::ranges::equal(topo_nodes.coupling.user_links_to_topo_nodes,
-                                     std::vector<Idx2D>{{.group = 0, .pos = 0},
+                                     std::vector<Idx2D>{{.group = 0, .pos = disconnected},
                                                         {.group = 2, .pos = 0},
                                                         {.group = disconnected, .pos = disconnected},
-                                                        {.group = 1, .pos = 0}}));
+                                                        {.group = 1, .pos = disconnected}}));
         }
     }
     SUBCASE("construct_reduced_topology") {

tests/data/power_flow/dummy-test-line-into-itself/asym_output_batch.json

@@ -8,7 +8,7 @@
       "node": [
         {"id": 1, "energized": 1, "u_pu": [1.0500026617673375, 1.0500026861214569, 1.0500026124692983], "u": [6062.1931942119581, 6062.1933348205321, 6062.1929095895966], "u_angle": [-1.4832085018044952e-06, -2.0943962754744163, 2.0943933209409646], "p": [449675.58787595929, 335421.00166105793, 560453.31676893623], "q": [-981235.41197776445, -978376.30039988051, -974972.90706424485]},
         {"id": 2, "energized": 1, "u_pu": [1.0489305412180272, 1.0488408010290586, 1.047862975371989], "u": [6056.003303334478, 6055.4851881118975, 6049.8397090486005], "u_angle": [-0.0031192166967468683, -2.0971289939257418, 2.0904277197067258], "p": [0.0016991138504116397, 0.0037284466839334995, -0.003119483334405209], "q": [-0.0026769212471873154, -0.0064291658102272617, -0.0016728438498193419]},
-        {"id": 3, "energized": 1, "u_pu": [1.0489305377088716, 1.0488407990932342, 1.0478629702944795], "u": [6056.0032830743594, 6055.48517693541, 6049.8396797335854], "u_angle": [-0.0031192079794357627, -2.0971289867084129, 2.0904277299238556], "p": [-440102.09839980368, -330020.10079295578, -549008.40602486604], "q": [-220051.05491385818, -220013.40255902623, -219603.34729454646]}
+        {"id": 3, "energized": 1, "u_pu": [1.0489305411522316, 1.0488408010053642, 1.04786297529498795], "u": [6056.0033029546424, 6055.485187975122, 6049.8397086040414], "u_angle": [-0.0031192079794357627, -2.0971289867084129, 2.0904277299238556], "p": [-440102.09839980368, -330020.10079295578, -549008.40602486604], "q": [-220051.05491385818, -220013.40255902623, -219603.34729454646]}
       ],
       "line": [
         {"id": 4, "energized": 1, "p_from": [447366.50582515739, 333111.91732260247, 558144.23634554166], "q_from": [-958144.59097641951, -955285.4754396549, -951882.08489887649], "i_from": [174.43180283068381, 166.88654765669233, 182.02178483504079], "s_from": [1057439.2879742936, 1011698.5168756095, 1103451.1734178273], "p_to": [-442404.25245192216, -332330.57331481267, -551303.81058868743], "q_to": [-197013.57952787445, -196972.45740831006, -196601.52011541839], "i_to": [79.968423817996026, 63.796408946461177, 96.748053573087233], "s_to": [484289.0388042354, 386318.20943002496, 585310.21627962426]},
@@ -23,7 +23,7 @@
         {"id": 8, "energized": 1, "p": [2302.1548961487756, 2310.4680800382425, 2295.4022794086763], "q": [-23037.473316395561, -23040.939150568447, -23001.828741266068], "i": [3.8230190216611373, 3.8240523609288242, 3.820940358258869], "s": [23152.21574643557, 23156.492387429349, 23116.076593289967], "pf": [0.099435618662252964, 0.099776254597716843, 0.099298956297582772]}
       ],
       "source": [
-        {"id": 10, "energized": 1, "p": [449675.58787595917, 335421.00166105776, 560453.31676893623], "q": [-981235.41197776434, -978376.30039988051, -974972.90706424497], "i": [178.04877122315222, 170.61090397350927, 185.50712230088268], "s": [1079366.0491467952, 1034276.2849159138, 1124579.961490781], "pf": [0.41661083210039224, 0.32430503005135358, 0.49836680001480771]}
+        {"id": 10, "energized": 1, "p": [449675.58787595917, 335421.00166105776, 560453.31676893623], "q": [-981235.41197776434, -978376.30039988051, -974972.90706424497], "i": [178.04877122315222, 170.61090397350927, 185.50712230088268], "s": [1079366.0491467952, 1034276.2849159138, 1124579.961490781], "pf": [0.4166108446159314, 0.3243050345416258, 0.4983668047987631]}
       ],
       "sym_load": [
         {"id": 11, "energized": 1, "p": [220051.0545876445, 220013.4043685068, 219603.3609028738], "q": [110025.52729382225, 110006.7021842534, 109801.6804514369], "i": [40.624905038748508, 40.621429477109757, 40.583558330579557], "s": [246024.55828924503, 245982.4640645652, 245524.02153312269], "pf": [0.89442719099991586, 0.89442719099991586, 0.89442719099991597]}
@@ -36,7 +36,7 @@
       "node": [
         {"id": 1, "energized": 1, "u_pu": [1.0500026617673375, 1.0500026861214569, 1.0500026124692983], "u": [6062.1931942119581, 6062.1933348205321, 6062.1929095895966], "u_angle": [-1.4832085018044952e-06, -2.0943962754744163, 2.0943933209409646], "p": [449675.58787595929, 335421.00166105793, 560453.31676893623], "q": [-981235.41197776445, -978376.30039988051, -974972.90706424485]},
         {"id": 2, "energized": 1, "u_pu": [1.0489305412180272, 1.0488408010290586, 1.047862975371989], "u": [6056.003303334478, 6055.4851881118975, 6049.8397090486005], "u_angle": [-0.0031192166967468683, -2.0971289939257418, 2.0904277197067258], "p": [0.0016991138504116397, 0.0037284466839334995, -0.003119483334405209], "q": [-0.0026769212471873154, -0.0064291658102272617, -0.0016728438498193419]},
-        {"id": 3, "energized": 1, "u_pu": [1.0489305377088716, 1.0488407990932342, 1.0478629702944795], "u": [6056.0032830743594, 6055.48517693541, 6049.8396797335854], "u_angle": [-0.0031192079794357627, -2.0971289867084129, 2.0904277299238556], "p": [-440102.09839980368, -330020.10079295578, -549008.40602486604], "q": [-220051.05491385818, -220013.40255902623, -219603.34729454646]}
+        {"id": 3, "energized": 1, "u_pu": [1.0489305411522316, 1.0488408010053642, 1.04786297529498795], "u": [6056.0033029546424, 6055.485187975122, 6049.8397086040414], "u_angle": [-0.0031192079794357627, -2.0971289867084129, 2.0904277299238556], "p": [-440102.09839980368, -330020.10079295578, -549008.40602486604], "q": [-220051.05491385818, -220013.40255902623, -219603.34729454646]}
       ],
       "line": [
         {"id": 4, "energized": 1, "p_from": [447366.50582515739, 333111.91732260247, 558144.23634554166], "q_from": [-958144.59097641951, -955285.4754396549, -951882.08489887649], "i_from": [174.43180283068381, 166.88654765669233, 182.02178483504079], "s_from": [1057439.2879742936, 1011698.5168756095, 1103451.1734178273], "p_to": [-442404.25245192216, -332330.57331481267, -551303.81058868743], "q_to": [-197013.57952787445, -196972.45740831006, -196601.52011541839], "i_to": [79.968423817996026, 63.796408946461177, 96.748053573087233], "s_to": [484289.0388042354, 386318.20943002496, 585310.21627962426]},
@@ -51,7 +51,7 @@
         {"id": 8, "energized": 0, "p": [0, 0, 0], "q": [0, 0, 0], "i": [0, 0, 0], "s": [0, 0, 0], "pf": [0, 0, 0]}
       ],
       "source": [
-        {"id": 10, "energized": 1, "p": [449675.58787595917, 335421.00166105776, 560453.31676893623], "q": [-981235.41197776434, -978376.30039988051, -974972.90706424497], "i": [178.04877122315222, 170.61090397350927, 185.50712230088268], "s": [1079366.0491467952, 1034276.2849159138, 1124579.961490781], "pf": [0.41661083210039224, 0.32430503005135358, 0.49836680001480771]}
+        {"id": 10, "energized": 1, "p": [449675.58787595917, 335421.00166105776, 560453.31676893623], "q": [-981235.41197776434, -978376.30039988051, -974972.90706424497], "i": [178.04877122315222, 170.61090397350927, 185.50712230088268], "s": [1079366.0491467952, 1034276.2849159138, 1124579.961490781], "pf": [0.4166108446159314, 0.3243050345416258, 0.4983668047987631]}
       ],
       "sym_load": [
         {"id": 11, "energized": 1, "p": [220051.0545876445, 220013.4043685068, 219603.3609028738], "q": [110025.52729382225, 110006.7021842534, 109801.6804514369], "i": [40.624905038748508, 40.621429477109757, 40.583558330579557], "s": [246024.55828924503, 245982.4640645652, 245524.02153312269], "pf": [0.89442719099991586, 0.89442719099991586, 0.89442719099991597]}

tests/data/power_flow/dummy-test-line-into-itself/sym_output_batch.json

@@ -8,15 +8,15 @@
       "node": [
         {"id": 1, "energized": 1, "u_pu": 1.050002653570703, "u": 10500.026535707029, "u_angle": -1.4793528305044663e-06, "p": 1345653.3392703342, "q": -2934719.4520267113},
         {"id": 2, "energized": 1, "u_pu": 1.0485445661489112, "u": 10485.445661489111, "u_angle": -0.0032736161797103387, "p": 0.017979197783649453, "q": -0.0054018350275461787},
-        {"id": 3, "energized": 1, "u_pu": 1.0485445626409264, "u": 10485.445626409264, "u_angle": -0.0032736074624537736, "p": -1319334.8476324468, "q": -659667.40050526708}
+        {"id": 3, "energized": 1, "u_pu": 1.048544566103154, "u": 10485.44566103154, "u_angle": -0.0032736074624537736, "p": -1319334.8476324468, "q": -659667.42426266508}
       ],
       "line": [
         {"id": 4, "energized": 1, "p_from": 1338726.0924560847, "q_from": -2865446.9838841902, "i_from": 173.90559127246948, "s_from": 3162747.8508527582, "p_to": -1326242.8543147412, "q_to": -590587.19597046508, "i_to": 79.938915357945049, "s_to": 1451796.592042139},
         {"id": 5, "energized": 0, "p_from": 0, "q_from": 0, "i_from": 0, "s_from": 0, "p_to": 0, "q_to": 0, "i_to": 0, "s_to": 0},
         {"id": 6, "energized": 0, "p_from": 0, "q_from": 0, "i_from": 0, "s_from": 0, "p_to": 0, "q_to": 0, "i_to": 0, "s_to": 0}
       ],
       "link": [
-        {"id": 9, "energized": 1, "loading": 0, "p_from": 1326242.8673741999, "q_from": 590587.18028971716, "i_from": 79.938915663603737, "s_from": 1451796.5975933056, "p_to": -1326242.8577888545, "q_to": -590587.18987506256, "i_to": 79.938915663603737, "s_to": 1451796.5927362107}
+        {"id": 9, "energized": 1, "loading": 0, "p_from": 1326242.8673741999, "q_from": 590587.21313346216, "i_from": 79.938915663603737, "s_from": 1451796.5975933056, "p_to": -1326242.8577888545, "q_to": -590587.21313346256, "i_to": 79.938915663603737, "s_to": 1451796.5927362107}
       ],
       "shunt": [
         {"id": 7, "energized": 1, "p": 6927.2468142502858, "q": -69272.468142502854, "i": 3.8279858566670555, "s": 69617.968880021304, "pf": 0.099503719020998901},
@@ -36,15 +36,15 @@
       "node": [
         {"id": 1, "energized": 1, "u_pu": 1.050002653570703, "u": 10500.026535707029, "u_angle": -1.4793528305044663e-06, "p": 1345653.3392703342, "q": -2934719.4520267113},
         {"id": 2, "energized": 1, "u_pu": 1.0485445661489112, "u": 10485.445661489111, "u_angle": -0.0032736161797103387, "p": 0.017979197783649453, "q": -0.0054018350275461787},
-        {"id": 3, "energized": 1, "u_pu": 1.0485445626409264, "u": 10485.445626409264, "u_angle": -0.0032736074624537736, "p": -1319334.8476324468, "q": -659667.40050526708}
+        {"id": 3, "energized": 1, "u_pu": 1.048544566103154, "u": 10485.44566103154, "u_angle": -0.0032736074624537736, "p": -1319334.8476324468, "q": -659667.42426266508}
       ],
       "line": [
         {"id": 4, "energized": 1, "p_from": 1338726.0924560847, "q_from": -2865446.9838841902, "i_from": 173.90559127246948, "s_from": 3162747.8508527582, "p_to": -1326242.8543147412, "q_to": -590587.19597046508, "i_to": 79.938915357945049, "s_to": 1451796.592042139},
         {"id": 5, "energized": 1, "p_from": 3463.6234071251429, "q_from": -34636.234071251427, "i_from": 1.9139929283335277, "s_from": 34808.984440010652, "p_to": 3463.6234071251429, "q_to": -34636.234071251427, "i_to": 1.9139929283335277, "s_to": 34808.984440010652},
         {"id": 6, "energized": 1, "p_from": 3454.0105336503334, "q_from": -34540.105336503337, "i_from": 1.9113350534043847, "s_from": 34712.376257227246, "p_to": 3454.0105336503334, "q_to": -34540.105336503337, "i_to": 1.9113350534043847, "s_to": 34712.376257227246}
       ],
       "link": [
-        {"id": 9, "energized": 1, "loading": 0, "p_from": 1326242.8673741999, "q_from": 590587.18028971716, "i_from": 79.938915663603737, "s_from": 1451796.5975933056, "p_to": -1326242.8577888545, "q_to": -590587.18987506256, "i_to": 79.938915663603737, "s_to": 1451796.5927362107}
+        {"id": 9, "energized": 1, "loading": 0, "p_from": 1326242.8673741999, "q_from": 590587.21313346216, "i_from": 79.938915663603737, "s_from": 1451796.5975933056, "p_to": -1326242.8577888545, "q_to": -590587.21313346256, "i_to": 79.938915663603737, "s_to": 1451796.5927362107}
       ],
       "shunt": [
         {"id": 7, "energized": 0, "p": 0, "q": 0, "i": 0, "s": 0, "pf": 0},

tests/data/power_flow/handling-of-links/merge-nodes-by-links-1-line-with-line-to-self/sym_output.json

@@ -98,13 +98,13 @@
                 "energized": 1,
                 "loading": 0.0,
                 "p_from": 21084319.029628307,
-                "q_from": 5195613.111142274,
-                "i_from": 1195.2496789651816,
-                "s_from": 21715038.672399823,
+                "q_from": 5541259.927274941,
+                "i_from": 1199.94392461469216,
+                "s_from": 21800322.716069363,
                 "p_to": -21084319.029628307,
-                "q_to": -5195613.111142274,
-                "i_to": 1195.2496789651816,
-                "s_to": 21715038.672399823
+                "q_to": -5541259.927274941,
+                "i_to": 1199.94392461469216,
+                "s_to": 21800322.716069363
             },
             {
                 "id": 9,

tests/data/short_circuit/dummy-test-line-into-itself/sc_output_batch.json

@@ -16,11 +16,11 @@
         {"id": 6, "energized": 0, "i_from": [0, 0, 0], "i_from_angle": [0, 0, 0], "i_to": [0, 0, 0], "i_to_angle": [0, 0, 0]}
       ],
       "link": [
-        {"id": 9, "energized": 1, "i_from": [0, 3.6564798344471052, 3.827107363916523], "i_from_angle": [0, -0.48939955972358584, -2.8761707632835742], "i_to": [0, 3.6564798344471052, 3.827107363916523], "i_to_angle": [0, 2.6521930938662073, 0.2654218903062191]}
+        {"id": 9, "energized": 1, "i_from": [435.3036828482491, 3.6564810911066432, 3.827110009746561], "i_from_angle": [-1.077618546806934, -0.48939973132640124, -2.8761711431423812], "i_to": [435.3036828482491, 3.65648109110664332, 3.827110009746561], "i_to_angle": [2.063974106782859, 2.6521929222633923, 0.2654215104474122]}
       ],
       "shunt": [
         {"id": 7, "energized": 1, "i": [0.66507454600033922, 3.6621221898722189, 3.7855668750333362], "i_angle": [1.570793748925259, -0.47527539810683334, -2.8784819041528089]},
-        {"id": 8, "energized": 1, "i": [0.68295207957823156, 3.6564810900168685, 3.8271100083522671], "i_angle": [1.5502437165727303, -0.4893997316430107, -2.8761711433811832]}
+        {"id": 8, "energized": 1, "i": [0.6829520797414301, 3.656481091106643, 3.827110009746561], "i_angle": [1.5502437165727303, -0.4893997316430107, -2.8761711433811832]}
       ],
       "source": [
         {"id": 10, "energized": 1, "i": [63508529.610858843, 731.32759227924817, 734.26006094063086], "i_angle": [-1.4711276743037347, -1.3381594964606927, -1.8340636301254731]}
@@ -33,8 +33,8 @@
       ],
       "fault": [
         {"id": 13, "energized": 1, "i_f": [63508331.109258644, 0, 0], "i_f_angle": [-1.4711239498504336, 0, 0]},
-        {"id": 14, "energized": 1, "i_f": [436.49378866976025, 0, 0], "i_f_angle": [2.0624362936211509, 0, 0]},
-        {"id": 15, "energized": 1, "i_f": [0.68295207957823156, 0, 0], "i_f_angle": [-1.5913489370170628, 0, 0]}
+        {"id": 14, "energized": 1, "i_f": [435.89860686970485, 0, 0], "i_f_angle": [2.06320415055763809, 0, 0]},
+        {"id": 15, "energized": 1, "i_f": [435.898606869704856, 0, 0], "i_f_angle": [2.06320415055763828, 0, 0]}
       ]
     },
     {
@@ -49,7 +49,7 @@
         {"id": 6, "energized": 1, "i_from": [0.34147603978911578, 1.8282405450084342, 1.9135550041761336], "i_from_angle": [1.5502437165727303, -0.4893997316430107, -2.8761711433811832], "i_to": [0.34147603978911578, 1.8282405450084342, 1.9135550041761336], "i_to_angle": [1.5502437165727303, -0.4893997316430107, -2.8761711433811832]}
       ],
       "link": [
-        {"id": 9, "energized": 1, "i_from": [0, 3.6564798344471052, 3.827107363916523], "i_from_angle": [0, -0.48939955972358584, -2.8761707632835742], "i_to": [0, 3.6564798344471052, 3.827107363916523], "i_to_angle": [0, 2.6521930938662073, 0.2654218903062191]}
+        {"id": 9, "energized": 1, "i_from": [435.3036828482491, 3.6564810911066432, 3.827110009746561], "i_from_angle": [-1.077618546806934, -0.48939973132640124, -2.8761711431423812], "i_to": [435.3036828482491, 3.65648109110664332, 3.827110009746561], "i_to_angle": [2.063974106782859, 2.6521929222633923, 0.2654215104474122]}
       ],
       "shunt": [
         {"id": 7, "energized": 0, "i": [0, 0, 0], "i_angle": [0, 0, 0]},
@@ -66,8 +66,8 @@
       ],
       "fault": [
         {"id": 13, "energized": 1, "i_f": [63508331.109258644, 0, 0], "i_f_angle": [-1.4711239498504336, 0, 0]},
-        {"id": 14, "energized": 1, "i_f": [436.49378866976025, 0, 0], "i_f_angle": [2.0624362936211509, 0, 0]},
-        {"id": 15, "energized": 1, "i_f": [0.68295207957823156, 0, 0], "i_f_angle": [-1.5913489370170628, 0, 0]}
+        {"id": 14, "energized": 1, "i_f": [435.89860686970485, 0, 0], "i_f_angle": [2.06320415055763809, 0, 0]},
+        {"id": 15, "energized": 1, "i_f": [435.898606869704856, 0, 0], "i_f_angle": [2.06320415055763828, 0, 0]}
       ]
     }
   ]