From 34ba5b2638d1d009033e0083405de2a1f568d178 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 29 Sep 2025 17:18:47 +0200 Subject: [PATCH 01/25] change to forward declarations Signed-off-by: Nitish Bharambe --- .../power_grid_model/all_components.hpp | 18 +----- .../power_grid_model/component/component.hpp | 63 +++++++++++++++++++ .../component/current_sensor.hpp | 3 - .../power_grid_model/component/load_gen.hpp | 17 ----- .../component/power_sensor.hpp | 3 - .../power_grid_model/component/shunt.hpp | 1 - .../component/transformer_tap_regulator.hpp | 1 - .../component/voltage_sensor.hpp | 3 - .../main_core/container_queries.hpp | 2 +- .../power_grid_model/main_core/input.hpp | 5 +- .../main_core/main_model_type.hpp | 2 +- .../power_grid_model/main_core/output.hpp | 10 +-- .../main_core/state_queries.hpp | 4 +- .../power_grid_model/main_core/topology.hpp | 2 +- .../power_grid_model/main_core/update.hpp | 3 +- .../include/power_grid_model/main_model.hpp | 1 + .../power_grid_model/main_model_impl.hpp | 2 +- .../iterative_current_pf_solver.hpp | 1 - .../math_solver/linear_pf_solver.hpp | 1 - .../math_solver/math_solver_dispatch.hpp | 3 +- .../math_solver/newton_raphson_pf_solver.hpp | 1 - .../cpp_unit_tests/test_main_core_output.cpp | 1 + 22 files changed, 85 insertions(+), 62 deletions(-) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp index c275535b54..bd71215c9f 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp @@ -5,8 +5,9 @@ #pragma once // define all components -#include "common/common.hpp" -#include "common/component_list.hpp" +// #include "common/common.hpp" +#include "component/component.hpp" +// #include "common/component_list.hpp" // component include #include "component/appliance.hpp" #include "component/asym_line.hpp" @@ -25,16 +26,3 @@ #include "component/transformer.hpp" #include "component/transformer_tap_regulator.hpp" #include "component/voltage_sensor.hpp" - -namespace power_grid_model { - -using AllComponents = - ComponentList; - -using AllExtraRetrievableTypes = - ExtraRetrievableTypes; - -} // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp index 18236cbcd0..ce311da900 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp @@ -5,6 +5,7 @@ #pragma once #include "../common/common.hpp" +#include "../common/component_list.hpp" #include "../common/enum.hpp" #include @@ -36,4 +37,66 @@ concept component_c = requires(T t, T const& ct, typename T::UpdateType u, typen { ct.inverse(u) } -> std::same_as; }; +struct load_appliance_t {}; +struct gen_appliance_t {}; + +template +concept appliance_type_tag = std::same_as || std::same_as; +template constexpr bool is_generator_v = std::same_as; + +static_assert(appliance_type_tag); +static_assert(appliance_type_tag); +static_assert(!is_generator_v); +static_assert(is_generator_v); + +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 class LoadGen; +using SymGenerator = LoadGen; +using AsymGenerator = LoadGen; +using SymLoad = LoadGen; +using AsymLoad = LoadGen; + +template class PowerSensor; +using SymPowerSensor = PowerSensor; +using AsymPowerSensor = PowerSensor; + +template class VoltageSensor; +using SymVoltageSensor = VoltageSensor; +using AsymVoltageSensor = VoltageSensor; +template class CurrentSensor; +using SymCurrentSensor = CurrentSensor; +using AsymCurrentSensor = CurrentSensor; + +class Fault; +class TransformerTapRegulator; + +using AllComponents = + ComponentList; + +using AllExtraRetrievableTypes = + ExtraRetrievableTypes; + } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp index 362948cd57..2d4e4b08e9 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp @@ -179,7 +179,4 @@ template class CurrentSensor : public Ge } }; -using SymCurrentSensor = CurrentSensor; -using AsymCurrentSensor = CurrentSensor; - } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp index b00a0c0431..acf0a6b4b4 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp @@ -5,7 +5,6 @@ #pragma once #include "appliance.hpp" -#include "base.hpp" #include "../auxiliary/input.hpp" #include "../auxiliary/output.hpp" @@ -17,18 +16,6 @@ namespace power_grid_model { -struct load_appliance_t {}; -struct gen_appliance_t {}; - -template -concept appliance_type_tag = std::same_as || std::same_as; -template constexpr bool is_generator_v = std::same_as; - -static_assert(appliance_type_tag); -static_assert(appliance_type_tag); -static_assert(!is_generator_v); -static_assert(is_generator_v); - class GenericLoadGen : public Appliance { public: using InputType = GenericLoadGenInput; @@ -184,9 +171,5 @@ template class LoadGen; template class LoadGen; template class LoadGen; // alias -using SymGenerator = LoadGen; -using AsymGenerator = LoadGen; -using SymLoad = LoadGen; -using AsymLoad = LoadGen; } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp index 0540bedaaf..ff0b005f19 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp @@ -183,7 +183,4 @@ template class PowerSensor : public Generi } }; -using SymPowerSensor = PowerSensor; -using AsymPowerSensor = PowerSensor; - } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp index f5147bc837..c6160d4af0 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp @@ -5,7 +5,6 @@ #pragma once #include "appliance.hpp" -#include "base.hpp" #include "../auxiliary/input.hpp" #include "../auxiliary/output.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp index c16f8d0ff8..624e59ace3 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp @@ -4,7 +4,6 @@ #pragma once -#include "base.hpp" #include "regulator.hpp" #include "../auxiliary/input.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp index 6eb264ace4..e3d0062781 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp @@ -165,7 +165,4 @@ template class VoltageSensor : public GenericVoltageSensor { } }; -using SymVoltageSensor = VoltageSensor; -using AsymVoltageSensor = VoltageSensor; - } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp index ac4312108f..d5eeace5d4 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp @@ -4,7 +4,7 @@ #pragma once -#include "../all_components.hpp" +#include "../component/component.hpp" #include "../container.hpp" namespace power_grid_model::main_core { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp index 53cee3abe0..6e236525b7 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp @@ -4,8 +4,11 @@ #pragma once -#include "../all_components.hpp" +#include "state.hpp" +#include "state_queries.hpp" + #include "../common/iterator_facade.hpp" +#include "../component/component.hpp" #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp index 32ba2ca730..bc27876af9 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp @@ -4,7 +4,7 @@ #pragma once -#include "../all_components.hpp" +#include "../component/component.hpp" #include "../container.hpp" #include "state.hpp" #include "update.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp index 330da5bebb..106e5dbc4d 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp @@ -8,7 +8,7 @@ #include "state.hpp" #include "state_queries.hpp" -#include "../all_components.hpp" +#include "../component/component.hpp" #include @@ -115,14 +115,14 @@ constexpr void produce_output(MainModelState const& state, C // output node template Component, steady_state_solver_output_type SolverOutputType> -constexpr auto output_result(Node const& node, std::vector const& solver_output, Idx2D math_id) { +constexpr auto output_result(Component const& node, std::vector const& solver_output, Idx2D math_id) { using sym = typename SolverOutputType::sym; if (math_id.group == -1) { - return node.get_null_output(); + return node.template get_null_output(); } - return node.get_output(solver_output[math_id.group].u[math_id.pos], - solver_output[math_id.group].bus_injection[math_id.pos]); + return node.template get_output(solver_output[math_id.group].u[math_id.pos], + solver_output[math_id.group].bus_injection[math_id.pos]); } template Component, short_circuit_solver_output_type SolverOutputType> inline auto output_result(Component const& node, std::vector const& solver_output, Idx2D math_id) { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp index b3a5e64b7b..4ca1a87106 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp @@ -6,7 +6,7 @@ #include "state.hpp" -#include "../all_components.hpp" +#include "../component/component.hpp" namespace power_grid_model::main_core { @@ -22,7 +22,7 @@ constexpr auto get_branch_nodes(MainModelState const& state, return state.comp_topo->branch3_node_idx[topology_sequence_idx]; } -template +template requires model_component_state_c && requires(MainModelState const& state, Idx const i) { { get_branch_nodes(state, i)[i] } -> std::convertible_to; diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp index 6172babf2f..73dca870af 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp @@ -6,7 +6,7 @@ #include "container_queries.hpp" -#include "../all_components.hpp" +#include "../component/component.hpp" namespace power_grid_model::main_core { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp index 9554343151..594d754f87 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp @@ -7,10 +7,9 @@ #include "container_queries.hpp" #include "core_utils.hpp" -#include "../all_components.hpp" #include "../auxiliary/dataset.hpp" #include "../common/iterator_facade.hpp" -#include "../container.hpp" +#include "../component/component.hpp" #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp index b7cac93a15..d5b7d8f119 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp @@ -4,6 +4,7 @@ #pragma once +#include "all_components.hpp" #include "job_adapter.hpp" #include "job_dispatch.hpp" #include "main_model_impl.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp index 6599f69c82..5e2da0375f 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp @@ -19,10 +19,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" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp index 191361cd3a..f49190e79f 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp @@ -62,7 +62,6 @@ Iterative Power Flow #include "../common/common.hpp" #include "../common/exception.hpp" #include "../common/three_phase_tensor.hpp" -#include "../common/timer.hpp" namespace power_grid_model::math_solver { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp index 3dd49cfe27..d377f91890 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp @@ -35,7 +35,6 @@ if there are sources #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/enum.hpp" -#include "../common/exception.hpp" #include "../common/three_phase_tensor.hpp" #include "../common/timer.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp index 19cbe7d3e1..5cd9f9b0ce 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp @@ -9,9 +9,8 @@ #include "../calculation_parameters.hpp" #include "../common/common.hpp" -#include "../common/exception.hpp" +#include "../common/logging.hpp" #include "../common/three_phase_tensor.hpp" -#include "../common/timer.hpp" #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp index a0f8790c34..297f24f181 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp @@ -153,7 +153,6 @@ J.L -= -dQ_cal_m/dV #include "../common/common.hpp" #include "../common/exception.hpp" #include "../common/three_phase_tensor.hpp" -#include "../common/timer.hpp" namespace power_grid_model::math_solver { diff --git a/tests/cpp_unit_tests/test_main_core_output.cpp b/tests/cpp_unit_tests/test_main_core_output.cpp index 66549df273..803c68bace 100644 --- a/tests/cpp_unit_tests/test_main_core_output.cpp +++ b/tests/cpp_unit_tests/test_main_core_output.cpp @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include #include #include From f889ae6a06f1a4bd507477d665e1eccc20de746c Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Sun, 19 Oct 2025 11:13:54 +0200 Subject: [PATCH 02/25] change incldues Signed-off-by: Nitish Bharambe --- .../power_grid_model/all_components.hpp | 17 +++++-- .../power_grid_model/component/component.hpp | 51 ------------------- .../component/current_sensor.hpp | 3 ++ .../power_grid_model/component/load_gen.hpp | 4 ++ .../component/power_sensor.hpp | 3 ++ .../component/voltage_sensor.hpp | 3 ++ .../calculation_input_preparation.hpp | 8 +++ .../main_core/container_queries.hpp | 5 +- .../power_grid_model/main_core/input.hpp | 12 +++++ .../main_core/main_model_type.hpp | 48 ++++++++++++++++- .../power_grid_model/main_core/output.hpp | 12 +++++ .../main_core/state_queries.hpp | 8 ++- .../power_grid_model/main_core/topology.hpp | 12 ++++- .../power_grid_model/main_core/update.hpp | 2 +- 14 files changed, 127 insertions(+), 61 deletions(-) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp index bd71215c9f..2d72c96e51 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp @@ -5,9 +5,7 @@ #pragma once // define all components -// #include "common/common.hpp" -#include "component/component.hpp" -// #include "common/component_list.hpp" +#include "common/component_list.hpp" // component include #include "component/appliance.hpp" #include "component/asym_line.hpp" @@ -26,3 +24,16 @@ #include "component/transformer.hpp" #include "component/transformer_tap_regulator.hpp" #include "component/voltage_sensor.hpp" + +namespace power_grid_model { + +using AllComponents = + ComponentList; + +using AllExtraRetrievableTypes = + ExtraRetrievableTypes; + +} // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp index ce311da900..8c1a38ffc3 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp @@ -5,7 +5,6 @@ #pragma once #include "../common/common.hpp" -#include "../common/component_list.hpp" #include "../common/enum.hpp" #include @@ -49,54 +48,4 @@ static_assert(appliance_type_tag); static_assert(!is_generator_v); static_assert(is_generator_v); -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 class LoadGen; -using SymGenerator = LoadGen; -using AsymGenerator = LoadGen; -using SymLoad = LoadGen; -using AsymLoad = LoadGen; - -template class PowerSensor; -using SymPowerSensor = PowerSensor; -using AsymPowerSensor = PowerSensor; - -template class VoltageSensor; -using SymVoltageSensor = VoltageSensor; -using AsymVoltageSensor = VoltageSensor; -template class CurrentSensor; -using SymCurrentSensor = CurrentSensor; -using AsymCurrentSensor = CurrentSensor; - -class Fault; -class TransformerTapRegulator; - -using AllComponents = - ComponentList; - -using AllExtraRetrievableTypes = - ExtraRetrievableTypes; - } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp index 2d4e4b08e9..362948cd57 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp @@ -179,4 +179,7 @@ template class CurrentSensor : public Ge } }; +using SymCurrentSensor = CurrentSensor; +using AsymCurrentSensor = CurrentSensor; + } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp index acf0a6b4b4..d7351e92a6 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp @@ -171,5 +171,9 @@ template class LoadGen; template class LoadGen; template class LoadGen; // alias +using SymGenerator = LoadGen; +using AsymGenerator = LoadGen; +using SymLoad = LoadGen; +using AsymLoad = LoadGen; } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp index ff0b005f19..0540bedaaf 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp @@ -183,4 +183,7 @@ template class PowerSensor : public Generi } }; +using SymPowerSensor = PowerSensor; +using AsymPowerSensor = PowerSensor; + } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp index e3d0062781..6eb264ace4 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp @@ -165,4 +165,7 @@ template class VoltageSensor : public GenericVoltageSensor { } }; +using SymVoltageSensor = VoltageSensor; +using AsymVoltageSensor = VoltageSensor; + } // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp index f752f20e54..b1e36e0e9e 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp @@ -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 #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp index d5eeace5d4..b4230d05c4 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp @@ -4,7 +4,10 @@ #pragma once -#include "../component/component.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 { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp index 6e236525b7..397ef2c6e4 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp @@ -7,6 +7,18 @@ #include "state.hpp" #include "state_queries.hpp" +#include "../component/appliance.hpp" +#include "../component/base.hpp" +#include "../component/branch.hpp" +#include "../component/branch3.hpp" +#include "../component/current_sensor.hpp" +#include "../component/fault.hpp" +#include "../component/node.hpp" +#include "../component/power_sensor.hpp" +#include "../component/regulator.hpp" +#include "../component/transformer_tap_regulator.hpp" +#include "../component/voltage_sensor.hpp" + #include "../common/iterator_facade.hpp" #include "../component/component.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp index bc27876af9..81308c492a 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp @@ -11,7 +11,50 @@ #include #include -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 class LoadGen; +using SymGenerator = LoadGen; +using AsymGenerator = LoadGen; +using SymLoad = LoadGen; +using AsymLoad = LoadGen; + +template class PowerSensor; +using SymPowerSensor = PowerSensor; +using AsymPowerSensor = PowerSensor; + +template class VoltageSensor; +using SymVoltageSensor = VoltageSensor; +using AsymVoltageSensor = VoltageSensor; +template class CurrentSensor; +using SymCurrentSensor = CurrentSensor; +using AsymCurrentSensor = CurrentSensor; + +class Fault; +class TransformerTapRegulator; + +namespace main_core { namespace detail { @@ -126,4 +169,5 @@ struct is_main_model_type, Component template inline constexpr bool is_main_model_type_v = is_main_model_type::value; -} // namespace power_grid_model::main_core +} // namespace main_core +} // namespace power_grid_model diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp index 106e5dbc4d..30aa421bf5 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp @@ -4,6 +4,18 @@ #pragma once +#include "../component/base.hpp" +#include "../component/branch.hpp" +#include "../component/branch3.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/transformer_tap_regulator.hpp" +#include "../component/voltage_sensor.hpp" #include "container_queries.hpp" #include "state.hpp" #include "state_queries.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp index 4ca1a87106..88549be851 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp @@ -6,7 +6,11 @@ #include "state.hpp" -#include "../component/component.hpp" +#include "../component/branch.hpp" +#include "../component/branch3.hpp" +#include "../component/node.hpp" +#include "../component/regulator.hpp" +#include "../component/transformer.hpp" namespace power_grid_model::main_core { @@ -22,7 +26,7 @@ constexpr auto get_branch_nodes(MainModelState const& state, return state.comp_topo->branch3_node_idx[topology_sequence_idx]; } -template +template requires model_component_state_c && requires(MainModelState const& state, Idx const i) { { get_branch_nodes(state, i)[i] } -> std::convertible_to; diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp index 73dca870af..e2b8ac8305 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp @@ -6,7 +6,17 @@ #include "container_queries.hpp" -#include "../component/component.hpp" +#include "../component/branch.hpp" +#include "../component/branch3.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/regulator.hpp" +#include "../component/shunt.hpp" +#include "../component/source.hpp" +#include "../component/voltage_sensor.hpp" namespace power_grid_model::main_core { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp index 594d754f87..fbe91fb1e9 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp @@ -9,7 +9,7 @@ #include "../auxiliary/dataset.hpp" #include "../common/iterator_facade.hpp" -#include "../component/component.hpp" +#include "component/component.hpp" #include From 9e8c71422dad0e0ef98f38be4dc37e9197ac071b Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Sun, 19 Oct 2025 11:16:48 +0200 Subject: [PATCH 03/25] change incldues fix Signed-off-by: Nitish Bharambe --- .../include/power_grid_model/main_core/update.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp index fbe91fb1e9..594d754f87 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp @@ -9,7 +9,7 @@ #include "../auxiliary/dataset.hpp" #include "../common/iterator_facade.hpp" -#include "component/component.hpp" +#include "../component/component.hpp" #include From 5cf953d9788930418ddfa1ee2a54279bb46368f4 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 20 Oct 2025 09:34:22 +0200 Subject: [PATCH 04/25] add component test includes Signed-off-by: Nitish Bharambe --- .clang-tidy | 1 - .../power_grid_model/component/base.hpp | 1 + tests/cpp_unit_tests/test_all_components.cpp | 6 ++++++ tests/cpp_unit_tests/test_asym_line.cpp | 18 ++++++++++++++++++ tests/cpp_unit_tests/test_current_sensor.cpp | 18 ++++++++++++++++++ tests/cpp_unit_tests/test_fault.cpp | 18 ++++++++++++++++++ tests/cpp_unit_tests/test_generic_branch.cpp | 8 ++++++++ tests/cpp_unit_tests/test_line.cpp | 15 +++++++++++++++ tests/cpp_unit_tests/test_link.cpp | 14 ++++++++++++++ tests/cpp_unit_tests/test_load_gen.cpp | 17 +++++++++++++++++ tests/cpp_unit_tests/test_node.cpp | 5 +++++ tests/cpp_unit_tests/test_power_sensor.cpp | 12 ++++++++++++ tests/cpp_unit_tests/test_shunt.cpp | 14 ++++++++++++++ tests/cpp_unit_tests/test_source.cpp | 15 +++++++++++++++ .../test_three_winding_transformer.cpp | 15 +++++++++++++++ tests/cpp_unit_tests/test_transformer.cpp | 15 +++++++++++++++ .../test_transformer_tap_regulator.cpp | 12 ++++++++++++ tests/cpp_unit_tests/test_voltage_sensor.cpp | 10 +++++++++- 18 files changed, 212 insertions(+), 2 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 0195a82858..9d8e82d581 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -44,7 +44,6 @@ google-*, -google-default-arguments, misc-*, -misc-confusable-identifiers, --misc-include-cleaner, -misc-no-recursion, -misc-non-private-member-variables-in-classes, modernize-*, diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp index 06b2604900..bfdc92ee5a 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp @@ -13,6 +13,7 @@ #include "../common/enum.hpp" namespace power_grid_model { +// TODO (nitbharambe) move outside of base.hpp to component constexpr IntS status_to_int(bool status) { return status ? IntS{1} : IntS{0}; } class Base { diff --git a/tests/cpp_unit_tests/test_all_components.cpp b/tests/cpp_unit_tests/test_all_components.cpp index b98913bdd1..8173125779 100644 --- a/tests/cpp_unit_tests/test_all_components.cpp +++ b/tests/cpp_unit_tests/test_all_components.cpp @@ -2,9 +2,12 @@ // // SPDX-License-Identifier: MPL-2.0 +#include "power_grid_model/auxiliary/input.hpp" #include +#include #include #include +#include #include #include #include @@ -22,6 +25,9 @@ #include +#include +#include + namespace power_grid_model { static_assert(component_c); diff --git a/tests/cpp_unit_tests/test_asym_line.cpp b/tests/cpp_unit_tests/test_asym_line.cpp index 313a177f9f..ada030ecba 100644 --- a/tests/cpp_unit_tests/test_asym_line.cpp +++ b/tests/cpp_unit_tests/test_asym_line.cpp @@ -4,6 +4,24 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include +#include +#include + +#include + +#include +#include + #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_current_sensor.cpp b/tests/cpp_unit_tests/test_current_sensor.cpp index 93cb04616d..2af46992f5 100644 --- a/tests/cpp_unit_tests/test_current_sensor.cpp +++ b/tests/cpp_unit_tests/test_current_sensor.cpp @@ -4,8 +4,26 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +#include + +#include + #include +#include +#include +#include +#include +#include +#include + TEST_SUITE_BEGIN("test_current_sensor"); namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_fault.cpp b/tests/cpp_unit_tests/test_fault.cpp index b1e89c99a1..2163d0ff4a 100644 --- a/tests/cpp_unit_tests/test_fault.cpp +++ b/tests/cpp_unit_tests/test_fault.cpp @@ -4,8 +4,26 @@ #include +// #include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include +#include + +#include + #include +#include +#include +#include + namespace power_grid_model { namespace { void check_nan_preserving_equality(std::floating_point auto actual, std::floating_point auto expected) { diff --git a/tests/cpp_unit_tests/test_generic_branch.cpp b/tests/cpp_unit_tests/test_generic_branch.cpp index 5fc237a114..9b61abc630 100644 --- a/tests/cpp_unit_tests/test_generic_branch.cpp +++ b/tests/cpp_unit_tests/test_generic_branch.cpp @@ -2,11 +2,19 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include +#include +#include +#include #include #include #include +#include +#include + namespace power_grid_model { using namespace std::complex_literals; diff --git a/tests/cpp_unit_tests/test_line.cpp b/tests/cpp_unit_tests/test_line.cpp index 43343adb27..89334c8f4c 100644 --- a/tests/cpp_unit_tests/test_line.cpp +++ b/tests/cpp_unit_tests/test_line.cpp @@ -4,6 +4,21 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include +#include + +#include +#include + #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_link.cpp b/tests/cpp_unit_tests/test_link.cpp index e076b7a7a4..cd223cb1fa 100644 --- a/tests/cpp_unit_tests/test_link.cpp +++ b/tests/cpp_unit_tests/test_link.cpp @@ -2,10 +2,24 @@ // // SPDX-License-Identifier: MPL-2.0 +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include +#include #include #include +#include +#include + namespace power_grid_model { using namespace std::complex_literals; diff --git a/tests/cpp_unit_tests/test_load_gen.cpp b/tests/cpp_unit_tests/test_load_gen.cpp index cc883894b9..d11e1bac98 100644 --- a/tests/cpp_unit_tests/test_load_gen.cpp +++ b/tests/cpp_unit_tests/test_load_gen.cpp @@ -4,8 +4,25 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include "power_grid_model/calculation_parameters.hpp" +#include +#include +#include +#include + +#include + #include +#include +#include +#include +#include +#include + TYPE_TO_STRING_AS("SymGenerator", power_grid_model::SymGenerator); TYPE_TO_STRING_AS("AsymGenerator", power_grid_model::AsymGenerator); TYPE_TO_STRING_AS("SymLoad", power_grid_model::SymLoad); diff --git a/tests/cpp_unit_tests/test_node.cpp b/tests/cpp_unit_tests/test_node.cpp index 92708817fb..c3b0b15e7b 100644 --- a/tests/cpp_unit_tests/test_node.cpp +++ b/tests/cpp_unit_tests/test_node.cpp @@ -4,6 +4,11 @@ #include +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include + #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_power_sensor.cpp b/tests/cpp_unit_tests/test_power_sensor.cpp index 4cc5f189cd..f256c3c8f5 100644 --- a/tests/cpp_unit_tests/test_power_sensor.cpp +++ b/tests/cpp_unit_tests/test_power_sensor.cpp @@ -4,8 +4,20 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include + #include +#include +#include +#include + namespace power_grid_model { namespace { auto const r_nan = RealValue{nan}; diff --git a/tests/cpp_unit_tests/test_shunt.cpp b/tests/cpp_unit_tests/test_shunt.cpp index 3ad2899020..3b36c302ad 100644 --- a/tests/cpp_unit_tests/test_shunt.cpp +++ b/tests/cpp_unit_tests/test_shunt.cpp @@ -4,6 +4,20 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include + +#include +#include +#include + #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_source.cpp b/tests/cpp_unit_tests/test_source.cpp index fa813240c3..0703810015 100644 --- a/tests/cpp_unit_tests/test_source.cpp +++ b/tests/cpp_unit_tests/test_source.cpp @@ -2,8 +2,23 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include + +#include +#include +#include +#include + #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_three_winding_transformer.cpp b/tests/cpp_unit_tests/test_three_winding_transformer.cpp index 9a8ae7a724..7fb4a444f4 100644 --- a/tests/cpp_unit_tests/test_three_winding_transformer.cpp +++ b/tests/cpp_unit_tests/test_three_winding_transformer.cpp @@ -5,8 +5,23 @@ #include #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include + #include +#include +#include +#include +#include + namespace power_grid_model { using namespace std::complex_literals; diff --git a/tests/cpp_unit_tests/test_transformer.cpp b/tests/cpp_unit_tests/test_transformer.cpp index ce6f6f5fba..fbb26f078a 100644 --- a/tests/cpp_unit_tests/test_transformer.cpp +++ b/tests/cpp_unit_tests/test_transformer.cpp @@ -4,6 +4,21 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include + +#include +#include +#include +#include + #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp index 279e6c4ce0..86a6408ef8 100644 --- a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp +++ b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp @@ -4,8 +4,20 @@ #include +#include "power_grid_model/auxiliary/input.hpp" +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include +#include +// TODO (nitbharambe) Added base.hpp for status_to_int function +#include + #include +#include + namespace power_grid_model { namespace { void check_nan_preserving_equality(std::floating_point auto actual, std::floating_point auto expected) { diff --git a/tests/cpp_unit_tests/test_voltage_sensor.cpp b/tests/cpp_unit_tests/test_voltage_sensor.cpp index 814c4f7353..b51f735fed 100644 --- a/tests/cpp_unit_tests/test_voltage_sensor.cpp +++ b/tests/cpp_unit_tests/test_voltage_sensor.cpp @@ -6,11 +6,19 @@ #include #include #include -#include #include +#include "power_grid_model/auxiliary/output.hpp" +#include "power_grid_model/auxiliary/update.hpp" +#include +#include + #include +#include +#include +#include + namespace power_grid_model { namespace { void check_nan_preserving_equality(std::floating_point auto actual, std::floating_point auto expected) { From be33aefd6bc83d85240ffcb92ae2fe4064a99c1b Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 20 Oct 2025 09:35:11 +0200 Subject: [PATCH 05/25] add common test includes Signed-off-by: Nitish Bharambe --- tests/cpp_unit_tests/test_common.cpp | 3 +++ tests/cpp_unit_tests/test_exceptions.cpp | 5 +++++ tests/cpp_unit_tests/test_grouped_index_vector.cpp | 7 +++++++ tests/cpp_unit_tests/test_statistics.cpp | 11 +++++++++++ tests/cpp_unit_tests/test_three_phase_tensor.cpp | 6 ++++++ tests/cpp_unit_tests/test_typing.cpp | 4 ++++ 6 files changed, 36 insertions(+) diff --git a/tests/cpp_unit_tests/test_common.cpp b/tests/cpp_unit_tests/test_common.cpp index 4ab94bd106..575527fd36 100644 --- a/tests/cpp_unit_tests/test_common.cpp +++ b/tests/cpp_unit_tests/test_common.cpp @@ -4,6 +4,9 @@ #include +#include +#include + namespace power_grid_model { namespace { static_assert(symmetry_tag); diff --git a/tests/cpp_unit_tests/test_exceptions.cpp b/tests/cpp_unit_tests/test_exceptions.cpp index bbd244df39..4f49d5af79 100644 --- a/tests/cpp_unit_tests/test_exceptions.cpp +++ b/tests/cpp_unit_tests/test_exceptions.cpp @@ -2,10 +2,15 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include #include #include +#include +#include + namespace power_grid_model { namespace { enum TestCStyleEnum { // NOLINT(performance-enum-size) // NOSONAR // for testing C-style enum diff --git a/tests/cpp_unit_tests/test_grouped_index_vector.cpp b/tests/cpp_unit_tests/test_grouped_index_vector.cpp index 13c01e3a04..197327f4e0 100644 --- a/tests/cpp_unit_tests/test_grouped_index_vector.cpp +++ b/tests/cpp_unit_tests/test_grouped_index_vector.cpp @@ -2,10 +2,17 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include #include #include +#include +#include +#include +#include + namespace power_grid_model { namespace { diff --git a/tests/cpp_unit_tests/test_statistics.cpp b/tests/cpp_unit_tests/test_statistics.cpp index 46ac8652a8..23e560050e 100644 --- a/tests/cpp_unit_tests/test_statistics.cpp +++ b/tests/cpp_unit_tests/test_statistics.cpp @@ -2,10 +2,21 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include + namespace power_grid_model { namespace { using AsymRealValue = RealValue; diff --git a/tests/cpp_unit_tests/test_three_phase_tensor.cpp b/tests/cpp_unit_tests/test_three_phase_tensor.cpp index c3900cf899..dc3b3021da 100644 --- a/tests/cpp_unit_tests/test_three_phase_tensor.cpp +++ b/tests/cpp_unit_tests/test_three_phase_tensor.cpp @@ -3,10 +3,16 @@ // SPDX-License-Identifier: MPL-2.0 #include +#include #include +#include #include +#include +#include +#include + namespace power_grid_model { using namespace std::complex_literals; diff --git a/tests/cpp_unit_tests/test_typing.cpp b/tests/cpp_unit_tests/test_typing.cpp index 32c4bda012..7aece2e6e6 100644 --- a/tests/cpp_unit_tests/test_typing.cpp +++ b/tests/cpp_unit_tests/test_typing.cpp @@ -8,6 +8,10 @@ #include #include +#include +#include +#include +#include namespace { using namespace power_grid_model; From ad81da11c56ac0333c671c93351f8eebfffc380e Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 20 Oct 2025 11:16:49 +0200 Subject: [PATCH 06/25] add eigen ignore Signed-off-by: Nitish Bharambe --- .clang-tidy | 1 + 1 file changed, 1 insertion(+) diff --git a/.clang-tidy b/.clang-tidy index 9d8e82d581..774a42fee9 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -66,6 +66,7 @@ readability-*, WarningsAsErrors: '*' +IgnoreHeaders: 'Eigen/.*' HeaderFilterRegex: '.*' From 54184550076e9b58de9451c9832d3850f92af4d0 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Tue, 6 Jan 2026 09:18:02 +0100 Subject: [PATCH 07/25] remove TODO Signed-off-by: Nitish Bharambe --- .../include/power_grid_model/component/base.hpp | 2 +- tests/cpp_unit_tests/test_asym_line.cpp | 1 - tests/cpp_unit_tests/test_fault.cpp | 1 - tests/cpp_unit_tests/test_line.cpp | 1 - tests/cpp_unit_tests/test_link.cpp | 1 - tests/cpp_unit_tests/test_shunt.cpp | 1 - tests/cpp_unit_tests/test_source.cpp | 1 - tests/cpp_unit_tests/test_transformer.cpp | 1 - tests/cpp_unit_tests/test_transformer_tap_regulator.cpp | 1 - 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp index bfdc92ee5a..fa2f9f27f7 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp @@ -13,7 +13,7 @@ #include "../common/enum.hpp" namespace power_grid_model { -// TODO (nitbharambe) move outside of base.hpp to component + constexpr IntS status_to_int(bool status) { return status ? IntS{1} : IntS{0}; } class Base { diff --git a/tests/cpp_unit_tests/test_asym_line.cpp b/tests/cpp_unit_tests/test_asym_line.cpp index 7acb54a9e4..ae48f84d76 100644 --- a/tests/cpp_unit_tests/test_asym_line.cpp +++ b/tests/cpp_unit_tests/test_asym_line.cpp @@ -12,7 +12,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include #include diff --git a/tests/cpp_unit_tests/test_fault.cpp b/tests/cpp_unit_tests/test_fault.cpp index 2163d0ff4a..aebfa00841 100644 --- a/tests/cpp_unit_tests/test_fault.cpp +++ b/tests/cpp_unit_tests/test_fault.cpp @@ -12,7 +12,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include diff --git a/tests/cpp_unit_tests/test_line.cpp b/tests/cpp_unit_tests/test_line.cpp index 89334c8f4c..0120d300dd 100644 --- a/tests/cpp_unit_tests/test_line.cpp +++ b/tests/cpp_unit_tests/test_line.cpp @@ -12,7 +12,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include diff --git a/tests/cpp_unit_tests/test_link.cpp b/tests/cpp_unit_tests/test_link.cpp index cd223cb1fa..f7c6a253a4 100644 --- a/tests/cpp_unit_tests/test_link.cpp +++ b/tests/cpp_unit_tests/test_link.cpp @@ -10,7 +10,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include #include diff --git a/tests/cpp_unit_tests/test_shunt.cpp b/tests/cpp_unit_tests/test_shunt.cpp index 3b36c302ad..45a8b01dea 100644 --- a/tests/cpp_unit_tests/test_shunt.cpp +++ b/tests/cpp_unit_tests/test_shunt.cpp @@ -11,7 +11,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include diff --git a/tests/cpp_unit_tests/test_source.cpp b/tests/cpp_unit_tests/test_source.cpp index 0703810015..a252db1101 100644 --- a/tests/cpp_unit_tests/test_source.cpp +++ b/tests/cpp_unit_tests/test_source.cpp @@ -11,7 +11,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include diff --git a/tests/cpp_unit_tests/test_transformer.cpp b/tests/cpp_unit_tests/test_transformer.cpp index cab28c5dcb..356dd25ac6 100644 --- a/tests/cpp_unit_tests/test_transformer.cpp +++ b/tests/cpp_unit_tests/test_transformer.cpp @@ -11,7 +11,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include diff --git a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp index 86a6408ef8..b1989249e6 100644 --- a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp +++ b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp @@ -11,7 +11,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include From b054e9fddc1355c74b6ad0f176cb768569f524f0 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Tue, 6 Jan 2026 09:36:30 +0100 Subject: [PATCH 08/25] add new test file include Signed-off-by: Nitish Bharambe --- tests/cpp_unit_tests/test_calculation_preparation.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cpp_unit_tests/test_calculation_preparation.cpp b/tests/cpp_unit_tests/test_calculation_preparation.cpp index d9230d1f6d..c053da55c0 100644 --- a/tests/cpp_unit_tests/test_calculation_preparation.cpp +++ b/tests/cpp_unit_tests/test_calculation_preparation.cpp @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include #include #include From 424f032b6b028b7488e4184600212f3d7a5cafe8 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Tue, 6 Jan 2026 14:08:10 +0100 Subject: [PATCH 09/25] remove comments Signed-off-by: Nitish Bharambe --- tests/cpp_unit_tests/test_fault.cpp | 1 - tests/cpp_unit_tests/test_three_winding_transformer.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/cpp_unit_tests/test_fault.cpp b/tests/cpp_unit_tests/test_fault.cpp index aebfa00841..b506f834dd 100644 --- a/tests/cpp_unit_tests/test_fault.cpp +++ b/tests/cpp_unit_tests/test_fault.cpp @@ -4,7 +4,6 @@ #include -// #include "power_grid_model/auxiliary/input.hpp" #include "power_grid_model/auxiliary/output.hpp" #include "power_grid_model/auxiliary/update.hpp" #include diff --git a/tests/cpp_unit_tests/test_three_winding_transformer.cpp b/tests/cpp_unit_tests/test_three_winding_transformer.cpp index 36d5e8a525..02958758bd 100644 --- a/tests/cpp_unit_tests/test_three_winding_transformer.cpp +++ b/tests/cpp_unit_tests/test_three_winding_transformer.cpp @@ -12,7 +12,6 @@ #include #include #include -// TODO (nitbharambe) Added base.hpp for status_to_int function #include #include From dffc4f4d563ac3ae298e92c82f209fb806583187 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Wed, 7 Jan 2026 14:12:20 +0100 Subject: [PATCH 10/25] fix assert missing Signed-off-by: Nitish Bharambe --- .../include/power_grid_model/common/three_phase_tensor.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp index 1cb1a4867b..f0e131a4d8 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp @@ -9,6 +9,7 @@ // eigen properties #include +#include #include #include #include From c3c6f95ad75c318826ddb2b5085988d88041059c Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 12 Jan 2026 09:26:07 +0100 Subject: [PATCH 11/25] rename to checkoptions Signed-off-by: Nitish Bharambe --- .clang-tidy | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 127fb93644..5c1c9e79b2 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,6 +1,9 @@ # SPDX-FileCopyrightText: Contributors to the Power Grid Model project + # + # SPDX-License-Identifier: MPL-2.0 + --- Checks: ' -*, @@ -67,9 +70,10 @@ readability-*, WarningsAsErrors: '*' -IgnoreHeaders: 'Eigen/.*' - HeaderFilterRegex: '.*' FormatStyle: file + +CheckOptions: + misc-include-cleaner.IgnoreHeaders : 'Eigen/.*' ... From 4a5b00cdcc223f8ec1bb1098e28921a5bc73a514 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Tue, 13 Jan 2026 10:30:29 +0100 Subject: [PATCH 12/25] clean pt 2 Signed-off-by: Nitish Bharambe --- .../power_grid_model_c/src/math_solver.cpp | 1 + power_grid_model_c_example/main.c | 2 ++ .../test_calculation_preparation.cpp | 1 - tests/cpp_unit_tests/test_container.cpp | 2 ++ tests/cpp_unit_tests/test_index_mapping.cpp | 1 + tests/cpp_unit_tests/test_job_dispatch.cpp | 7 ++++++- .../test_math_solver_pf_iterative_current.cpp | 1 + .../cpp_unit_tests/test_math_solver_pf_linear.cpp | 1 + tests/cpp_unit_tests/test_math_solver_sc.cpp | 5 ++++- tests/cpp_unit_tests/test_math_solver_se.hpp | 1 + .../test_math_solver_se_iterative_linear.cpp | 4 ++-- .../test_math_solver_se_newton_raphson.cpp | 4 ++-- tests/cpp_unit_tests/test_measured_values.cpp | 2 ++ tests/cpp_unit_tests/test_observability.cpp | 9 +++++++++ tests/cpp_unit_tests/test_optimizer.cpp | 10 ++++++++++ tests/cpp_unit_tests/test_sparse_ordering.cpp | 2 +- .../test_tap_position_optimizer.cpp | 6 +++++- tests/cpp_unit_tests/test_topology.cpp | 3 ++- tests/cpp_validation_tests/test_validation.cpp | 15 ++++++++++++++- 19 files changed, 66 insertions(+), 11 deletions(-) diff --git a/power_grid_model_c/power_grid_model_c/src/math_solver.cpp b/power_grid_model_c/power_grid_model_c/src/math_solver.cpp index 09f1984308..ae70f2dac0 100644 --- a/power_grid_model_c/power_grid_model_c/src/math_solver.cpp +++ b/power_grid_model_c/power_grid_model_c/src/math_solver.cpp @@ -5,6 +5,7 @@ #define PGM_DLL_EXPORTS #include "math_solver.hpp" +#include #include diff --git a/power_grid_model_c_example/main.c b/power_grid_model_c_example/main.c index 3a6a736546..db009a8160 100644 --- a/power_grid_model_c_example/main.c +++ b/power_grid_model_c_example/main.c @@ -25,6 +25,7 @@ We do batch calculation with 3 scenarios, with the following mutation #2: source: u_ref = 1.10, sym_load_3: -200 kW */ +// NOLINTBEGIN(misc-include-cleaner) #include "power_grid_model_c.h" #include "power_grid_model_c/dataset_definitions.h" @@ -246,3 +247,4 @@ int main(int argc, char** argv) { PGM_destroy_handle(handle); return 0; } +// NOLINTEND(misc-include-cleaner) diff --git a/tests/cpp_unit_tests/test_calculation_preparation.cpp b/tests/cpp_unit_tests/test_calculation_preparation.cpp index c053da55c0..92b9645657 100644 --- a/tests/cpp_unit_tests/test_calculation_preparation.cpp +++ b/tests/cpp_unit_tests/test_calculation_preparation.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/tests/cpp_unit_tests/test_container.cpp b/tests/cpp_unit_tests/test_container.cpp index 386faeadbb..4c88332f48 100644 --- a/tests/cpp_unit_tests/test_container.cpp +++ b/tests/cpp_unit_tests/test_container.cpp @@ -2,6 +2,8 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include #include #include diff --git a/tests/cpp_unit_tests/test_index_mapping.cpp b/tests/cpp_unit_tests/test_index_mapping.cpp index b5ef6cba6b..45c2fbd5b1 100644 --- a/tests/cpp_unit_tests/test_index_mapping.cpp +++ b/tests/cpp_unit_tests/test_index_mapping.cpp @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: MPL-2.0 +#include "power_grid_model/common/common.hpp" #include #include diff --git a/tests/cpp_unit_tests/test_job_dispatch.cpp b/tests/cpp_unit_tests/test_job_dispatch.cpp index a83bdde7e8..9daa00a861 100644 --- a/tests/cpp_unit_tests/test_job_dispatch.cpp +++ b/tests/cpp_unit_tests/test_job_dispatch.cpp @@ -4,8 +4,8 @@ #include #include -#include #include +#include #include #include #include @@ -15,8 +15,13 @@ #include #include +#include +#include #include #include +#include +#include +#include #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp b/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp index 94babe00e2..2e84cdf957 100644 --- a/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp +++ b/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp @@ -4,6 +4,7 @@ #include "test_math_solver_pf.hpp" +#include #include #include diff --git a/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp b/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp index b91df7af34..9474fca47e 100644 --- a/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp +++ b/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp @@ -4,6 +4,7 @@ #include "test_math_solver_pf.hpp" +#include #include #include diff --git a/tests/cpp_unit_tests/test_math_solver_sc.cpp b/tests/cpp_unit_tests/test_math_solver_sc.cpp index 4b73fd5d1d..a8a2c0fd2e 100644 --- a/tests/cpp_unit_tests/test_math_solver_sc.cpp +++ b/tests/cpp_unit_tests/test_math_solver_sc.cpp @@ -4,7 +4,10 @@ #include "test_math_solver_common.hpp" -#include +#include // NOLINT(misc-include-cleaner) + +#include +#include namespace power_grid_model::math_solver { diff --git a/tests/cpp_unit_tests/test_math_solver_se.hpp b/tests/cpp_unit_tests/test_math_solver_se.hpp index a26f1826c4..5b5c18d757 100644 --- a/tests/cpp_unit_tests/test_math_solver_se.hpp +++ b/tests/cpp_unit_tests/test_math_solver_se.hpp @@ -8,6 +8,7 @@ #include "test_math_solver_common.hpp" +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp b/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp index 1732a09453..bcb7f6669b 100644 --- a/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp +++ b/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_se.hpp" +#include "test_math_solver_se.hpp" // NOLINT(misc-include-cleaner) -#include +#include // NOLINT(misc-include-cleaner) #include diff --git a/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp b/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp index 8187ce3b4e..244589cf1a 100644 --- a/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp +++ b/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_se.hpp" +#include "test_math_solver_se.hpp" // NOLINT(misc-include-cleaner) -#include +#include // NOLINT(misc-include-cleaner) #include diff --git a/tests/cpp_unit_tests/test_measured_values.cpp b/tests/cpp_unit_tests/test_measured_values.cpp index d6d1cc0124..c083600efe 100644 --- a/tests/cpp_unit_tests/test_measured_values.cpp +++ b/tests/cpp_unit_tests/test_measured_values.cpp @@ -4,6 +4,8 @@ #include +#include + #include namespace power_grid_model::math_solver { diff --git a/tests/cpp_unit_tests/test_observability.cpp b/tests/cpp_unit_tests/test_observability.cpp index 7e22793589..37ea9d2bf6 100644 --- a/tests/cpp_unit_tests/test_observability.cpp +++ b/tests/cpp_unit_tests/test_observability.cpp @@ -3,7 +3,12 @@ // SPDX-License-Identifier: MPL-2.0 #include +#include +#include #include +#include +#include +#include #include #include @@ -12,7 +17,11 @@ #include #include +#include +#include +#include #include +#include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_optimizer.cpp b/tests/cpp_unit_tests/test_optimizer.cpp index 75ebacefef..8d9e1d08b7 100644 --- a/tests/cpp_unit_tests/test_optimizer.cpp +++ b/tests/cpp_unit_tests/test_optimizer.cpp @@ -5,6 +5,16 @@ #include "test_optimizer.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace power_grid_model::optimizer::test { namespace { diff --git a/tests/cpp_unit_tests/test_sparse_ordering.cpp b/tests/cpp_unit_tests/test_sparse_ordering.cpp index 99c15fd91f..0a5e2bccdb 100644 --- a/tests/cpp_unit_tests/test_sparse_ordering.cpp +++ b/tests/cpp_unit_tests/test_sparse_ordering.cpp @@ -7,8 +7,8 @@ #include #include +#include #include -#include namespace { using power_grid_model::Idx; diff --git a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp index 18edf54552..6da2fdf3f3 100644 --- a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp +++ b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp @@ -11,8 +11,12 @@ #include #include +#include +#include +#include #include -#include +#include +#include TEST_SUITE_BEGIN("Automatic Tap Changer"); diff --git a/tests/cpp_unit_tests/test_topology.cpp b/tests/cpp_unit_tests/test_topology.cpp index 049c1ce53e..8f49428bc3 100644 --- a/tests/cpp_unit_tests/test_topology.cpp +++ b/tests/cpp_unit_tests/test_topology.cpp @@ -2,10 +2,11 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include +#include #include - /* * [0] = Node / Bus * --0--> = Branch (from --id--> to) diff --git a/tests/cpp_validation_tests/test_validation.cpp b/tests/cpp_validation_tests/test_validation.cpp index 8b90d96005..fd59bba04f 100644 --- a/tests/cpp_validation_tests/test_validation.cpp +++ b/tests/cpp_validation_tests/test_validation.cpp @@ -4,11 +4,21 @@ #define PGM_ENABLE_EXPERIMENTAL -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #include #include #include @@ -16,12 +26,15 @@ #include #include #include +#include #include #include #include #include #include +#include #include +#include #include namespace power_grid_model_cpp { From 529d379f790d8915818cbecde62a8bb478b4981c Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Sun, 1 Feb 2026 22:36:53 +0100 Subject: [PATCH 13/25] fix include search place Signed-off-by: Nitish Bharambe --- tests/cpp_unit_tests/test_all_components.cpp | 2 +- tests/cpp_unit_tests/test_asym_line.cpp | 6 +++--- tests/cpp_unit_tests/test_current_sensor.cpp | 6 +++--- tests/cpp_unit_tests/test_fault.cpp | 4 ++-- tests/cpp_unit_tests/test_index_mapping.cpp | 2 +- tests/cpp_unit_tests/test_line.cpp | 6 +++--- tests/cpp_unit_tests/test_link.cpp | 6 +++--- tests/cpp_unit_tests/test_load_gen.cpp | 8 ++++---- tests/cpp_unit_tests/test_node.cpp | 2 +- tests/cpp_unit_tests/test_power_sensor.cpp | 6 +++--- tests/cpp_unit_tests/test_shunt.cpp | 6 +++--- tests/cpp_unit_tests/test_source.cpp | 6 +++--- tests/cpp_unit_tests/test_three_winding_transformer.cpp | 6 +++--- tests/cpp_unit_tests/test_transformer.cpp | 4 ++-- tests/cpp_unit_tests/test_transformer_tap_regulator.cpp | 6 +++--- tests/cpp_unit_tests/test_voltage_sensor.cpp | 4 ++-- 16 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tests/cpp_unit_tests/test_all_components.cpp b/tests/cpp_unit_tests/test_all_components.cpp index 8173125779..c792df0e2e 100644 --- a/tests/cpp_unit_tests/test_all_components.cpp +++ b/tests/cpp_unit_tests/test_all_components.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "power_grid_model/auxiliary/input.hpp" +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_asym_line.cpp b/tests/cpp_unit_tests/test_asym_line.cpp index ae48f84d76..b9eb07f425 100644 --- a/tests/cpp_unit_tests/test_asym_line.cpp +++ b/tests/cpp_unit_tests/test_asym_line.cpp @@ -4,9 +4,9 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_current_sensor.cpp b/tests/cpp_unit_tests/test_current_sensor.cpp index 1e0636d50d..8b72d78bd0 100644 --- a/tests/cpp_unit_tests/test_current_sensor.cpp +++ b/tests/cpp_unit_tests/test_current_sensor.cpp @@ -4,9 +4,9 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_fault.cpp b/tests/cpp_unit_tests/test_fault.cpp index b506f834dd..c3b4393675 100644 --- a/tests/cpp_unit_tests/test_fault.cpp +++ b/tests/cpp_unit_tests/test_fault.cpp @@ -4,8 +4,8 @@ #include -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_index_mapping.cpp b/tests/cpp_unit_tests/test_index_mapping.cpp index 45c2fbd5b1..fe33372cf0 100644 --- a/tests/cpp_unit_tests/test_index_mapping.cpp +++ b/tests/cpp_unit_tests/test_index_mapping.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "power_grid_model/common/common.hpp" +#include #include #include diff --git a/tests/cpp_unit_tests/test_line.cpp b/tests/cpp_unit_tests/test_line.cpp index 0120d300dd..84a010e21a 100644 --- a/tests/cpp_unit_tests/test_line.cpp +++ b/tests/cpp_unit_tests/test_line.cpp @@ -4,9 +4,9 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_link.cpp b/tests/cpp_unit_tests/test_link.cpp index f7c6a253a4..8fbc02174e 100644 --- a/tests/cpp_unit_tests/test_link.cpp +++ b/tests/cpp_unit_tests/test_link.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_load_gen.cpp b/tests/cpp_unit_tests/test_load_gen.cpp index d11e1bac98..07449452db 100644 --- a/tests/cpp_unit_tests/test_load_gen.cpp +++ b/tests/cpp_unit_tests/test_load_gen.cpp @@ -4,10 +4,10 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" -#include "power_grid_model/calculation_parameters.hpp" +#include +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_node.cpp b/tests/cpp_unit_tests/test_node.cpp index c3b0b15e7b..2858220564 100644 --- a/tests/cpp_unit_tests/test_node.cpp +++ b/tests/cpp_unit_tests/test_node.cpp @@ -4,7 +4,7 @@ #include -#include "power_grid_model/auxiliary/update.hpp" +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_power_sensor.cpp b/tests/cpp_unit_tests/test_power_sensor.cpp index f256c3c8f5..b6f9edfb9a 100644 --- a/tests/cpp_unit_tests/test_power_sensor.cpp +++ b/tests/cpp_unit_tests/test_power_sensor.cpp @@ -4,9 +4,9 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_shunt.cpp b/tests/cpp_unit_tests/test_shunt.cpp index 45a8b01dea..1c3b241d6c 100644 --- a/tests/cpp_unit_tests/test_shunt.cpp +++ b/tests/cpp_unit_tests/test_shunt.cpp @@ -4,9 +4,9 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_source.cpp b/tests/cpp_unit_tests/test_source.cpp index a252db1101..837b481b45 100644 --- a/tests/cpp_unit_tests/test_source.cpp +++ b/tests/cpp_unit_tests/test_source.cpp @@ -5,9 +5,9 @@ #include #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_three_winding_transformer.cpp b/tests/cpp_unit_tests/test_three_winding_transformer.cpp index 02958758bd..a609e03253 100644 --- a/tests/cpp_unit_tests/test_three_winding_transformer.cpp +++ b/tests/cpp_unit_tests/test_three_winding_transformer.cpp @@ -5,9 +5,9 @@ #include #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_transformer.cpp b/tests/cpp_unit_tests/test_transformer.cpp index 356dd25ac6..3c070f8030 100644 --- a/tests/cpp_unit_tests/test_transformer.cpp +++ b/tests/cpp_unit_tests/test_transformer.cpp @@ -4,8 +4,8 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp index b1989249e6..eeba6ba2a6 100644 --- a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp +++ b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp @@ -4,9 +4,9 @@ #include -#include "power_grid_model/auxiliary/input.hpp" -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_voltage_sensor.cpp b/tests/cpp_unit_tests/test_voltage_sensor.cpp index b51f735fed..be054878e9 100644 --- a/tests/cpp_unit_tests/test_voltage_sensor.cpp +++ b/tests/cpp_unit_tests/test_voltage_sensor.cpp @@ -8,8 +8,8 @@ #include #include -#include "power_grid_model/auxiliary/output.hpp" -#include "power_grid_model/auxiliary/update.hpp" +#include +#include #include #include From b32792a854e908c831a797f3663c911695685fee Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 11:59:46 +0100 Subject: [PATCH 14/25] add more includes Signed-off-by: Nitish Bharambe --- power_grid_model_c/power_grid_model_c/src/buffer.cpp | 3 +++ power_grid_model_c/power_grid_model_c/src/dataset.cpp | 2 ++ power_grid_model_c/power_grid_model_c/src/handle.cpp | 2 ++ .../power_grid_model_c/src/meta_data.cpp | 9 +++++++++ power_grid_model_c/power_grid_model_c/src/model.cpp | 10 ++++++++++ power_grid_model_c/power_grid_model_c/src/options.cpp | 1 + .../power_grid_model_c/src/serialization.cpp | 3 +++ tests/native_api_tests/test_api_buffer.cpp | 2 ++ tests/native_api_tests/test_api_meta_data.cpp | 5 ++++- tests/native_api_tests/test_api_model.cpp | 9 ++++++++- 10 files changed, 44 insertions(+), 2 deletions(-) diff --git a/power_grid_model_c/power_grid_model_c/src/buffer.cpp b/power_grid_model_c/power_grid_model_c/src/buffer.cpp index 4df924640f..9950134662 100644 --- a/power_grid_model_c/power_grid_model_c/src/buffer.cpp +++ b/power_grid_model_c/power_grid_model_c/src/buffer.cpp @@ -5,6 +5,7 @@ #define PGM_DLL_EXPORTS #include "forward_declarations.hpp" +#include "power_grid_model_c/basics.h" #include "power_grid_model_c/buffer.h" #include "handle.hpp" @@ -12,7 +13,9 @@ #include +#include #include +#include namespace { using namespace power_grid_model; diff --git a/power_grid_model_c/power_grid_model_c/src/dataset.cpp b/power_grid_model_c/power_grid_model_c/src/dataset.cpp index 15d15f5dc8..33e583a23d 100644 --- a/power_grid_model_c/power_grid_model_c/src/dataset.cpp +++ b/power_grid_model_c/power_grid_model_c/src/dataset.cpp @@ -15,6 +15,8 @@ #include #include +#include + using namespace power_grid_model; using namespace power_grid_model::meta_data; using power_grid_model_c::call_with_catch; diff --git a/power_grid_model_c/power_grid_model_c/src/handle.cpp b/power_grid_model_c/power_grid_model_c/src/handle.cpp index 1bfb5e3763..7611e4aba9 100644 --- a/power_grid_model_c/power_grid_model_c/src/handle.cpp +++ b/power_grid_model_c/power_grid_model_c/src/handle.cpp @@ -5,12 +5,14 @@ #define PGM_DLL_EXPORTS #include "forward_declarations.hpp" +#include "power_grid_model_c/basics.h" #include "power_grid_model_c/handle.h" #include "handle.hpp" #include "input_sanitization.hpp" #include +#include #include namespace { diff --git a/power_grid_model_c/power_grid_model_c/src/meta_data.cpp b/power_grid_model_c/power_grid_model_c/src/meta_data.cpp index bc31abdcd2..e3a1bc0b85 100644 --- a/power_grid_model_c/power_grid_model_c/src/meta_data.cpp +++ b/power_grid_model_c/power_grid_model_c/src/meta_data.cpp @@ -11,10 +11,19 @@ #include "handle.hpp" #include "input_sanitization.hpp" +#include #include #include #include #include +#include + +#include + +#include +#include +#include +#include namespace { using namespace power_grid_model; diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp index 00ab5bee39..fbc0bf705f 100644 --- a/power_grid_model_c/power_grid_model_c/src/model.cpp +++ b/power_grid_model_c/power_grid_model_c/src/model.cpp @@ -14,10 +14,20 @@ #include #include +#include +#include #include +#include +#include +#include +#include +#include #include #include +#include +#include +#include namespace { using namespace power_grid_model; diff --git a/power_grid_model_c/power_grid_model_c/src/options.cpp b/power_grid_model_c/power_grid_model_c/src/options.cpp index 2dba36f954..3fa6777d57 100644 --- a/power_grid_model_c/power_grid_model_c/src/options.cpp +++ b/power_grid_model_c/power_grid_model_c/src/options.cpp @@ -5,6 +5,7 @@ #define PGM_DLL_EXPORTS #include "forward_declarations.hpp" +#include "power_grid_model_c/basics.h" #include "power_grid_model_c/options.h" #include "handle.hpp" diff --git a/power_grid_model_c/power_grid_model_c/src/serialization.cpp b/power_grid_model_c/power_grid_model_c/src/serialization.cpp index 44b2c8d077..d1f4a75983 100644 --- a/power_grid_model_c/power_grid_model_c/src/serialization.cpp +++ b/power_grid_model_c/power_grid_model_c/src/serialization.cpp @@ -16,6 +16,9 @@ #include #include +#include + +#include namespace { using namespace power_grid_model::meta_data; diff --git a/tests/native_api_tests/test_api_buffer.cpp b/tests/native_api_tests/test_api_buffer.cpp index 54528fa6eb..45b3512496 100644 --- a/tests/native_api_tests/test_api_buffer.cpp +++ b/tests/native_api_tests/test_api_buffer.cpp @@ -13,10 +13,12 @@ #include #include #include +#include #include #include #include #include +#include namespace power_grid_model_cpp { namespace { diff --git a/tests/native_api_tests/test_api_meta_data.cpp b/tests/native_api_tests/test_api_meta_data.cpp index c264c2cc80..1722cc25ea 100644 --- a/tests/native_api_tests/test_api_meta_data.cpp +++ b/tests/native_api_tests/test_api_meta_data.cpp @@ -2,11 +2,14 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "power_grid_model_cpp.hpp" +#include "power_grid_model_cpp/basics.hpp" +#include "power_grid_model_cpp/handle.hpp" +#include "power_grid_model_cpp/meta_data.hpp" #include #include +#include namespace power_grid_model_cpp { diff --git a/tests/native_api_tests/test_api_model.cpp b/tests/native_api_tests/test_api_model.cpp index b1eee12f17..b531e62e68 100644 --- a/tests/native_api_tests/test_api_model.cpp +++ b/tests/native_api_tests/test_api_model.cpp @@ -4,7 +4,12 @@ #include "load_dataset.hpp" -#include "power_grid_model_cpp.hpp" +#include "power_grid_model_cpp/basics.hpp" +#include "power_grid_model_cpp/buffer.hpp" +#include "power_grid_model_cpp/dataset.hpp" +#include "power_grid_model_cpp/handle.hpp" +#include "power_grid_model_cpp/model.hpp" +#include "power_grid_model_cpp/options.hpp" #include @@ -12,11 +17,13 @@ #include #include +#include #include #include #include #include #include +#include /* Testing network From 2b6f6704cf36ea2507a13596b14dedace81d0b51 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 12:19:39 +0100 Subject: [PATCH 15/25] add more includes 2 Signed-off-by: Nitish Bharambe --- power_grid_model_c/power_grid_model_c/src/buffer.cpp | 1 + power_grid_model_c/power_grid_model_c/src/dataset.cpp | 2 ++ power_grid_model_c/power_grid_model_c/src/serialization.cpp | 1 + tests/native_api_tests/test_api_buffer.cpp | 2 ++ tests/native_api_tests/test_api_model.cpp | 3 +++ 5 files changed, 9 insertions(+) diff --git a/power_grid_model_c/power_grid_model_c/src/buffer.cpp b/power_grid_model_c/power_grid_model_c/src/buffer.cpp index 9950134662..437163a497 100644 --- a/power_grid_model_c/power_grid_model_c/src/buffer.cpp +++ b/power_grid_model_c/power_grid_model_c/src/buffer.cpp @@ -12,6 +12,7 @@ #include "input_sanitization.hpp" #include +#include #include #include diff --git a/power_grid_model_c/power_grid_model_c/src/dataset.cpp b/power_grid_model_c/power_grid_model_c/src/dataset.cpp index 33e583a23d..0960a3b708 100644 --- a/power_grid_model_c/power_grid_model_c/src/dataset.cpp +++ b/power_grid_model_c/power_grid_model_c/src/dataset.cpp @@ -5,6 +5,7 @@ #define PGM_DLL_EXPORTS #include "forward_declarations.hpp" +#include "power_grid_model_c/basics.h" #include "power_grid_model_c/dataset.h" #include "get_meta_data.hpp" @@ -13,6 +14,7 @@ #include #include +#include #include #include diff --git a/power_grid_model_c/power_grid_model_c/src/serialization.cpp b/power_grid_model_c/power_grid_model_c/src/serialization.cpp index d1f4a75983..8b7e588255 100644 --- a/power_grid_model_c/power_grid_model_c/src/serialization.cpp +++ b/power_grid_model_c/power_grid_model_c/src/serialization.cpp @@ -18,6 +18,7 @@ #include #include +#include #include namespace { diff --git a/tests/native_api_tests/test_api_buffer.cpp b/tests/native_api_tests/test_api_buffer.cpp index 45b3512496..f1daecffa3 100644 --- a/tests/native_api_tests/test_api_buffer.cpp +++ b/tests/native_api_tests/test_api_buffer.cpp @@ -2,9 +2,11 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include #include #include +#include diff --git a/tests/native_api_tests/test_api_model.cpp b/tests/native_api_tests/test_api_model.cpp index b531e62e68..b016047a26 100644 --- a/tests/native_api_tests/test_api_model.cpp +++ b/tests/native_api_tests/test_api_model.cpp @@ -11,6 +11,8 @@ #include "power_grid_model_cpp/model.hpp" #include "power_grid_model_cpp/options.hpp" +#include "power_grid_model_c/basics.h" + #include #include @@ -22,6 +24,7 @@ #include #include #include +#include #include #include From c59acafbb2c24f5a050764455ca014006bb29c13 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 13:59:16 +0100 Subject: [PATCH 16/25] add more includes 3 Signed-off-by: Nitish Bharambe --- power_grid_model_c/power_grid_model_c/src/model.cpp | 1 + tests/native_api_tests/test_api_model.cpp | 2 +- tests/native_api_tests/test_api_model_update.cpp | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp index fbc0bf705f..c2c44e6b0a 100644 --- a/power_grid_model_c/power_grid_model_c/src/model.cpp +++ b/power_grid_model_c/power_grid_model_c/src/model.cpp @@ -20,6 +20,7 @@ #include #include +#include #include #include #include diff --git a/tests/native_api_tests/test_api_model.cpp b/tests/native_api_tests/test_api_model.cpp index b016047a26..01244a6e12 100644 --- a/tests/native_api_tests/test_api_model.cpp +++ b/tests/native_api_tests/test_api_model.cpp @@ -29,7 +29,7 @@ #include /* -Testing network +Testing network- source_1 -- node_0 |---- line_5 ----| node_4 | |---- line_6 ----| diff --git a/tests/native_api_tests/test_api_model_update.cpp b/tests/native_api_tests/test_api_model_update.cpp index c4eaef0435..189fba5418 100644 --- a/tests/native_api_tests/test_api_model_update.cpp +++ b/tests/native_api_tests/test_api_model_update.cpp @@ -4,14 +4,21 @@ #include "load_dataset.hpp" +#include #include +#include +#include +#include +#include #include #include +#include #include #include #include +#include #include #include #include From eee37dd0b1140fad211d25e65b9ca31803d5bcf2 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 14:17:48 +0100 Subject: [PATCH 17/25] operator s includes Signed-off-by: Nitish Bharambe --- tests/native_api_tests/test_api_model.cpp | 1 + tests/native_api_tests/test_api_model_update.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/native_api_tests/test_api_model.cpp b/tests/native_api_tests/test_api_model.cpp index 01244a6e12..6b10a0c119 100644 --- a/tests/native_api_tests/test_api_model.cpp +++ b/tests/native_api_tests/test_api_model.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/native_api_tests/test_api_model_update.cpp b/tests/native_api_tests/test_api_model_update.cpp index 189fba5418..f8c63d9bc6 100644 --- a/tests/native_api_tests/test_api_model_update.cpp +++ b/tests/native_api_tests/test_api_model_update.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include namespace { From 21162c01119e9faeef375ee038cd062f7c500713 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 15:56:43 +0100 Subject: [PATCH 18/25] remove includes Signed-off-by: Nitish Bharambe --- power_grid_model_c/power_grid_model_c/src/dataset.cpp | 2 -- power_grid_model_c/power_grid_model_c/src/handle.cpp | 2 -- power_grid_model_c/power_grid_model_c/src/meta_data.cpp | 3 --- power_grid_model_c/power_grid_model_c/src/model.cpp | 3 --- power_grid_model_c/power_grid_model_c/src/options.cpp | 3 +-- .../power_grid_model_c/src/serialization.cpp | 1 - tests/native_api_tests/test_api_buffer.cpp | 7 ------- tests/native_api_tests/test_api_meta_data.cpp | 1 - tests/native_api_tests/test_api_model.cpp | 8 +++----- tests/native_api_tests/test_api_model_update.cpp | 4 ---- 10 files changed, 4 insertions(+), 30 deletions(-) diff --git a/power_grid_model_c/power_grid_model_c/src/dataset.cpp b/power_grid_model_c/power_grid_model_c/src/dataset.cpp index 0960a3b708..58f1c1d76d 100644 --- a/power_grid_model_c/power_grid_model_c/src/dataset.cpp +++ b/power_grid_model_c/power_grid_model_c/src/dataset.cpp @@ -14,8 +14,6 @@ #include #include -#include -#include #include diff --git a/power_grid_model_c/power_grid_model_c/src/handle.cpp b/power_grid_model_c/power_grid_model_c/src/handle.cpp index 7611e4aba9..34ad0e8fb0 100644 --- a/power_grid_model_c/power_grid_model_c/src/handle.cpp +++ b/power_grid_model_c/power_grid_model_c/src/handle.cpp @@ -3,7 +3,6 @@ // SPDX-License-Identifier: MPL-2.0 #define PGM_DLL_EXPORTS -#include "forward_declarations.hpp" #include "power_grid_model_c/basics.h" #include "power_grid_model_c/handle.h" @@ -13,7 +12,6 @@ #include #include -#include namespace { using namespace power_grid_model; diff --git a/power_grid_model_c/power_grid_model_c/src/meta_data.cpp b/power_grid_model_c/power_grid_model_c/src/meta_data.cpp index e3a1bc0b85..cfd984ace0 100644 --- a/power_grid_model_c/power_grid_model_c/src/meta_data.cpp +++ b/power_grid_model_c/power_grid_model_c/src/meta_data.cpp @@ -13,9 +13,6 @@ #include #include -#include -#include -#include #include #include diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp index c2c44e6b0a..723b1a2d5f 100644 --- a/power_grid_model_c/power_grid_model_c/src/model.cpp +++ b/power_grid_model_c/power_grid_model_c/src/model.cpp @@ -10,7 +10,6 @@ #include "handle.hpp" #include "input_sanitization.hpp" #include "math_solver.hpp" -#include "options.hpp" #include #include @@ -24,8 +23,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/power_grid_model_c/power_grid_model_c/src/options.cpp b/power_grid_model_c/power_grid_model_c/src/options.cpp index 3fa6777d57..d17d3ef91c 100644 --- a/power_grid_model_c/power_grid_model_c/src/options.cpp +++ b/power_grid_model_c/power_grid_model_c/src/options.cpp @@ -3,10 +3,9 @@ // SPDX-License-Identifier: MPL-2.0 #define PGM_DLL_EXPORTS -#include "forward_declarations.hpp" -#include "power_grid_model_c/basics.h" #include "power_grid_model_c/options.h" +#include "power_grid_model_c/basics.h" #include "handle.hpp" #include "input_sanitization.hpp" diff --git a/power_grid_model_c/power_grid_model_c/src/serialization.cpp b/power_grid_model_c/power_grid_model_c/src/serialization.cpp index 8b7e588255..dd8c6a2735 100644 --- a/power_grid_model_c/power_grid_model_c/src/serialization.cpp +++ b/power_grid_model_c/power_grid_model_c/src/serialization.cpp @@ -12,7 +12,6 @@ #include "input_sanitization.hpp" #include "power_grid_model_c/basics.h" -#include "power_grid_model_c/handle.h" #include #include diff --git a/tests/native_api_tests/test_api_buffer.cpp b/tests/native_api_tests/test_api_buffer.cpp index f1daecffa3..17b9155a45 100644 --- a/tests/native_api_tests/test_api_buffer.cpp +++ b/tests/native_api_tests/test_api_buffer.cpp @@ -8,18 +8,11 @@ #include #include - #include -#include #include #include #include -#include -#include -#include -#include #include namespace power_grid_model_cpp { diff --git a/tests/native_api_tests/test_api_meta_data.cpp b/tests/native_api_tests/test_api_meta_data.cpp index 1722cc25ea..734474883d 100644 --- a/tests/native_api_tests/test_api_meta_data.cpp +++ b/tests/native_api_tests/test_api_meta_data.cpp @@ -8,7 +8,6 @@ #include -#include #include namespace power_grid_model_cpp { diff --git a/tests/native_api_tests/test_api_model.cpp b/tests/native_api_tests/test_api_model.cpp index 6b10a0c119..e785c66496 100644 --- a/tests/native_api_tests/test_api_model.cpp +++ b/tests/native_api_tests/test_api_model.cpp @@ -20,11 +20,9 @@ #include #include #include -#include -#include +#include // NOLINT(misc-include-cleaner) #include #include -#include #include #include #include @@ -130,7 +128,7 @@ auto const complete_state_json = R"json({ {"id": 6, "from_node": 4, "to_node": 0, "from_status": 0, "to_status": 0} ] } -})json"s; +})json"s; // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 auto const single_update_json = R"json({ "version": "1.0", @@ -149,7 +147,7 @@ auto const single_update_json = R"json({ {"id": 6, "from_status": 0, "to_status": 0} ] } -})json"s; +})json"s; // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 auto const batch_update_json = R"json({ "version": "1.0", diff --git a/tests/native_api_tests/test_api_model_update.cpp b/tests/native_api_tests/test_api_model_update.cpp index f8c63d9bc6..ecbbcbfd33 100644 --- a/tests/native_api_tests/test_api_model_update.cpp +++ b/tests/native_api_tests/test_api_model_update.cpp @@ -17,13 +17,9 @@ #include -#include #include -#include #include -#include #include -#include #include namespace { From 986e1b227eb578a8e9dbaaa90a851d71a333c830 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 15:59:57 +0100 Subject: [PATCH 19/25] add definition option Signed-off-by: Nitish Bharambe --- power_grid_model_c/power_grid_model_c/src/handle.cpp | 2 +- power_grid_model_c/power_grid_model_c/src/model.cpp | 1 + tests/native_api_tests/test_api_buffer.cpp | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/power_grid_model_c/power_grid_model_c/src/handle.cpp b/power_grid_model_c/power_grid_model_c/src/handle.cpp index 34ad0e8fb0..e918b407ef 100644 --- a/power_grid_model_c/power_grid_model_c/src/handle.cpp +++ b/power_grid_model_c/power_grid_model_c/src/handle.cpp @@ -4,8 +4,8 @@ #define PGM_DLL_EXPORTS -#include "power_grid_model_c/basics.h" #include "power_grid_model_c/handle.h" +#include "power_grid_model_c/basics.h" #include "handle.hpp" #include "input_sanitization.hpp" diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp index 723b1a2d5f..f994b325e7 100644 --- a/power_grid_model_c/power_grid_model_c/src/model.cpp +++ b/power_grid_model_c/power_grid_model_c/src/model.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/tests/native_api_tests/test_api_buffer.cpp b/tests/native_api_tests/test_api_buffer.cpp index 17b9155a45..496bc81a3a 100644 --- a/tests/native_api_tests/test_api_buffer.cpp +++ b/tests/native_api_tests/test_api_buffer.cpp @@ -6,7 +6,6 @@ #include #include #include -#include From 6ee5ceedb690976d6367afd325ac9d1dd58515b6 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 17:14:48 +0100 Subject: [PATCH 20/25] round 3 Signed-off-by: Nitish Bharambe --- .../power_grid_model_c/src/model.cpp | 2 +- tests/cpp_unit_tests/test_component_input.cpp | 2 +- .../cpp_unit_tests/test_component_output.cpp | 2 +- .../cpp_unit_tests/test_component_update.cpp | 2 +- tests/cpp_unit_tests/test_dataset.cpp | 11 +++++++ tests/cpp_unit_tests/test_iterator_facade.cpp | 5 ++++ .../cpp_unit_tests/test_main_core_output.cpp | 15 +++++++++- .../test_meta_data_generation.cpp | 27 +++++++++-------- tests/cpp_unit_tests/test_serializer.cpp | 12 ++++++++ .../test_three_winding_transformer.cpp | 1 + .../test_api_model_multi_dimension.cpp | 11 ++++--- .../test_api_model_update.cpp | 6 ++-- .../test_api_serialization.cpp | 30 ++++++++++++++----- tests/native_api_tests/test_api_utils.cpp | 4 +++ 14 files changed, 98 insertions(+), 32 deletions(-) diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp index f994b325e7..d20b76da84 100644 --- a/power_grid_model_c/power_grid_model_c/src/model.cpp +++ b/power_grid_model_c/power_grid_model_c/src/model.cpp @@ -10,6 +10,7 @@ #include "handle.hpp" #include "input_sanitization.hpp" #include "math_solver.hpp" +#include "options.hpp" #include #include @@ -18,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/tests/cpp_unit_tests/test_component_input.cpp b/tests/cpp_unit_tests/test_component_input.cpp index 1d9928dec6..e528bb769a 100644 --- a/tests/cpp_unit_tests/test_component_input.cpp +++ b/tests/cpp_unit_tests/test_component_input.cpp @@ -2,4 +2,4 @@ // // SPDX-License-Identifier: MPL-2.0 -#include +#include // NOLINT(misc-include-cleaner) diff --git a/tests/cpp_unit_tests/test_component_output.cpp b/tests/cpp_unit_tests/test_component_output.cpp index f4cf4b4e0c..34acc8b098 100644 --- a/tests/cpp_unit_tests/test_component_output.cpp +++ b/tests/cpp_unit_tests/test_component_output.cpp @@ -2,4 +2,4 @@ // // SPDX-License-Identifier: MPL-2.0 -#include +#include // NOLINT(misc-include-cleaner) diff --git a/tests/cpp_unit_tests/test_component_update.cpp b/tests/cpp_unit_tests/test_component_update.cpp index adf764742e..ad00303c98 100644 --- a/tests/cpp_unit_tests/test_component_update.cpp +++ b/tests/cpp_unit_tests/test_component_update.cpp @@ -2,4 +2,4 @@ // // SPDX-License-Identifier: MPL-2.0 -#include +#include // NOLINT(misc-include-cleaner) diff --git a/tests/cpp_unit_tests/test_dataset.cpp b/tests/cpp_unit_tests/test_dataset.cpp index d8a15ed573..088b117e72 100644 --- a/tests/cpp_unit_tests/test_dataset.cpp +++ b/tests/cpp_unit_tests/test_dataset.cpp @@ -5,13 +5,24 @@ #include #include #include +#include #include +#include +#include #include #include #include +#include +#include +#include +#include #include +#include +#include +#include +#include TYPE_TO_STRING_AS("ConstDataset", power_grid_model::ConstDataset); TYPE_TO_STRING_AS("MutableDataset", power_grid_model::MutableDataset); diff --git a/tests/cpp_unit_tests/test_iterator_facade.cpp b/tests/cpp_unit_tests/test_iterator_facade.cpp index 2cceab950e..3cfba58beb 100644 --- a/tests/cpp_unit_tests/test_iterator_facade.cpp +++ b/tests/cpp_unit_tests/test_iterator_facade.cpp @@ -2,12 +2,17 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include #include #include +#include +#include #include +#include +#include namespace { using power_grid_model::Idx; diff --git a/tests/cpp_unit_tests/test_main_core_output.cpp b/tests/cpp_unit_tests/test_main_core_output.cpp index 803c68bace..4226f35970 100644 --- a/tests/cpp_unit_tests/test_main_core_output.cpp +++ b/tests/cpp_unit_tests/test_main_core_output.cpp @@ -2,13 +2,26 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include -#include #include +#include +#include +#include + namespace power_grid_model::main_core { TEST_CASE("Test main core output") { SUBCASE("TransformerTapRegulator") { diff --git a/tests/cpp_unit_tests/test_meta_data_generation.cpp b/tests/cpp_unit_tests/test_meta_data_generation.cpp index b0c370c494..c116d3da05 100644 --- a/tests/cpp_unit_tests/test_meta_data_generation.cpp +++ b/tests/cpp_unit_tests/test_meta_data_generation.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -17,16 +18,16 @@ TEST_CASE("Test column row conversion") { auto const& meta_map = meta_data::meta_data_gen::meta_data.get_dataset("input"); auto const& node = meta_map.get_component("node"); auto const& node_attr = node.attributes; - CHECK(node_attr[0].name == "id"s); + CHECK(node_attr[0].name == "id"s); // NOLINT(misc-include-cleaner) CHECK(node_attr[0].ctype == CType::c_int32); - CHECK(node_attr[1].name == "u_rated"s); + CHECK(node_attr[1].name == "u_rated"s); // NOLINT(misc-include-cleaner) CHECK(node_attr[1].ctype == CType::c_double); - auto const& sym_voltage_sensor = meta_map.get_component("sym_voltage_sensor"s); + auto const& sym_voltage_sensor = meta_map.get_component("sym_voltage_sensor"s); // NOLINT(misc-include-cleaner) auto const& sensor_attr = sym_voltage_sensor.attributes; - CHECK(sensor_attr[0].name == "id"s); + CHECK(sensor_attr[0].name == "id"s); // NOLINT(misc-include-cleaner) CHECK(sensor_attr[0].ctype == CType::c_int32); - CHECK(sensor_attr[1].name == "measured_object"s); + CHECK(sensor_attr[1].name == "measured_object"s); // NOLINT(misc-include-cleaner) CHECK(sensor_attr[1].ctype == CType::c_int32); } @@ -34,16 +35,16 @@ TEST_CASE("Test column row conversion") { auto const& meta_map = meta_data::meta_data_gen::meta_data.get_dataset("asym_output"); auto const& node = meta_map.get_component("node"); auto const& node_attr = node.attributes; - CHECK(node_attr[0].name == "id"s); + CHECK(node_attr[0].name == "id"s); // NOLINT(misc-include-cleaner) CHECK(node_attr[0].ctype == CType::c_int32); - CHECK(node_attr[2].name == "u_pu"s); + CHECK(node_attr[2].name == "u_pu"s); // NOLINT(misc-include-cleaner) CHECK(node_attr[2].ctype == CType::c_double3); auto const& sym_voltage_sensor = meta_map.get_component("sym_voltage_sensor"); auto const& sensor_attr = sym_voltage_sensor.attributes; - CHECK(sensor_attr[0].name == "id"s); + CHECK(sensor_attr[0].name == "id"s); // NOLINT(misc-include-cleaner) CHECK(sensor_attr[0].ctype == CType::c_int32); - CHECK(sensor_attr[2].name == "u_residual"s); + CHECK(sensor_attr[2].name == "u_residual"s); // NOLINT(misc-include-cleaner) CHECK(sensor_attr[2].ctype == CType::c_double3); } @@ -51,16 +52,16 @@ TEST_CASE("Test column row conversion") { auto const& meta_map = meta_data::meta_data_gen::meta_data.get_dataset("update"); auto const& load = meta_map.get_component("asym_load"); auto const& load_attr = load.attributes; - CHECK(load_attr[0].name == "id"s); + CHECK(load_attr[0].name == "id"s); // NOLINT(misc-include-cleaner) CHECK(load_attr[0].ctype == CType::c_int32); - CHECK(load_attr[2].name == "p_specified"s); + CHECK(load_attr[2].name == "p_specified"s); // NOLINT(misc-include-cleaner) CHECK(load_attr[2].ctype == CType::c_double3); auto const& sym_voltage_sensor = meta_map.get_component("sym_voltage_sensor"); auto const& sensor_attr = sym_voltage_sensor.attributes; - CHECK(sensor_attr[0].name == "id"s); + CHECK(sensor_attr[0].name == "id"s); // NOLINT(misc-include-cleaner) CHECK(sensor_attr[0].ctype == CType::c_int32); - CHECK(sensor_attr[1].name == "u_sigma"s); + CHECK(sensor_attr[1].name == "u_sigma"s); // NOLINT(misc-include-cleaner) CHECK(sensor_attr[1].ctype == CType::c_double); } } diff --git a/tests/cpp_unit_tests/test_serializer.cpp b/tests/cpp_unit_tests/test_serializer.cpp index df1e65fd0e..84eca413db 100644 --- a/tests/cpp_unit_tests/test_serializer.cpp +++ b/tests/cpp_unit_tests/test_serializer.cpp @@ -2,12 +2,24 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include +#include #include +#include #include +#include +#include +#include +#include #include +#include +#include #include +#include +#include namespace power_grid_model::meta_data { diff --git a/tests/cpp_unit_tests/test_three_winding_transformer.cpp b/tests/cpp_unit_tests/test_three_winding_transformer.cpp index a609e03253..577202aefa 100644 --- a/tests/cpp_unit_tests/test_three_winding_transformer.cpp +++ b/tests/cpp_unit_tests/test_three_winding_transformer.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/tests/native_api_tests/test_api_model_multi_dimension.cpp b/tests/native_api_tests/test_api_model_multi_dimension.cpp index fd8dfc5327..4f1931efa0 100644 --- a/tests/native_api_tests/test_api_model_multi_dimension.cpp +++ b/tests/native_api_tests/test_api_model_multi_dimension.cpp @@ -4,13 +4,16 @@ #include "load_dataset.hpp" -#include "power_grid_model_cpp.hpp" - -#include +#include +#include +#include +#include +#include #include #include +#include #include #include #include @@ -39,7 +42,7 @@ auto const complete_state_json = R"json({ {"id": 0, "u_rated": 10e3} ] } -})json"s; +})json"s; // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 } // namespace diff --git a/tests/native_api_tests/test_api_model_update.cpp b/tests/native_api_tests/test_api_model_update.cpp index ecbbcbfd33..d451a3a5d9 100644 --- a/tests/native_api_tests/test_api_model_update.cpp +++ b/tests/native_api_tests/test_api_model_update.cpp @@ -314,7 +314,7 @@ auto const complete_state_json = R"json({ {"id": 9, "node": 3, "status": 1, "g1": 0.015, "b1": 0, "g0": 0.015, "b0": 0} ] } -})json"s; +})json"s; // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 auto const update_json = R"json({ "version": "1.0", @@ -340,7 +340,7 @@ auto const update_json = R"json({ ] } ] -})json"s; +})json"s; // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 auto const update_vector_json = R"json({ "version": "1.0", @@ -360,7 +360,7 @@ auto const update_vector_json = R"json({ ] } ] -})json"s; +})json"s; // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 } // namespace TEST_CASE("API model - all updates") { diff --git a/tests/native_api_tests/test_api_serialization.cpp b/tests/native_api_tests/test_api_serialization.cpp index 261a4ca19f..9b723eff52 100644 --- a/tests/native_api_tests/test_api_serialization.cpp +++ b/tests/native_api_tests/test_api_serialization.cpp @@ -2,12 +2,19 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "power_grid_model_cpp.hpp" - +#include "power_grid_model_cpp/basics.hpp" +#include "power_grid_model_cpp/buffer.hpp" +#include "power_grid_model_cpp/dataset.hpp" +#include "power_grid_model_cpp/handle.hpp" +#include "power_grid_model_cpp/model.hpp" +#include "power_grid_model_cpp/serialization.hpp" + +#include #include #include +// NOLINTBEGIN(misc-include-cleaner) #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4702) // Contains potentially unreachable code @@ -16,10 +23,15 @@ #ifdef _MSC_VER #pragma warning(pop) #endif // _MSC_VER +// NOLINTEND(misc-include-cleaner) +#include #include +#include +#include #include #include +#include #include namespace power_grid_model_cpp { @@ -91,7 +103,8 @@ TEST_CASE("API Serialization and Deserialization") { msgpack_serializer.get_to_binary_buffer(0, msgpack_data); auto const* const char_start = reinterpret_cast(msgpack_data.data()); auto const* const char_end = char_start + msgpack_data.size(); - auto const json_document = nlohmann::ordered_json::from_msgpack(char_start, char_end); + auto const json_document = + nlohmann::ordered_json::from_msgpack(char_start, char_end); // NOLINT(misc-include-cleaner) auto const json_result = json_document.dump(-1); CHECK(json_result == json_data); } @@ -113,7 +126,7 @@ TEST_CASE("API Serialization and Deserialization") { SUBCASE("Deserializer") { // msgpack data - auto const json_document = nlohmann::json::parse(json_data); + auto const json_document = nlohmann::json::parse(json_data); // NOLINT(misc-include-cleaner) std::vector msgpack_data; nlohmann::json::to_msgpack(json_document, msgpack_data); @@ -125,12 +138,15 @@ TEST_CASE("API Serialization and Deserialization") { Deserializer msgpack_deserializer{msgpack_data, 1}; auto check_metadata = [&](DatasetInfo const& info) { - CHECK(info.name() == "input"s); + CHECK(info.name() == + "input"s); // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 CHECK(info.is_batch() == is_batch); CHECK(info.batch_size() == batch_size); CHECK(info.n_components() == n_components); - CHECK(info.component_name(0) == "node"s); - CHECK(info.component_name(1) == "source"s); + CHECK(info.component_name(0) == + "node"s); // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 + CHECK(info.component_name(1) == + "source"s); // NOLINT(misc-include-cleaner) https://github.com/llvm/llvm-project/issues/98122 for (Idx const idx : {0, 1}) { CHECK(info.component_elements_per_scenario(idx) == elements_per_scenario[idx]); CHECK(info.component_total_elements(idx) == total_elements[idx]); diff --git a/tests/native_api_tests/test_api_utils.cpp b/tests/native_api_tests/test_api_utils.cpp index 2818b22b93..a7034bd34f 100644 --- a/tests/native_api_tests/test_api_utils.cpp +++ b/tests/native_api_tests/test_api_utils.cpp @@ -2,10 +2,14 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include #include +#include +#include + namespace power_grid_model_cpp { TEST_CASE("API Utils") { SUBCASE("NaN values and checks") { From 764373c0f30e57e3e13a9f05fb6e94f05e30ba1b Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 18:26:22 +0100 Subject: [PATCH 21/25] round 4 Signed-off-by: Nitish Bharambe --- power_grid_model_c/power_grid_model_c/src/model.cpp | 11 +++++------ tests/cpp_unit_tests/test_main_core_output.cpp | 4 ++-- tests/cpp_unit_tests/test_main_model_type.cpp | 11 ++++++++++- .../test_math_solver_pf_iterative_current.cpp | 2 +- tests/cpp_unit_tests/test_math_solver_pf_linear.cpp | 2 +- .../test_math_solver_pf_newton_raphson.cpp | 5 ++++- tests/cpp_unit_tests/test_math_solver_sc.cpp | 8 ++++++++ .../test_math_solver_se_iterative_linear.cpp | 1 + .../test_math_solver_se_newton_raphson.cpp | 1 + tests/cpp_unit_tests/test_measured_values.cpp | 12 +++++++++++- tests/cpp_unit_tests/test_meta_data_generation.cpp | 1 - tests/cpp_unit_tests/test_observability.cpp | 8 ++++---- tests/cpp_unit_tests/test_optimizer.cpp | 6 ++++++ tests/cpp_unit_tests/test_serializer.cpp | 2 -- tests/cpp_unit_tests/test_sparse_lu_solver.cpp | 8 ++++++++ tests/cpp_unit_tests/test_y_bus.cpp | 11 +++++++++++ 16 files changed, 73 insertions(+), 20 deletions(-) diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp index d20b76da84..8f51120ef8 100644 --- a/power_grid_model_c/power_grid_model_c/src/model.cpp +++ b/power_grid_model_c/power_grid_model_c/src/model.cpp @@ -5,6 +5,7 @@ #define PGM_DLL_EXPORTS #include "forward_declarations.hpp" +#include "power_grid_model_c/basics.h" #include "power_grid_model_c/model.h" #include "handle.hpp" @@ -12,18 +13,16 @@ #include "math_solver.hpp" #include "options.hpp" +#include +#include +#include +#include #include #include #include #include #include #include -#include - -#include -#include -#include -#include #include #include #include diff --git a/tests/cpp_unit_tests/test_main_core_output.cpp b/tests/cpp_unit_tests/test_main_core_output.cpp index 4226f35970..6b7b1008b4 100644 --- a/tests/cpp_unit_tests/test_main_core_output.cpp +++ b/tests/cpp_unit_tests/test_main_core_output.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: MPL-2.0 -#include -#include +#include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_main_model_type.cpp b/tests/cpp_unit_tests/test_main_model_type.cpp index 72ddd768b7..6f566b4156 100644 --- a/tests/cpp_unit_tests/test_main_model_type.cpp +++ b/tests/cpp_unit_tests/test_main_model_type.cpp @@ -2,15 +2,24 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include #include +#include #include #include #include #include -#include #include +#include +#include +#include +#include +#include +#include + namespace power_grid_model::main_core { namespace { diff --git a/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp b/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp index 2e84cdf957..f3969b6cfa 100644 --- a/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp +++ b/tests/cpp_unit_tests/test_math_solver_pf_iterative_current.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_pf.hpp" +#include "test_math_solver_pf.hpp" // NOLINT(misc-include-cleaner) #include #include diff --git a/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp b/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp index 9474fca47e..c305f29202 100644 --- a/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp +++ b/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_pf.hpp" +#include "test_math_solver_pf.hpp" // NOLINT(misc-include-cleaner) #include #include diff --git a/tests/cpp_unit_tests/test_math_solver_pf_newton_raphson.cpp b/tests/cpp_unit_tests/test_math_solver_pf_newton_raphson.cpp index 96d84ad4e0..8d765b67ee 100644 --- a/tests/cpp_unit_tests/test_math_solver_pf_newton_raphson.cpp +++ b/tests/cpp_unit_tests/test_math_solver_pf_newton_raphson.cpp @@ -2,8 +2,11 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_pf.hpp" +#include "test_math_solver_common.hpp" +#include "test_math_solver_pf.hpp" // NOLINT(misc-include-cleaner) +#include +#include #include #include diff --git a/tests/cpp_unit_tests/test_math_solver_sc.cpp b/tests/cpp_unit_tests/test_math_solver_sc.cpp index a8a2c0fd2e..dd0cc9a24b 100644 --- a/tests/cpp_unit_tests/test_math_solver_sc.cpp +++ b/tests/cpp_unit_tests/test_math_solver_sc.cpp @@ -4,10 +4,18 @@ #include "test_math_solver_common.hpp" +#include +#include +#include +#include +#include #include // NOLINT(misc-include-cleaner) +#include #include #include +#include +#include namespace power_grid_model::math_solver { diff --git a/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp b/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp index bcb7f6669b..917fd7541f 100644 --- a/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp +++ b/tests/cpp_unit_tests/test_math_solver_se_iterative_linear.cpp @@ -4,6 +4,7 @@ #include "test_math_solver_se.hpp" // NOLINT(misc-include-cleaner) +#include #include // NOLINT(misc-include-cleaner) #include diff --git a/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp b/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp index 244589cf1a..49aeecc76e 100644 --- a/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp +++ b/tests/cpp_unit_tests/test_math_solver_se_newton_raphson.cpp @@ -4,6 +4,7 @@ #include "test_math_solver_se.hpp" // NOLINT(misc-include-cleaner) +#include #include // NOLINT(misc-include-cleaner) #include diff --git a/tests/cpp_unit_tests/test_measured_values.cpp b/tests/cpp_unit_tests/test_measured_values.cpp index c083600efe..eca7bbe7a2 100644 --- a/tests/cpp_unit_tests/test_measured_values.cpp +++ b/tests/cpp_unit_tests/test_measured_values.cpp @@ -2,12 +2,22 @@ // // SPDX-License-Identifier: MPL-2.0 -#include +#include +#include #include +#include +#include +#include +#include +#include #include +#include +#include +#include + namespace power_grid_model::math_solver { namespace { template void check_close(auto const& x, auto const& y, auto const& tolerance) { diff --git a/tests/cpp_unit_tests/test_meta_data_generation.cpp b/tests/cpp_unit_tests/test_meta_data_generation.cpp index c116d3da05..77bd45a3c6 100644 --- a/tests/cpp_unit_tests/test_meta_data_generation.cpp +++ b/tests/cpp_unit_tests/test_meta_data_generation.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include diff --git a/tests/cpp_unit_tests/test_observability.cpp b/tests/cpp_unit_tests/test_observability.cpp index 37ea9d2bf6..1e2620ead1 100644 --- a/tests/cpp_unit_tests/test_observability.cpp +++ b/tests/cpp_unit_tests/test_observability.cpp @@ -7,20 +7,20 @@ #include #include #include -#include #include +#include #include #include -#include - #include #include #include +#include +#include #include #include -#include +#include #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_optimizer.cpp b/tests/cpp_unit_tests/test_optimizer.cpp index 8d9e1d08b7..df2c0a5ccb 100644 --- a/tests/cpp_unit_tests/test_optimizer.cpp +++ b/tests/cpp_unit_tests/test_optimizer.cpp @@ -4,9 +4,12 @@ #include "test_optimizer.hpp" +#include #include #include +#include #include +#include #include #include #include @@ -15,6 +18,9 @@ #include #include #include +#include + +#include namespace power_grid_model::optimizer::test { namespace { diff --git a/tests/cpp_unit_tests/test_serializer.cpp b/tests/cpp_unit_tests/test_serializer.cpp index 84eca413db..c723457422 100644 --- a/tests/cpp_unit_tests/test_serializer.cpp +++ b/tests/cpp_unit_tests/test_serializer.cpp @@ -3,10 +3,8 @@ // SPDX-License-Identifier: MPL-2.0 #include -#include #include #include -#include #include #include #include diff --git a/tests/cpp_unit_tests/test_sparse_lu_solver.cpp b/tests/cpp_unit_tests/test_sparse_lu_solver.cpp index d1915de718..0c3c4a8643 100644 --- a/tests/cpp_unit_tests/test_sparse_lu_solver.cpp +++ b/tests/cpp_unit_tests/test_sparse_lu_solver.cpp @@ -2,11 +2,19 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include #include #include #include +#include +#include +#include +#include +#include + namespace power_grid_model::math_solver { namespace { using lu_trait_double = math_solver::sparse_lu_entry_trait; diff --git a/tests/cpp_unit_tests/test_y_bus.cpp b/tests/cpp_unit_tests/test_y_bus.cpp index 0cc60aac6b..3794f6f883 100644 --- a/tests/cpp_unit_tests/test_y_bus.cpp +++ b/tests/cpp_unit_tests/test_y_bus.cpp @@ -2,12 +2,23 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include #include +#include +#include namespace power_grid_model { From 016087124fcc913a6b5c39b8f95a068ca41c9965 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 19:07:03 +0100 Subject: [PATCH 22/25] round 5 Signed-off-by: Nitish Bharambe --- tests/cpp_unit_tests/test_container.cpp | 5 +++ tests/cpp_unit_tests/test_index_mapping.cpp | 2 + tests/cpp_unit_tests/test_job_dispatch.cpp | 7 +++- tests/cpp_unit_tests/test_math_solver_sc.cpp | 2 + tests/cpp_unit_tests/test_optimizer.cpp | 1 + tests/cpp_unit_tests/test_sparse_ordering.cpp | 5 ++- .../test_tap_position_optimizer.cpp | 42 +++++++++++++++++++ tests/cpp_unit_tests/test_topology.cpp | 10 ++++- .../cpp_validation_tests/test_validation.cpp | 13 ++++-- 9 files changed, 80 insertions(+), 7 deletions(-) diff --git a/tests/cpp_unit_tests/test_container.cpp b/tests/cpp_unit_tests/test_container.cpp index 4c88332f48..58b10db4e3 100644 --- a/tests/cpp_unit_tests/test_container.cpp +++ b/tests/cpp_unit_tests/test_container.cpp @@ -4,10 +4,15 @@ #include #include +#include #include +#include #include +#include +#include + namespace power_grid_model { namespace { diff --git a/tests/cpp_unit_tests/test_index_mapping.cpp b/tests/cpp_unit_tests/test_index_mapping.cpp index fe33372cf0..252edca140 100644 --- a/tests/cpp_unit_tests/test_index_mapping.cpp +++ b/tests/cpp_unit_tests/test_index_mapping.cpp @@ -7,6 +7,8 @@ #include +#include + namespace power_grid_model { TEST_CASE("Test sparse mapping") { diff --git a/tests/cpp_unit_tests/test_job_dispatch.cpp b/tests/cpp_unit_tests/test_job_dispatch.cpp index 9daa00a861..d3b654b2b8 100644 --- a/tests/cpp_unit_tests/test_job_dispatch.cpp +++ b/tests/cpp_unit_tests/test_job_dispatch.cpp @@ -22,7 +22,11 @@ #include #include #include +#include +#include +#include #include +#include namespace power_grid_model { namespace { @@ -468,7 +472,8 @@ TEST_CASE("Test job dispatch logic") { } catch (BatchCalculationError const& e) { using namespace std::string_literals; REQUIRE(e.err_msgs().size() == 2); - CHECK(e.err_msgs() == std::vector{"Error in scenario 0"s, "Error in scenario 3"s}); + CHECK(e.err_msgs() == std::vector{"Error in scenario 0"s, + "Error in scenario 3"s}); // NOLINT(misc-include-cleaner) REQUIRE(e.failed_scenarios().size() == 2); CHECK(e.failed_scenarios() == std::vector{Idx{0}, Idx{3}}); throw; diff --git a/tests/cpp_unit_tests/test_math_solver_sc.cpp b/tests/cpp_unit_tests/test_math_solver_sc.cpp index dd0cc9a24b..b457240f4b 100644 --- a/tests/cpp_unit_tests/test_math_solver_sc.cpp +++ b/tests/cpp_unit_tests/test_math_solver_sc.cpp @@ -7,9 +7,11 @@ #include #include #include +#include #include #include #include // NOLINT(misc-include-cleaner) +#include #include #include diff --git a/tests/cpp_unit_tests/test_optimizer.cpp b/tests/cpp_unit_tests/test_optimizer.cpp index df2c0a5ccb..0deb456c34 100644 --- a/tests/cpp_unit_tests/test_optimizer.cpp +++ b/tests/cpp_unit_tests/test_optimizer.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_sparse_ordering.cpp b/tests/cpp_unit_tests/test_sparse_ordering.cpp index 0a5e2bccdb..214f89b944 100644 --- a/tests/cpp_unit_tests/test_sparse_ordering.cpp +++ b/tests/cpp_unit_tests/test_sparse_ordering.cpp @@ -2,13 +2,16 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include #include #include -#include #include +#include +#include +#include namespace { using power_grid_model::Idx; diff --git a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp index 6da2fdf3f3..50833f50ee 100644 --- a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp +++ b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp @@ -4,19 +4,61 @@ #include "test_optimizer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include #include +#include +#include +#include +#include + #include #include +#include #include +#include +#include #include +#include #include #include #include #include +#include +#include +#include TEST_SUITE_BEGIN("Automatic Tap Changer"); diff --git a/tests/cpp_unit_tests/test_topology.cpp b/tests/cpp_unit_tests/test_topology.cpp index 8f49428bc3..543412980a 100644 --- a/tests/cpp_unit_tests/test_topology.cpp +++ b/tests/cpp_unit_tests/test_topology.cpp @@ -2,11 +2,19 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include +#include #include #include -#include #include + +#include +#include +#include +#include + /* * [0] = Node / Bus * --0--> = Branch (from --id--> to) diff --git a/tests/cpp_validation_tests/test_validation.cpp b/tests/cpp_validation_tests/test_validation.cpp index fd59bba04f..b89aff81f0 100644 --- a/tests/cpp_validation_tests/test_validation.cpp +++ b/tests/cpp_validation_tests/test_validation.cpp @@ -4,6 +4,7 @@ #define PGM_ENABLE_EXPERIMENTAL +#include #include #include #include @@ -16,6 +17,7 @@ #include #include +#include #include #include @@ -23,19 +25,22 @@ #include #include #include +#include #include #include #include +#include #include #include -#include -#include +#include #include #include #include -#include #include +#include #include +#include +#include namespace power_grid_model_cpp { namespace { @@ -359,7 +364,7 @@ void assert_result(OwningDataset const& owning_result, OwningDataset const& owni auto attribute_type = MetaData::attribute_ctype(attribute_meta); auto const& attribute_name = MetaData::attribute_name(attribute_meta); // TODO need a way for common angle: u angle skipped for now - if (attribute_name == "u_angle"s) { + if (attribute_name == "u_angle"s) { // NOLINT(misc-include-cleaner) continue; } // get absolute tolerance From c8ac05d59a10d628e1a0f3c089308a30afb4e705 Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 20:53:26 +0100 Subject: [PATCH 23/25] round 6 Signed-off-by: Nitish Bharambe --- power_grid_model_c/power_grid_model_c/src/model.cpp | 2 +- tests/cpp_unit_tests/test_calculation_preparation.cpp | 4 ++++ tests/cpp_unit_tests/test_container.cpp | 1 + tests/cpp_unit_tests/test_job_dispatch.cpp | 2 +- tests/cpp_unit_tests/test_observability.cpp | 7 +++++-- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp index 8f51120ef8..1202e592dc 100644 --- a/power_grid_model_c/power_grid_model_c/src/model.cpp +++ b/power_grid_model_c/power_grid_model_c/src/model.cpp @@ -11,7 +11,7 @@ #include "handle.hpp" #include "input_sanitization.hpp" #include "math_solver.hpp" -#include "options.hpp" +#include "options.hpp" // NOLINT(misc-include-cleaner) #include #include diff --git a/tests/cpp_unit_tests/test_calculation_preparation.cpp b/tests/cpp_unit_tests/test_calculation_preparation.cpp index 92b9645657..2ec7aaa2f0 100644 --- a/tests/cpp_unit_tests/test_calculation_preparation.cpp +++ b/tests/cpp_unit_tests/test_calculation_preparation.cpp @@ -4,11 +4,15 @@ #include #include +#include #include #include +#include #include +#include + namespace power_grid_model { namespace { using MainModelType = main_core::MainModelType; diff --git a/tests/cpp_unit_tests/test_container.cpp b/tests/cpp_unit_tests/test_container.cpp index 58b10db4e3..ab86781898 100644 --- a/tests/cpp_unit_tests/test_container.cpp +++ b/tests/cpp_unit_tests/test_container.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_job_dispatch.cpp b/tests/cpp_unit_tests/test_job_dispatch.cpp index d3b654b2b8..bf61383277 100644 --- a/tests/cpp_unit_tests/test_job_dispatch.cpp +++ b/tests/cpp_unit_tests/test_job_dispatch.cpp @@ -472,7 +472,7 @@ TEST_CASE("Test job dispatch logic") { } catch (BatchCalculationError const& e) { using namespace std::string_literals; REQUIRE(e.err_msgs().size() == 2); - CHECK(e.err_msgs() == std::vector{"Error in scenario 0"s, + CHECK(e.err_msgs() == std::vector{"Error in scenario 0"s, // NOLINT(misc-include-cleaner) "Error in scenario 3"s}); // NOLINT(misc-include-cleaner) REQUIRE(e.failed_scenarios().size() == 2); CHECK(e.failed_scenarios() == std::vector{Idx{0}, Idx{3}}); diff --git a/tests/cpp_unit_tests/test_observability.cpp b/tests/cpp_unit_tests/test_observability.cpp index 1e2620ead1..bed34ea096 100644 --- a/tests/cpp_unit_tests/test_observability.cpp +++ b/tests/cpp_unit_tests/test_observability.cpp @@ -810,8 +810,11 @@ TEST_CASE("Test Observability - assign_independent_sensors_radial") { // Total sensors should be preserved (just reassigned) Idx const initial_total = 2; // We started with 1 flow + 1 voltage = 2 total - Idx const final_flow = std::ranges::fold_left(flow_sensors, 0, std::plus<>{}); - Idx const final_voltage = std::ranges::fold_left(voltage_phasor_sensors, 0, std::plus<>{}); + Idx const final_flow = + std::ranges::fold_left( // NOLINT (misc-include-cleaner) https://github.com/llvm/llvm-project/issues/94459 + flow_sensors, 0, std::plus<>{}); + Idx const final_voltage = + std::ranges::fold_left(voltage_phasor_sensors, 0, std::plus<>{}); // NOLINT (misc-include-cleaner) CHECK(final_flow + final_voltage <= initial_total); // Some sensors might be reassigned or removed } From 5ea9b17dd1fb9451905bee705d81c06a675e4c3f Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 22:31:22 +0100 Subject: [PATCH 24/25] final includes Signed-off-by: Nitish Bharambe --- .../include/power_grid_model/common/timer.hpp | 1 + .../include/power_grid_model/main_core/output.hpp | 1 + .../power_grid_model_c/src/dataset_definitions.cpp | 2 +- tests/cpp_unit_tests/test_calculation_info.cpp | 5 +++++ tests/cpp_unit_tests/test_job_dispatch.cpp | 3 --- tests/cpp_unit_tests/test_sparse_lu_solver.cpp | 1 - tests/cpp_unit_tests/test_tap_position_optimizer.cpp | 1 + tests/cpp_unit_tests/test_timer.cpp | 8 ++++++-- tests/cpp_unit_tests/test_voltage_regulator.cpp | 12 ++++++++++++ 9 files changed, 27 insertions(+), 7 deletions(-) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp index 32a6f7dc0f..48ec0363ac 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp @@ -9,6 +9,7 @@ #include #include +#include namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp index 2152c5ac31..6532833fa0 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp @@ -15,6 +15,7 @@ #include "../component/shunt.hpp" #include "../component/source.hpp" #include "../component/transformer_tap_regulator.hpp" +#include "../component/voltage_regulator.hpp" #include "../component/voltage_sensor.hpp" #include "container_queries.hpp" #include "state.hpp" diff --git a/power_grid_model_c/power_grid_model_c/src/dataset_definitions.cpp b/power_grid_model_c/power_grid_model_c/src/dataset_definitions.cpp index a74dc702e2..2e99159faa 100644 --- a/power_grid_model_c/power_grid_model_c/src/dataset_definitions.cpp +++ b/power_grid_model_c/power_grid_model_c/src/dataset_definitions.cpp @@ -7,7 +7,7 @@ // clang-format off #define PGM_DLL_EXPORTS -#include "forward_declarations.hpp" +#include "power_grid_model_c/basics.h" #include "power_grid_model_c/dataset_definitions.h" #include "power_grid_model_c/meta_data.h" diff --git a/tests/cpp_unit_tests/test_calculation_info.cpp b/tests/cpp_unit_tests/test_calculation_info.cpp index 11e5a13211..53b0d8e295 100644 --- a/tests/cpp_unit_tests/test_calculation_info.cpp +++ b/tests/cpp_unit_tests/test_calculation_info.cpp @@ -3,10 +3,15 @@ // SPDX-License-Identifier: MPL-2.0 #include +#include #include +#include +#include +#include #include #include +#include #include diff --git a/tests/cpp_unit_tests/test_job_dispatch.cpp b/tests/cpp_unit_tests/test_job_dispatch.cpp index c487243f67..5b6f65b794 100644 --- a/tests/cpp_unit_tests/test_job_dispatch.cpp +++ b/tests/cpp_unit_tests/test_job_dispatch.cpp @@ -15,17 +15,14 @@ #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_sparse_lu_solver.cpp b/tests/cpp_unit_tests/test_sparse_lu_solver.cpp index 70da575ed8..05de78c199 100644 --- a/tests/cpp_unit_tests/test_sparse_lu_solver.cpp +++ b/tests/cpp_unit_tests/test_sparse_lu_solver.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp index d3c5880b7b..1ba728d674 100644 --- a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp +++ b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/cpp_unit_tests/test_timer.cpp b/tests/cpp_unit_tests/test_timer.cpp index 9a554afaab..b39e3cc1c0 100644 --- a/tests/cpp_unit_tests/test_timer.cpp +++ b/tests/cpp_unit_tests/test_timer.cpp @@ -2,13 +2,17 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include -#include #include +#include #include +#include #include -#include +#include +#include +#include #include diff --git a/tests/cpp_unit_tests/test_voltage_regulator.cpp b/tests/cpp_unit_tests/test_voltage_regulator.cpp index e7c98c9d6b..ed3fffca27 100644 --- a/tests/cpp_unit_tests/test_voltage_regulator.cpp +++ b/tests/cpp_unit_tests/test_voltage_regulator.cpp @@ -2,10 +2,22 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include + namespace power_grid_model { namespace { From eec172bdb2c999232fec4ddbdeb7b8e68ecceffa Mon Sep 17 00:00:00 2001 From: Nitish Bharambe Date: Mon, 2 Feb 2026 23:55:31 +0100 Subject: [PATCH 25/25] final includes 2 Signed-off-by: Nitish Bharambe --- .../include/power_grid_model/auxiliary/dataset.hpp | 1 - .../include/power_grid_model/auxiliary/output.hpp | 2 -- .../power_grid_model/include/power_grid_model/common/timer.hpp | 2 -- .../include/power_grid_model/component/transformer.hpp | 1 - .../include/power_grid_model/main_core/output.hpp | 2 -- 5 files changed, 8 deletions(-) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp index 231bd7b519..afea7d2cc7 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp @@ -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" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp index 8dffdf1117..478e7560ae 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp @@ -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 { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp index 48ec0363ac..9e8a7e484a 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp @@ -4,11 +4,9 @@ #pragma once -#include "common.hpp" #include "logging.hpp" #include -#include #include namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp index 8d0d9f984f..5ac0529bb1 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp @@ -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" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp index 6532833fa0..93f006d663 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp @@ -21,8 +21,6 @@ #include "state.hpp" #include "state_queries.hpp" -#include "../component/component.hpp" - #include namespace power_grid_model::main_core {