decouple topology from state

Signed-off-by: Nitish Bharambe <[email protected]>

Author: nitbharambe

power_grid_model_c/power_grid_model/include/power_grid_model/container_fwd.hpp

@@ -19,6 +19,7 @@ concept component_container_c = requires(ContainerType const& c, ID id) {
     { c.template get_item<ComponentType>(id) } -> std::convertible_to<ComponentType const&>;
 };
 
+// TODO merge with component_container_c
 template <typename ContainerType, typename ComponentType>
 concept extended_component_container_c =
     component_container_c<ContainerType, ComponentType> && requires(ContainerType const& c, Idx2D const& idx2d) {

power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp

@@ -5,7 +5,6 @@
 #pragma once
 
 #include "container_queries.hpp"
-#include "state.hpp"
 
 #include "../all_components.hpp"
 
@@ -185,46 +184,52 @@ constexpr void register_topology_components(ComponentContainer const& components
         [](Regulator const& regulator) { return regulator.regulated_object_type(); });
 }
 
-ComponentTopology construct_topology(main_model_state_c auto const& state) {
+template <typename ComponentContainer>
+    requires multi_extended_component_container_c<ComponentContainer, Branch, Branch3, Source, Shunt, GenericLoadGen,
+                                                  GenericVoltageSensor, GenericPowerSensor, GenericCurrentSensor,
+                                                  Regulator>
+ComponentTopology construct_topology(ComponentContainer const& components) {
     ComponentTopology comp_topo;
-    register_topology_components<Node>(state.components, comp_topo);
-    register_topology_components<Branch>(state.components, comp_topo);
-    register_topology_components<Branch3>(state.components, comp_topo);
-    register_topology_components<Source>(state.components, comp_topo);
-    register_topology_components<Shunt>(state.components, comp_topo);
-    register_topology_components<GenericLoadGen>(state.components, comp_topo);
-    register_topology_components<GenericVoltageSensor>(state.components, comp_topo);
-    register_topology_components<GenericPowerSensor>(state.components, comp_topo);
-    register_topology_components<GenericCurrentSensor>(state.components, comp_topo);
-    register_topology_components<Regulator>(state.components, comp_topo);
+    register_topology_components<Node>(components, comp_topo);
+    register_topology_components<Branch>(components, comp_topo);
+    register_topology_components<Branch3>(components, comp_topo);
+    register_topology_components<Source>(components, comp_topo);
+    register_topology_components<Shunt>(components, comp_topo);
+    register_topology_components<GenericLoadGen>(components, comp_topo);
+    register_topology_components<GenericVoltageSensor>(components, comp_topo);
+    register_topology_components<GenericPowerSensor>(components, comp_topo);
+    register_topology_components<GenericCurrentSensor>(components, comp_topo);
+    register_topology_components<Regulator>(components, comp_topo);
     return comp_topo;
 }
 
-ComponentConnections construct_components_connections(main_model_state_c auto const& state) {
+template <typename ComponentContainer>
+    requires multi_extended_component_container_c<ComponentContainer, Branch, Branch3, Source>
+ComponentConnections construct_components_connections(ComponentContainer const& components) {
     ComponentConnections comp_conn;
-    comp_conn.branch_connected.resize(get_component_size<Branch>(state.components));
-    comp_conn.branch_phase_shift.resize(get_component_size<Branch>(state.components));
-    comp_conn.branch3_connected.resize(get_component_size<Branch3>(state.components));
-    comp_conn.branch3_phase_shift.resize(get_component_size<Branch3>(state.components));
-    comp_conn.source_connected.resize(get_component_size<Source>(state.components));
+    comp_conn.branch_connected.resize(get_component_size<Branch>(components));
+    comp_conn.branch_phase_shift.resize(get_component_size<Branch>(components));
+    comp_conn.branch3_connected.resize(get_component_size<Branch3>(components));
+    comp_conn.branch3_phase_shift.resize(get_component_size<Branch3>(components));
+    comp_conn.source_connected.resize(get_component_size<Source>(components));
     std::ranges::transform(
-        state.components.template citer<Branch>(), comp_conn.branch_connected.begin(), [](Branch const& branch) {
+        components.template citer<Branch>(), comp_conn.branch_connected.begin(), [](Branch const& branch) {
             return BranchConnected{static_cast<IntS>(branch.from_status()), static_cast<IntS>(branch.to_status())};
         });
 
-    std::ranges::transform(state.components.template citer<Branch>(), comp_conn.branch_phase_shift.begin(),
+    std::ranges::transform(components.template citer<Branch>(), comp_conn.branch_phase_shift.begin(),
                            [](Branch const& branch) { return branch.phase_shift(); });
 
     std::ranges::transform(
-        state.components.template citer<Branch3>(), comp_conn.branch3_connected.begin(), [](Branch3 const& branch3) {
+        components.template citer<Branch3>(), comp_conn.branch3_connected.begin(), [](Branch3 const& branch3) {
             return Branch3Connected{static_cast<IntS>(branch3.status_1()), static_cast<IntS>(branch3.status_2()),
                                     static_cast<IntS>(branch3.status_3())};
         });
 
-    std::ranges::transform(state.components.template citer<Branch3>(), comp_conn.branch3_phase_shift.begin(),
+    std::ranges::transform(components.template citer<Branch3>(), comp_conn.branch3_phase_shift.begin(),
                            [](Branch3 const& branch3) { return branch3.phase_shift(); });
 
-    std::ranges::transform(state.components.template citer<Source>(), comp_conn.source_connected.begin(),
+    std::ranges::transform(components.template citer<Source>(), comp_conn.source_connected.begin(),
                            [](Source const& source) { return source.status(); });
     return comp_conn;
 }

power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp

@@ -314,7 +314,7 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
         construction_complete_ = true;
 #endif // !NDEBUG
         state_.components.set_construction_complete();
-        state_.comp_topo = std::make_shared<ComponentTopology const>(main_core::construct_topology(state_));
+        state_.comp_topo = std::make_shared<ComponentTopology const>(main_core::construct_topology(state_.components));
     }
 
     void reset_solvers() {
@@ -637,7 +637,7 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
         assert(construction_complete_);
         // clear old solvers
         reset_solvers();
-        ComponentConnections const comp_conn = main_core::construct_components_connections(state_);
+        ComponentConnections const comp_conn = main_core::construct_components_connections(state_.components);
         // re build
         Topology topology{*state_.comp_topo, comp_conn};
         std::tie(state_.math_topology, state_.topo_comp_coup) = topology.build_topology();