move out container queries

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

Author: nitbharambe

power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp

@@ -0,0 +1,26 @@
+
+// SPDX-FileCopyrightText: Contributors to the Power Grid Model project <[email protected]>
+//
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+#include "../container.hpp"
+
+namespace power_grid_model::main_core {
+
+// TODO Reconfirm if there is duplication with state_queries and if we can remove either one of them
+
+template <typename ComponentType, class ComponentContainer>
+    requires extended_component_container_c<ComponentContainer, ComponentType>
+constexpr auto get_component_size(ComponentContainer const& components) {
+    return components.template size<ComponentType>();
+}
+
+template <typename ComponentType, class ComponentContainer>
+    requires extended_component_container_c<ComponentContainer, ComponentType>
+inline Idx get_component_sequence_idx(ComponentContainer const& components, auto const& id_or_index) {
+    return components.template get_seq<ComponentType>(id_or_index);
+}
+
+} // namespace power_grid_model::main_core

power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp

@@ -10,22 +10,6 @@
 
 namespace power_grid_model::main_core {
 
-// using only components and not state
-
-template <typename ComponentType, class ComponentContainer>
-    requires extended_component_container_c<ComponentContainer, ComponentType>
-constexpr auto get_component_size(ComponentContainer const& components) {
-    return components.template size<ComponentType>();
-}
-
-template <typename ComponentType, class ComponentContainer>
-    requires extended_component_container_c<ComponentContainer, ComponentType>
-inline Idx get_component_sequence_idx(ComponentContainer const& components, auto const& id_or_index) {
-    return components.template get_seq<ComponentType>(id_or_index);
-}
-
-// existing implementation
-
 template <typename ComponentType, class ComponentContainer>
     requires model_component_state_c<MainModelState, ComponentContainer, ComponentType>
 inline Idx get_component_type_index(MainModelState<ComponentContainer> const& state) {

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

@@ -4,8 +4,8 @@
 
 #pragma once
 
+#include "container_queries.hpp"
 #include "state.hpp"
-#include "state_queries.hpp"
 
 #include "../all_components.hpp"