Cleanup main model: Clean all includes and make some components to be forward declared #1142

figueroa1395 · 2026-02-03T15:26:43Z

As pointed out by the CI, add this via Jinja instead of directly editing here.

figueroa1395 · 2026-02-03T15:26:55Z

-Original file line number
+Diff line change
@@ -1,6 +1,9 @@
     # SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
     #
     # SPDX-License-Identifier: MPL-2.0
     ---
     Checks: '
     -*,
@@ Expand Down Expand Up / @@ -44,7 +47,6 @@ google-*, @@
     -google-default-arguments,
     misc-*,
     -misc-confusable-identifiers,
-    -misc-include-cleaner,
     -misc-no-recursion,
     -misc-non-private-member-variables-in-classes,
     modernize-*,
@@ Expand All / @@ -68,8 +70,10 @@ readability-*, @@
     WarningsAsErrors: '*'
     HeaderFilterRegex: '.*'
     FormatStyle: file
+    CheckOptions:
+      misc-include-cleaner.IgnoreHeaders : 'Eigen/.*'
     ...

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
     #pragma once
     // define all components
-    #include "common/common.hpp"
     #include "common/component_list.hpp"
     // component include
     #include "component/appliance.hpp"
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
     #include "meta_data.hpp"
     #include "../common/common.hpp"
-    #include "../common/counting_iterator.hpp"
     #include "../common/exception.hpp"
     #include "../common/iterator_facade.hpp"
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,10 +7,8 @@ @@
     // clang-format off
     #pragma once
-    #include "meta_data.hpp"
     #include "../common/common.hpp"
-    #include "../common/enum.hpp"
     #include "../common/three_phase_tensor.hpp"
     namespace power_grid_model {
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     // eigen properties
     #include <Eigen/Dense>
+    #include <cassert>
     #include <cmath>
     #include <complex>
     #include <utility>
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup main model: Clean all includes and make some components to be forward declared #1142

Diff view

Diff view

There are no files selected for viewing

figueroa1395 Feb 3, 2026

Uh oh!

figueroa1395 Feb 3, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up @@
         { ct.inverse(u) } -> std::same_as<typename T::UpdateType>;
     };
+    struct load_appliance_t {};
+    struct gen_appliance_t {};
+    template <typename T>
+    concept appliance_type_tag = std::same_as<T, load_appliance_t> || std::same_as<T, gen_appliance_t>;
+    template <appliance_type_tag T> constexpr bool is_generator_v = std::same_as<T, gen_appliance_t>;
+    static_assert(appliance_type_tag<load_appliance_t>);
+    static_assert(appliance_type_tag<gen_appliance_t>);
+    static_assert(!is_generator_v<load_appliance_t>);
+    static_assert(is_generator_v<gen_appliance_t>);
     } // namespace power_grid_model

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     #include "transformer_utils.hpp"
     #include "../auxiliary/input.hpp"
-    #include "../auxiliary/output.hpp"
     #include "../auxiliary/update.hpp"
     #include "../calculation_parameters.hpp"
     #include "../common/common.hpp"
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,14 @@ @@
     #include "state_queries.hpp"
     #include "../calculation_parameters.hpp"
+    #include "../component/current_sensor.hpp"
+    #include "../component/fault.hpp"
+    #include "../component/load_gen.hpp"
+    #include "../component/node.hpp"
+    #include "../component/power_sensor.hpp"
+    #include "../component/shunt.hpp"
+    #include "../component/source.hpp"
+    #include "../component/voltage_sensor.hpp"
     #include <concepts>
     #include <vector>
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,10 @@ @@
     #pragma once
-    #include "../all_components.hpp"
+    #include "../component/base.hpp"
+    #include "../component/branch.hpp"
+    #include "../component/branch3.hpp"
+    #include "../component/regulator.hpp"
     #include "../container.hpp"
     namespace power_grid_model::main_core {
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,14 +4,57 @@ @@
     #pragma once
-    #include "../all_components.hpp"
+    #include "../component/component.hpp"
     #include "../container.hpp"
     #include "state.hpp"
     #include "update.hpp"
     #include <array>
     #include <vector>
-    namespace power_grid_model::main_core {
+    namespace power_grid_model {
+    class Base;
+    class Node;
+    class Branch;
+    class Branch3;
+    class Appliance;
+    class GenericLoadGen;
+    class GenericLoad;
+    class GenericGenerator;
+    class GenericPowerSensor;
+    class GenericVoltageSensor;
+    class GenericCurrentSensor;
+    class Regulator;
+    class Line;
+    class AsymLine;
+    class Link;
+    class GenericBranch;
+    class Transformer;
+    class ThreeWindingTransformer;
+    class Shunt;
+    class Source;
+    template <symmetry_tag loadgen_symmetry_, appliance_type_tag appliance_type_> class LoadGen;
+    using SymGenerator = LoadGen<symmetric_t, gen_appliance_t>;
+    using AsymGenerator = LoadGen<asymmetric_t, gen_appliance_t>;
+    using SymLoad = LoadGen<symmetric_t, load_appliance_t>;
+    using AsymLoad = LoadGen<asymmetric_t, load_appliance_t>;
+    template <symmetry_tag power_sensor_symmetry_> class PowerSensor;
+    using SymPowerSensor = PowerSensor<symmetric_t>;
+    using AsymPowerSensor = PowerSensor<asymmetric_t>;
+    template <symmetry_tag sym> class VoltageSensor;
+    using SymVoltageSensor = VoltageSensor<symmetric_t>;
+    using AsymVoltageSensor = VoltageSensor<asymmetric_t>;
+    template <symmetry_tag sym> class CurrentSensor;
+    using SymCurrentSensor = CurrentSensor<symmetric_t>;
+    using AsymCurrentSensor = CurrentSensor<asymmetric_t>;
+    class Fault;
+    class TransformerTapRegulator;
+    namespace main_core {
     namespace detail {
@@ Expand Down Expand Up @@
     template <typename T> inline constexpr bool is_main_model_type_v = is_main_model_type<T>::value;
-    } // namespace power_grid_model::main_core
+    } // namespace main_core
+    } // namespace power_grid_model

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     #pragma once
+    #include "all_components.hpp"
     #include "job_adapter.hpp"
     #include "job_dispatch.hpp"
     #include "main_model_impl.hpp"
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,10 +20,10 @@ @@
     #include "common/timer.hpp"
     // component include
-    #include "all_components.hpp"
     #include "auxiliary/dataset.hpp"
     #include "auxiliary/input.hpp"
     #include "auxiliary/output.hpp"
+    #include "component/component.hpp"
     // math model include
     #include "math_solver/math_solver_dispatch.hpp"
@@ Expand Down @@

Cleanup main model: Clean all includes and make some components to be forward declared #1142

Are you sure you want to change the base?

Cleanup main model: Clean all includes and make some components to be forward declared #1142

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

figueroa1395 Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

figueroa1395 Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!