Merge branch 'feature/main-model-refactor-clean-templates-experiment' into feature/dependent-component-types-check

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

Author: nitbharambe

power_grid_model_c/power_grid_model/include/power_grid_model/main_core/core_utils.hpp

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "../all_components.hpp"
 #include "../container.hpp"
 #include "state.hpp"
 
@@ -15,8 +14,8 @@ namespace power_grid_model::main_core::utils {
 namespace detail {
 
 template <typename Tuple, class Functor, std::size_t... Indices>
-constexpr void run_functor_with_tuple_index_return_void(Functor functor, std::index_sequence<Indices...> /*unused*/) {
-    (functor.template operator()<std::tuple_element_t<Indices, Tuple>>(), ...);
+constexpr void run_functor_with_tuple_index_return_void(Functor&& functor, std::index_sequence<Indices...> /*unused*/) {
+    (std::forward<Functor>(functor).template operator()<std::tuple_element_t<Indices, Tuple>>(), ...);
 }
 
 } // namespace detail
@@ -41,8 +40,8 @@ template <class... Types, class Functor> constexpr auto run_functor_with_all_typ
 }
 /////////////////// To remove ///////////////////
 
-template <typename Tuple, class Functor> constexpr void run_functor_with_tuple_return_void(Functor functor) {
-    detail::run_functor_with_tuple_index_return_void<Tuple>(functor,
+template <typename Tuple, class Functor> constexpr void run_functor_with_tuple_return_void(Functor&& functor) {
+    detail::run_functor_with_tuple_index_return_void<Tuple>(std::forward<Functor>(functor),
                                                             std::make_index_sequence<std::tuple_size_v<Tuple>>{});
 }
 

power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp

@@ -65,13 +65,14 @@ concept validate_component_types_c =
 
 } // namespace detail
 
-template <class T, class U> struct MainModelType;
+template <class T, class U> class MainModelType;
 
 // TODO: discussion on checking dependent types can also be done here.
 template <class... ExtraRetrievableType, class... ComponentType>
     requires detail::validate_component_types_c<ComponentList<ComponentType...>>
-struct MainModelType<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentList<ComponentType...>> {
+class MainModelType<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentList<ComponentType...>> {
 
+  public:
     using ComponentContainer = Container<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentType...>;
     using MainModelState = main_core::MainModelState<ComponentContainer>;
     using ComponentTypesTuple = std::tuple<ComponentType...>;
@@ -116,11 +117,12 @@ struct MainModelType<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLi
         std::array{index_of_component<Line>, index_of_component<Link>, index_of_component<Transformer>};
     static constexpr auto shunt_param_in_seq_map = std::array{index_of_component<Shunt>};
 
-    template <class Functor> static constexpr void run_functor_with_all_component_types_return_void(Functor functor) {
-        (functor.template operator()<ComponentType>(), ...);
+    template <class Functor> static constexpr void run_functor_with_all_component_types_return_void(Functor&& functor) {
+        (std::forward<Functor>(functor).template operator()<ComponentType>(), ...);
     }
-    template <class Functor> static constexpr auto run_functor_with_all_component_types_return_array(Functor functor) {
-        return std::array { functor.template operator()<ComponentType>()... };
+    template <class Functor>
+    static constexpr auto run_functor_with_all_component_types_return_array(Functor&& functor) {
+        return std::array { std::forward<Functor>(functor).template operator()<ComponentType>()... };
     }
 };