diff --git a/.clang-tidy b/.clang-tidy index b493ce3eed..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: ' -*, @@ -44,7 +47,6 @@ google-*, -google-default-arguments, misc-*, -misc-confusable-identifiers, --misc-include-cleaner, -misc-no-recursion, -misc-non-private-member-variables-in-classes, modernize-*, @@ -68,8 +70,10 @@ readability-*, WarningsAsErrors: '*' - HeaderFilterRegex: '.*' FormatStyle: file + +CheckOptions: + misc-include-cleaner.IgnoreHeaders : 'Eigen/.*' ... diff --git a/.clangd b/.clangd new file mode 100644 index 0000000000..1a309413eb --- /dev/null +++ b/.clangd @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: Contributors to the Power Grid Model project + +# + +# SPDX-License-Identifier: MPL-2.0 + +CompileFlags: + CompilationDatabase: . \ No newline at end of file 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 9b4cad40ef..8e7039a3d1 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,7 +5,6 @@ #pragma once // define all components -#include "common/common.hpp" #include "common/component_list.hpp" // component include #include "component/appliance.hpp" 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..1530e2afab 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,10 +10,10 @@ #include "meta_data.hpp" #include "../common/common.hpp" -#include "../common/counting_iterator.hpp" #include "../common/exception.hpp" #include "../common/iterator_facade.hpp" +#include #include #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp index e52ef9fb72..76c7356eba 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp @@ -7,8 +7,6 @@ // clang-format off #pragma once -#include "meta_data.hpp" - #include "../common/common.hpp" #include "../common/enum.hpp" #include "../common/three_phase_tensor.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp index 7c72b8208f..c893789470 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp @@ -10,8 +10,6 @@ #include "gen_getters.hpp" // NOLINT #include "../../common/common.hpp" // NOLINT -#include "../../common/enum.hpp" // NOLINT -#include "../../common/three_phase_tensor.hpp" // NOLINT #include "../meta_data.hpp" // NOLINT #include "../input.hpp" // NOLINT diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp index 54f455ed93..94de42efa6 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp @@ -10,8 +10,6 @@ #include "gen_getters.hpp" // NOLINT #include "../../common/common.hpp" // NOLINT -#include "../../common/enum.hpp" // NOLINT -#include "../../common/three_phase_tensor.hpp" // NOLINT #include "../meta_data.hpp" // NOLINT #include "../output.hpp" // NOLINT diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp index e93739edf4..c11a27752b 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp @@ -10,8 +10,6 @@ #include "gen_getters.hpp" // NOLINT #include "../../common/common.hpp" // NOLINT -#include "../../common/enum.hpp" // NOLINT -#include "../../common/three_phase_tensor.hpp" // NOLINT #include "../meta_data.hpp" // NOLINT #include "../update.hpp" // NOLINT 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/auxiliary/serialization/common.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/common.hpp index 6910d818fc..7fae7d8d6a 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/common.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/common.hpp @@ -7,7 +7,6 @@ #include "../dataset.hpp" #include -#include #include namespace power_grid_model::meta_data::detail { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp index 471e6d6376..2f484efee2 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp @@ -11,9 +11,8 @@ #include "../dataset.hpp" #include "../meta_data.hpp" -#include - #include +#include #include #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp index c1314481de..281654bfd3 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp @@ -7,8 +7,6 @@ // clang-format off #pragma once -#include "meta_data.hpp" - #include "../common/common.hpp" #include "../common/enum.hpp" #include "../common/three_phase_tensor.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_preparation.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_preparation.hpp index efcaf9e9f9..30e589bfa5 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_preparation.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_preparation.hpp @@ -4,16 +4,14 @@ #pragma once +#include "main_core/topology.hpp" +#include "main_core/y_bus.hpp" +#include "math_solver/math_solver_dispatch.hpp" #include "topology.hpp" #include "common/common.hpp" - -#include "math_solver/math_solver_dispatch.hpp" - #include "main_core/main_model_type.hpp" #include "main_core/math_state.hpp" -#include "main_core/topology.hpp" -#include "main_core/y_bus.hpp" namespace power_grid_model { struct SolverPreparationContext { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/dummy_logging.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/dummy_logging.hpp index ca9bdf5eb0..7d2d40b9b2 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/dummy_logging.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/dummy_logging.hpp @@ -7,7 +7,6 @@ #include "logging.hpp" #include -#include namespace power_grid_model::common::logging { class NoLogger : public Logger { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp index 718dba2a0f..f0b4f0e42d 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/iterator_facade.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/iterator_facade.hpp index 8d83357a75..5b8110abba 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/iterator_facade.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/iterator_facade.hpp @@ -4,10 +4,7 @@ #pragma once -#include "common.hpp" - #include -#include #include namespace power_grid_model { 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 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..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,10 @@ #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/asym_line.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/asym_line.hpp index 81534b5faa..2239b6b63e 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/asym_line.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/asym_line.hpp @@ -8,15 +8,12 @@ #include "line_utils.hpp" #include "../auxiliary/input.hpp" -#include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/matrix_utils.hpp" #include "../common/three_phase_tensor.hpp" -#include - namespace power_grid_model { class AsymLine : public Branch { 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..ba51de4d90 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 @@ -4,8 +4,6 @@ #pragma once -#include "component.hpp" - #include "../auxiliary/input.hpp" #include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" @@ -13,6 +11,7 @@ #include "../common/enum.hpp" namespace power_grid_model { + constexpr IntS status_to_int(bool status) { return status ? IntS{1} : IntS{0}; } class Base { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp index 39c21722b9..c223de11ea 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp @@ -13,6 +13,7 @@ #include "../common/common.hpp" #include "../common/exception.hpp" #include "../common/three_phase_tensor.hpp" +#include "component.hpp" namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp index c46f6e265a..fc218e330d 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp @@ -5,6 +5,7 @@ #pragma once #include "base.hpp" +#include "component.hpp" #include "../auxiliary/input.hpp" #include "../auxiliary/output.hpp" 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..93841fb26c 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 @@ -36,4 +36,59 @@ 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); + +// Forward declarations of all components +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; +class VoltageRegulator; + } // 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..1051fcbe3c 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 @@ -11,6 +11,7 @@ #include "../common/enum.hpp" #include "../common/exception.hpp" #include "../common/statistics.hpp" +#include "component.hpp" namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp index 5949c6b392..304ded14c0 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp @@ -5,6 +5,7 @@ #pragma once #include "base.hpp" +#include "component.hpp" #include "../auxiliary/input.hpp" #include "../auxiliary/output.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/generic_branch.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/generic_branch.hpp index 09172a73e7..f4e9510d6c 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/generic_branch.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/generic_branch.hpp @@ -7,12 +7,10 @@ #include "branch.hpp" #include "../auxiliary/input.hpp" -#include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/exception.hpp" -#include "../common/three_phase_tensor.hpp" /* generic Branch: either a line N = 1 or a transformer N = t*e^(j*theta) diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp index de65dd485c..912e5f7fab 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp @@ -7,7 +7,6 @@ #include "branch.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/component/link.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp index 291895f66c..abd9e645b8 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp @@ -7,12 +7,9 @@ #include "branch.hpp" #include "../auxiliary/input.hpp" -#include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" #include "../calculation_parameters.hpp" #include "../common/common.hpp" -#include "../common/exception.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/component/load_gen.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp index b00a0c0431..8216bdf0f9 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,30 +5,17 @@ #pragma once #include "appliance.hpp" -#include "base.hpp" #include "../auxiliary/input.hpp" -#include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/exception.hpp" #include "../common/three_phase_tensor.hpp" +#include "component.hpp" 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; diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp index ec87b476a4..1e93f649c4 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp @@ -9,9 +9,9 @@ #include "../auxiliary/input.hpp" #include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" -#include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/three_phase_tensor.hpp" +#include "component.hpp" 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..f14d208ba7 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 @@ -9,7 +9,7 @@ #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/enum.hpp" -#include "../common/exception.hpp" +#include "component.hpp" namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp index 5425d5eb4d..068811014a 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp @@ -8,10 +8,7 @@ #include "../auxiliary/input.hpp" #include "../auxiliary/output.hpp" -#include "../auxiliary/update.hpp" -#include "../calculation_parameters.hpp" #include "../common/common.hpp" -#include "../common/exception.hpp" 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..014a9b4fe0 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,14 +5,13 @@ #pragma once #include "appliance.hpp" -#include "base.hpp" #include "../auxiliary/input.hpp" -#include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/three_phase_tensor.hpp" +#include "component.hpp" namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp index e1de07e5d1..78d9e40f99 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp @@ -8,11 +8,11 @@ #include "base.hpp" #include "../auxiliary/input.hpp" -#include "../auxiliary/output.hpp" #include "../auxiliary/update.hpp" #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/three_phase_tensor.hpp" +#include "component.hpp" namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp index e7ebf52037..ddee33e072 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp @@ -8,6 +8,8 @@ #include "transformer.hpp" #include "transformer_utils.hpp" +#include "component.hpp" + namespace power_grid_model { class ThreeWindingTransformer : public Branch3 { 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/component/transformer_tap_regulator.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp index c16f8d0ff8..0a05b71ec8 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,7 @@ #pragma once -#include "base.hpp" +#include "component.hpp" #include "regulator.hpp" #include "../auxiliary/input.hpp" diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp index 8e06450267..5eb387e399 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp @@ -6,6 +6,7 @@ #include "../common/common.hpp" #include "../common/enum.hpp" +#include "component.hpp" namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_regulator.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_regulator.hpp index 732cd0e2d1..99f74139eb 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_regulator.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_regulator.hpp @@ -4,7 +4,6 @@ #pragma once -#include "base.hpp" #include "regulator.hpp" #include "../auxiliary/input.hpp" @@ -12,7 +11,7 @@ #include "../auxiliary/update.hpp" #include "../calculation_parameters.hpp" #include "../common/common.hpp" -#include +#include "component.hpp" 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 5bb67c0e51..b9fe91c756 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 @@ -8,8 +8,8 @@ #include "../calculation_parameters.hpp" #include "../common/common.hpp" -#include "../common/exception.hpp" #include "../common/three_phase_tensor.hpp" +#include "component.hpp" #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp index 757c98e2a0..695c65fb24 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp @@ -10,15 +10,11 @@ #include "common/component_list.hpp" #include "common/exception.hpp" #include "common/iterator_facade.hpp" -#include "container_fwd.hpp" #include #include #include -#include -#include #include -#include #include namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp index 6d023ea385..02eb9f7d57 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp @@ -8,7 +8,6 @@ #include "common/grouped_index_vector.hpp" #include -#include namespace power_grid_model { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/job_interface.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/job_interface.hpp index 1e2d92234d..13fb1ed2cc 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/job_interface.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/job_interface.hpp @@ -10,7 +10,6 @@ #include "common/logging.hpp" #include -#include #include 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 fd31acfe76..35392f9ff0 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 @@ -4,9 +4,15 @@ #pragma once -#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 ac4312108f..baf7f3aec1 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,8 +4,11 @@ #pragma once -#include "../all_components.hpp" -#include "../container.hpp" +#include "../component/base.hpp" +#include "../component/branch.hpp" +#include "../component/branch3.hpp" +#include "../component/regulator.hpp" +#include "../container_fwd.hpp" namespace power_grid_model::main_core { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/core_utils.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/core_utils.hpp index cb7872dcde..4bbdbadef7 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/core_utils.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/core_utils.hpp @@ -4,8 +4,10 @@ #pragma once +#include "../common/common.hpp" + #include -#include + namespace power_grid_model::main_core::utils { namespace detail { 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 7ecd4641fc..30d86b56f1 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,27 @@ #pragma once -#include "../all_components.hpp" -#include "../common/iterator_facade.hpp" +#include "../component/appliance.hpp" +#include "../component/asym_line.hpp" +#include "../component/base.hpp" +#include "../component/branch.hpp" +#include "../component/branch3.hpp" +#include "../component/current_sensor.hpp" +#include "../component/fault.hpp" +#include "../component/line.hpp" +#include "../component/link.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/three_winding_transformer.hpp" +#include "../component/transformer.hpp" +#include "../component/transformer_tap_regulator.hpp" +#include "../component/voltage_regulator.hpp" +#include "../component/voltage_sensor.hpp" +#include "../container_fwd.hpp" +#include "../main_core/container_queries.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 7e98b53d80..8c1c0fd0c7 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 f9fba5b078..cac150a08c 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,19 @@ #include "state.hpp" #include "state_queries.hpp" -#include "../all_components.hpp" +#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_regulator.hpp" +#include "../component/voltage_sensor.hpp" #include @@ -115,14 +127,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.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp index ed8a6a0b8f..5a10e7c721 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp @@ -5,7 +5,7 @@ #pragma once #include "../calculation_parameters.hpp" -#include "../container.hpp" +#include "../container_fwd.hpp" #include 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..b3f80f3fdc 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 "../all_components.hpp" +#include "../component/branch.hpp" +#include "../component/branch3.hpp" +#include "../component/node.hpp" +#include "../component/regulator.hpp" +#include "../component/transformer_utils.hpp" namespace power_grid_model::main_core { 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 84bff621ea..d868121e1d 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 @@ -5,8 +5,18 @@ #pragma once #include "container_queries.hpp" - -#include "../all_components.hpp" +#include "core_utils.hpp" + +#include "../component/branch.hpp" +#include "../component/branch3.hpp" +#include "../component/current_sensor.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 9554343151..14cefbf0b0 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,12 +7,8 @@ #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 +#include "../component/component.hpp" namespace power_grid_model::main_core::update { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/y_bus.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/y_bus.hpp index 183abcfd9f..b1811ecedf 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/y_bus.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/y_bus.hpp @@ -4,7 +4,11 @@ #pragma once +#include "container_queries.hpp" +#include "state.hpp" + #include "../common/common.hpp" +#include "math_state.hpp" namespace power_grid_model::main_core { constexpr Idx isolated_component{-1}; 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 a50155f9c3..94a1f133aa 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_fwd.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_fwd.hpp index 907bdd4f40..be02d6b485 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_fwd.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_fwd.hpp @@ -5,6 +5,7 @@ #pragma once #include "common/common.hpp" +#include "common/enum.hpp" namespace power_grid_model { 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 89b5bba884..b17ff27b0c 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 @@ -7,12 +7,9 @@ // main model class // main include -#include "batch_parameter.hpp" #include "calculation_parameters.hpp" #include "calculation_preparation.hpp" -#include "container.hpp" #include "main_model_fwd.hpp" -#include "topology.hpp" // common #include "common/common.hpp" @@ -20,10 +17,8 @@ #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 8b3d39c94e..d3d48b1255 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 @@ -52,7 +52,6 @@ Iterative Power Flow */ -#include "block_matrix.hpp" #include "common_solver_functions.hpp" #include "iterative_pf_solver.hpp" #include "sparse_lu_solver.hpp" @@ -62,7 +61,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/iterative_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp index d149a3e9cf..c74dabdf9a 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp @@ -15,7 +15,6 @@ #include "../calculation_parameters.hpp" #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 6a6a28301b..cf6b6bdcd7 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.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp index 1fdb6696dc..3bb1107827 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp @@ -16,7 +16,6 @@ #include "../calculation_parameters.hpp" #include "../common/common.hpp" #include "../common/exception.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/math_solver_dispatch.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp index 37569de4a5..ed68994965 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,7 @@ #include "../calculation_parameters.hpp" #include "../common/common.hpp" -#include "../common/exception.hpp" -#include "../common/three_phase_tensor.hpp" -#include "../common/timer.hpp" +#include "../common/logging.hpp" #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp index 485c558760..bb9b232d41 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp @@ -12,8 +12,6 @@ Collect all measured Values #include "../common/exception.hpp" #include "../common/three_phase_tensor.hpp" -#include - namespace power_grid_model::math_solver { // processed measurement struct // combined all measurement of the same quantity 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 9e53072c9e..ef62038aed 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,9 +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" - -#include namespace power_grid_model::math_solver { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp index 8a86af9289..6e538e4ab4 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp @@ -9,7 +9,6 @@ #include "../common/three_phase_tensor.hpp" #include "../common/typing.hpp" -#include #include #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/optimizer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/optimizer.hpp index a6fc278ce4..8f7ba8a366 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/optimizer.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/optimizer.hpp @@ -7,10 +7,10 @@ #include "base_optimizer.hpp" #include "tap_position_optimizer.hpp" +#include "../auxiliary/dataset.hpp" #include "../auxiliary/meta_data.hpp" #include "../common/enum.hpp" - -#include +#include "../component/transformer_tap_regulator.hpp" namespace power_grid_model::optimizer { diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp index 9f06ac7497..565107a5c1 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp @@ -6,16 +6,18 @@ #include "base_optimizer.hpp" -#include "../all_components.hpp" #include "../auxiliary/dataset.hpp" -#include "../auxiliary/meta_gen/update.hpp" #include "../common/enum.hpp" #include "../common/exception.hpp" +#include "../component/line.hpp" +#include "../component/link.hpp" +#include "../component/node.hpp" +#include "../component/source.hpp" #include "../component/three_winding_transformer.hpp" #include "../component/transformer.hpp" #include "../component/transformer_tap_regulator.hpp" +#include "../container.hpp" #include "../main_core/container_queries.hpp" -#include "../main_core/output.hpp" #include "../main_core/state_queries.hpp" #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/sparse_ordering.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/sparse_ordering.hpp index 88e4899b13..8b6a7ae937 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/sparse_ordering.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/sparse_ordering.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp index 46e9cca492..d63f200c35 100644 --- a/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp +++ b/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp @@ -7,7 +7,6 @@ #include "calculation_parameters.hpp" #include "common/common.hpp" #include "common/enum.hpp" -#include "common/exception.hpp" #include "index_mapping.hpp" #include "sparse_ordering.hpp" 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 bc98817543..d22eed4414 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,14 +5,18 @@ #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" #include "input_sanitization.hpp" #include +#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 2b59243a6d..0bc93b6bc7 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,7 +14,8 @@ #include #include -#include + +#include namespace { using namespace power_grid_model; 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/power_grid_model_c/power_grid_model_c/src/get_meta_data.hpp b/power_grid_model_c/power_grid_model_c/src/get_meta_data.hpp index 6eb3a46c20..45655bc65b 100644 --- a/power_grid_model_c/power_grid_model_c/src/get_meta_data.hpp +++ b/power_grid_model_c/power_grid_model_c/src/get_meta_data.hpp @@ -8,8 +8,6 @@ #define PGM_DLL_EXPORTS #endif -#include "forward_declarations.hpp" - #include power_grid_model::meta_data::MetaData const& get_meta_data(); 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..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 @@ -3,15 +3,15 @@ // SPDX-License-Identifier: MPL-2.0 #define PGM_DLL_EXPORTS -#include "forward_declarations.hpp" #include "power_grid_model_c/handle.h" +#include "power_grid_model_c/basics.h" #include "handle.hpp" #include "input_sanitization.hpp" #include -#include +#include namespace { using namespace power_grid_model; diff --git a/power_grid_model_c/power_grid_model_c/src/handle.hpp b/power_grid_model_c/power_grid_model_c/src/handle.hpp index b3c4f9a0ac..091a8dea6e 100644 --- a/power_grid_model_c/power_grid_model_c/src/handle.hpp +++ b/power_grid_model_c/power_grid_model_c/src/handle.hpp @@ -8,9 +8,7 @@ #define PGM_DLL_EXPORTS #endif -#include "forward_declarations.hpp" - -#include "power_grid_model_c/handle.h" +#include "power_grid_model_c/basics.h" #include #include 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/power_grid_model_c/src/math_solver.hpp b/power_grid_model_c/power_grid_model_c/src/math_solver.hpp index eae90ec1a7..2ef090134d 100644 --- a/power_grid_model_c/power_grid_model_c/src/math_solver.hpp +++ b/power_grid_model_c/power_grid_model_c/src/math_solver.hpp @@ -8,8 +8,6 @@ #define PGM_DLL_EXPORTS #endif -#include "forward_declarations.hpp" - #include namespace power_grid_model_c { 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 0a698b6dae..b537eb1f90 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,16 @@ #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 38e4f654f5..3427ef7227 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,19 +5,27 @@ #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" #include "input_sanitization.hpp" #include "math_solver.hpp" -#include "options.hpp" +#include "options.hpp" // NOLINT(misc-include-cleaner) +#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..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,9 +3,9 @@ // SPDX-License-Identifier: MPL-2.0 #define PGM_DLL_EXPORTS -#include "forward_declarations.hpp" #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/options.hpp b/power_grid_model_c/power_grid_model_c/src/options.hpp index 37da22cb77..6df6fd5783 100644 --- a/power_grid_model_c/power_grid_model_c/src/options.hpp +++ b/power_grid_model_c/power_grid_model_c/src/options.hpp @@ -8,9 +8,7 @@ #define PGM_DLL_EXPORTS #endif -#include "forward_declarations.hpp" - -#include "power_grid_model_c/options.h" +#include "power_grid_model_c/basics.h" #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 a98ffd87a4..61e5125f9b 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 @@ -5,17 +5,19 @@ #define PGM_DLL_EXPORTS #include "forward_declarations.hpp" +#include "power_grid_model_c/basics.h" #include "power_grid_model_c/serialization.h" #include "get_meta_data.hpp" #include "handle.hpp" #include "input_sanitization.hpp" -#include "power_grid_model_c/basics.h" -#include "power_grid_model_c/handle.h" - #include #include +#include + +#include +#include namespace { using namespace power_grid_model::meta_data; 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_all_components.cpp b/tests/cpp_unit_tests/test_all_components.cpp index b98913bdd1..c792df0e2e 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 #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 a9b0dc9f0a..e1ff1a6828 100644 --- a/tests/cpp_unit_tests/test_asym_line.cpp +++ b/tests/cpp_unit_tests/test_asym_line.cpp @@ -4,8 +4,23 @@ #include +#include +#include +#include +#include +#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_calculation_info.cpp b/tests/cpp_unit_tests/test_calculation_info.cpp index 11e5a13211..edb93dbc83 100644 --- a/tests/cpp_unit_tests/test_calculation_info.cpp +++ b/tests/cpp_unit_tests/test_calculation_info.cpp @@ -3,12 +3,18 @@ // SPDX-License-Identifier: MPL-2.0 #include + +#include #include +#include +#include + +#include +#include #include #include - -#include +#include namespace power_grid_model::common::logging { namespace { diff --git a/tests/cpp_unit_tests/test_calculation_preparation.cpp b/tests/cpp_unit_tests/test_calculation_preparation.cpp index d9230d1f6d..8e19e5d190 100644 --- a/tests/cpp_unit_tests/test_calculation_preparation.cpp +++ b/tests/cpp_unit_tests/test_calculation_preparation.cpp @@ -3,12 +3,17 @@ // SPDX-License-Identifier: MPL-2.0 #include + +#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_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_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_container.cpp b/tests/cpp_unit_tests/test_container.cpp index 386faeadbb..2f618ac16e 100644 --- a/tests/cpp_unit_tests/test_container.cpp +++ b/tests/cpp_unit_tests/test_container.cpp @@ -2,10 +2,18 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include +#include #include +#include #include +#include +#include +#include + namespace power_grid_model { namespace { diff --git a/tests/cpp_unit_tests/test_current_sensor.cpp b/tests/cpp_unit_tests/test_current_sensor.cpp index 78b7dd770b..5b368daccd 100644 --- a/tests/cpp_unit_tests/test_current_sensor.cpp +++ b/tests/cpp_unit_tests/test_current_sensor.cpp @@ -4,8 +4,24 @@ #include +#include +#include +#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_dataset.cpp b/tests/cpp_unit_tests/test_dataset.cpp index f1eee01d24..af757908f9 100644 --- a/tests/cpp_unit_tests/test_dataset.cpp +++ b/tests/cpp_unit_tests/test_dataset.cpp @@ -5,13 +5,25 @@ #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_deserializer.cpp b/tests/cpp_unit_tests/test_deserializer.cpp index b521b3ca3a..0fa68bd394 100644 --- a/tests/cpp_unit_tests/test_deserializer.cpp +++ b/tests/cpp_unit_tests/test_deserializer.cpp @@ -6,9 +6,10 @@ // May be a Clang Analyzer bug #ifndef __clang_analyzer__ // TODO(mgovers): re-enable this when issue in msgpack is fixed +#include + #include #include -#include #include #include 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_fault.cpp b/tests/cpp_unit_tests/test_fault.cpp index b1e89c99a1..859ead04ef 100644 --- a/tests/cpp_unit_tests/test_fault.cpp +++ b/tests/cpp_unit_tests/test_fault.cpp @@ -4,8 +4,22 @@ #include +#include +#include +#include +#include +#include +#include +#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..144424c0ed 100644 --- a/tests/cpp_unit_tests/test_generic_branch.cpp +++ b/tests/cpp_unit_tests/test_generic_branch.cpp @@ -3,10 +3,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_grouped_index_vector.cpp b/tests/cpp_unit_tests/test_grouped_index_vector.cpp index 13c01e3a04..52024a55f3 100644 --- a/tests/cpp_unit_tests/test_grouped_index_vector.cpp +++ b/tests/cpp_unit_tests/test_grouped_index_vector.cpp @@ -2,10 +2,18 @@ // // 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_index_mapping.cpp b/tests/cpp_unit_tests/test_index_mapping.cpp index b5ef6cba6b..4529a3669f 100644 --- a/tests/cpp_unit_tests/test_index_mapping.cpp +++ b/tests/cpp_unit_tests/test_index_mapping.cpp @@ -4,8 +4,12 @@ #include +#include + #include +#include + namespace power_grid_model { TEST_CASE("Test sparse mapping") { diff --git a/tests/cpp_unit_tests/test_iterator_facade.cpp b/tests/cpp_unit_tests/test_iterator_facade.cpp index 2cceab950e..404056025f 100644 --- a/tests/cpp_unit_tests/test_iterator_facade.cpp +++ b/tests/cpp_unit_tests/test_iterator_facade.cpp @@ -5,9 +5,15 @@ #include #include +#include + #include +#include +#include #include +#include +#include namespace { using power_grid_model::Idx; diff --git a/tests/cpp_unit_tests/test_job_dispatch.cpp b/tests/cpp_unit_tests/test_job_dispatch.cpp index 8ed5a596c9..8aa3645bfc 100644 --- a/tests/cpp_unit_tests/test_job_dispatch.cpp +++ b/tests/cpp_unit_tests/test_job_dispatch.cpp @@ -2,22 +2,29 @@ // // SPDX-License-Identifier: MPL-2.0 +#include +#include + #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 { namespace { @@ -413,7 +420,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, // 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}}); throw; diff --git a/tests/cpp_unit_tests/test_line.cpp b/tests/cpp_unit_tests/test_line.cpp index 43343adb27..964d0e5e75 100644 --- a/tests/cpp_unit_tests/test_line.cpp +++ b/tests/cpp_unit_tests/test_line.cpp @@ -2,10 +2,24 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include +#include +#include +#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_link.cpp b/tests/cpp_unit_tests/test_link.cpp index e076b7a7a4..9aefe9a713 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 #include +#include +#include +#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_load_gen.cpp b/tests/cpp_unit_tests/test_load_gen.cpp index cc883894b9..cb9e7f89f6 100644 --- a/tests/cpp_unit_tests/test_load_gen.cpp +++ b/tests/cpp_unit_tests/test_load_gen.cpp @@ -2,10 +2,25 @@ // // SPDX-License-Identifier: MPL-2.0 +#include #include +#include +#include +#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_main_core_output.cpp b/tests/cpp_unit_tests/test_main_core_output.cpp index 66549df273..e248b10bf0 100644 --- a/tests/cpp_unit_tests/test_main_core_output.cpp +++ b/tests/cpp_unit_tests/test_main_core_output.cpp @@ -2,12 +2,27 @@ // // 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_main_model_type.cpp b/tests/cpp_unit_tests/test_main_model_type.cpp index 72ddd768b7..7019700d2c 100644 --- a/tests/cpp_unit_tests/test_main_model_type.cpp +++ b/tests/cpp_unit_tests/test_main_model_type.cpp @@ -2,15 +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 +#include + namespace power_grid_model::main_core { namespace { diff --git a/tests/cpp_unit_tests/test_math_solver_pf.hpp b/tests/cpp_unit_tests/test_math_solver_pf.hpp index 268888211b..eef7249d2f 100644 --- a/tests/cpp_unit_tests/test_math_solver_pf.hpp +++ b/tests/cpp_unit_tests/test_math_solver_pf.hpp @@ -8,10 +8,11 @@ #include "test_math_solver_common.hpp" -#include #include #include +#include + namespace power_grid_model { template inline auto run_power_flow(SolverType& solver, YBus const& y_bus, 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..d51de321f4 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,10 +2,12 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_pf.hpp" +#include "test_math_solver_pf.hpp" // NOLINT(misc-include-cleaner) #include +#include + #include TYPE_TO_STRING_AS("IterativeCurrentPFSolver", 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..c768eb1e11 100644 --- a/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp +++ b/tests/cpp_unit_tests/test_math_solver_pf_linear.cpp @@ -2,10 +2,12 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_pf.hpp" +#include "test_math_solver_pf.hpp" // NOLINT(misc-include-cleaner) #include +#include + #include TYPE_TO_STRING_AS("LinearPFSolver", 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 47de2584e4..5949e7c18b 100644 --- a/tests/cpp_unit_tests/test_math_solver_sc.cpp +++ b/tests/cpp_unit_tests/test_math_solver_sc.cpp @@ -6,6 +6,22 @@ #include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + namespace power_grid_model::math_solver { namespace { diff --git a/tests/cpp_unit_tests/test_math_solver_se.hpp b/tests/cpp_unit_tests/test_math_solver_se.hpp index 9444b3a319..81d7e3e140 100644 --- a/tests/cpp_unit_tests/test_math_solver_se.hpp +++ b/tests/cpp_unit_tests/test_math_solver_se.hpp @@ -8,11 +8,14 @@ #include "test_math_solver_common.hpp" +#include #include #include #include #include +#include + namespace power_grid_model { template inline auto run_state_estimation(SolverType& solver, YBus const& y_bus, 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..ae172e1c05 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,11 @@ // // 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 #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..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 @@ -2,9 +2,10 @@ // // SPDX-License-Identifier: MPL-2.0 -#include "test_math_solver_se.hpp" +#include "test_math_solver_se.hpp" // NOLINT(misc-include-cleaner) -#include +#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 e3abe6f65b..3d8a1eeaf5 100644 --- a/tests/cpp_unit_tests/test_measured_values.cpp +++ b/tests/cpp_unit_tests/test_measured_values.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::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 b0c370c494..77bd45a3c6 100644 --- a/tests/cpp_unit_tests/test_meta_data_generation.cpp +++ b/tests/cpp_unit_tests/test_meta_data_generation.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include @@ -17,16 +17,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 +34,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 +51,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_node.cpp b/tests/cpp_unit_tests/test_node.cpp index 92708817fb..2858220564 100644 --- a/tests/cpp_unit_tests/test_node.cpp +++ b/tests/cpp_unit_tests/test_node.cpp @@ -4,6 +4,11 @@ #include +#include +#include +#include +#include + #include namespace power_grid_model { diff --git a/tests/cpp_unit_tests/test_observability.cpp b/tests/cpp_unit_tests/test_observability.cpp index 5eca41f4e8..3163745439 100644 --- a/tests/cpp_unit_tests/test_observability.cpp +++ b/tests/cpp_unit_tests/test_observability.cpp @@ -3,16 +3,25 @@ // SPDX-License-Identifier: MPL-2.0 #include +#include +#include #include +#include +#include +#include #include #include -#include - #include #include -#include +#include +#include +#include +#include +#include +#include +#include namespace power_grid_model { @@ -801,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 } diff --git a/tests/cpp_unit_tests/test_optimizer.cpp b/tests/cpp_unit_tests/test_optimizer.cpp index 75ebacefef..ceea7a59aa 100644 --- a/tests/cpp_unit_tests/test_optimizer.cpp +++ b/tests/cpp_unit_tests/test_optimizer.cpp @@ -3,8 +3,28 @@ // SPDX-License-Identifier: MPL-2.0 #include "test_optimizer.hpp" +#include +#include +#include #include +#include +#include // NOLINT(misc-include-cleaner) +#include // NOLINT(misc-include-cleaner) +#include // NOLINT(misc-include-cleaner) +#include +#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_optimizer.hpp b/tests/cpp_unit_tests/test_optimizer.hpp index d95dc856fa..885d04f6ab 100644 --- a/tests/cpp_unit_tests/test_optimizer.hpp +++ b/tests/cpp_unit_tests/test_optimizer.hpp @@ -5,7 +5,8 @@ #pragma once #include -#include +#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 4cc5f189cd..b6f9edfb9a 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 +#include +#include +#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_serializer.cpp b/tests/cpp_unit_tests/test_serializer.cpp index df1e65fd0e..02ade3c50c 100644 --- a/tests/cpp_unit_tests/test_serializer.cpp +++ b/tests/cpp_unit_tests/test_serializer.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::meta_data { diff --git a/tests/cpp_unit_tests/test_shunt.cpp b/tests/cpp_unit_tests/test_shunt.cpp index 3ad2899020..1c3b241d6c 100644 --- a/tests/cpp_unit_tests/test_shunt.cpp +++ b/tests/cpp_unit_tests/test_shunt.cpp @@ -4,6 +4,19 @@ #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_source.cpp b/tests/cpp_unit_tests/test_source.cpp index fa813240c3..a081acd6f1 100644 --- a/tests/cpp_unit_tests/test_source.cpp +++ b/tests/cpp_unit_tests/test_source.cpp @@ -4,6 +4,20 @@ #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 b516329c50..c779ff3c40 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_sparse_ordering.cpp b/tests/cpp_unit_tests/test_sparse_ordering.cpp index 99c15fd91f..9765d39d6c 100644 --- a/tests/cpp_unit_tests/test_sparse_ordering.cpp +++ b/tests/cpp_unit_tests/test_sparse_ordering.cpp @@ -4,11 +4,15 @@ #include +#include + #include #include #include -#include +#include +#include +#include namespace { using power_grid_model::Idx; diff --git a/tests/cpp_unit_tests/test_statistics.cpp b/tests/cpp_unit_tests/test_statistics.cpp index b51043c0c9..2753bb798e 100644 --- a/tests/cpp_unit_tests/test_statistics.cpp +++ b/tests/cpp_unit_tests/test_statistics.cpp @@ -4,8 +4,19 @@ #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_tap_position_optimizer.cpp b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp index d0c3da3414..4ae54d50f1 100644 --- a/tests/cpp_unit_tests/test_tap_position_optimizer.cpp +++ b/tests/cpp_unit_tests/test_tap_position_optimizer.cpp @@ -4,15 +4,66 @@ #include "test_optimizer.hpp" +#include + +#include +#include +#include +#include +#include // NOLINT(misc-include-cleaner) +#include // NOLINT(misc-include-cleaner) +#include // NOLINT(misc-include-cleaner) +#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_three_phase_tensor.cpp b/tests/cpp_unit_tests/test_three_phase_tensor.cpp index c3900cf899..0517e43e96 100644 --- a/tests/cpp_unit_tests/test_three_phase_tensor.cpp +++ b/tests/cpp_unit_tests/test_three_phase_tensor.cpp @@ -2,11 +2,19 @@ // // SPDX-License-Identifier: MPL-2.0 -#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_three_winding_transformer.cpp b/tests/cpp_unit_tests/test_three_winding_transformer.cpp index 2b4ade6dcc..577202aefa 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 +#include +#include +#include +#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_timer.cpp b/tests/cpp_unit_tests/test_timer.cpp index 9a554afaab..aef875a804 100644 --- a/tests/cpp_unit_tests/test_timer.cpp +++ b/tests/cpp_unit_tests/test_timer.cpp @@ -3,15 +3,20 @@ // 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::common::logging { namespace { class MiniLogger : public common::logging::Logger { diff --git a/tests/cpp_unit_tests/test_topology.cpp b/tests/cpp_unit_tests/test_topology.cpp index 049c1ce53e..40059adad7 100644 --- a/tests/cpp_unit_tests/test_topology.cpp +++ b/tests/cpp_unit_tests/test_topology.cpp @@ -4,8 +4,18 @@ #include +#include +#include +#include +#include + #include +#include +#include +#include +#include + /* * [0] = Node / Bus * --0--> = Branch (from --id--> to) diff --git a/tests/cpp_unit_tests/test_transformer.cpp b/tests/cpp_unit_tests/test_transformer.cpp index b9d65c0085..ea92ac6270 100644 --- a/tests/cpp_unit_tests/test_transformer.cpp +++ b/tests/cpp_unit_tests/test_transformer.cpp @@ -4,8 +4,22 @@ #include +#include +#include +#include +#include +#include +#include +#include +#include + #include +#include +#include +#include +#include + namespace power_grid_model { namespace { using namespace std::complex_literals; diff --git a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp index 279e6c4ce0..eeba6ba2a6 100644 --- a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp +++ b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp @@ -4,8 +4,19 @@ #include +#include +#include +#include +#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_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; diff --git a/tests/cpp_unit_tests/test_voltage_regulator.cpp b/tests/cpp_unit_tests/test_voltage_regulator.cpp index e7c98c9d6b..e92ee71f83 100644 --- a/tests/cpp_unit_tests/test_voltage_regulator.cpp +++ b/tests/cpp_unit_tests/test_voltage_regulator.cpp @@ -4,8 +4,21 @@ #include +#include +#include +#include +#include +#include +#include +#include +#include + #include +#include +#include +#include + namespace power_grid_model { namespace { diff --git a/tests/cpp_unit_tests/test_voltage_sensor.cpp b/tests/cpp_unit_tests/test_voltage_sensor.cpp index 814c4f7353..716fa3dd8a 100644 --- a/tests/cpp_unit_tests/test_voltage_sensor.cpp +++ b/tests/cpp_unit_tests/test_voltage_sensor.cpp @@ -2,15 +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 { namespace { void check_nan_preserving_equality(std::floating_point auto actual, std::floating_point auto expected) { diff --git a/tests/cpp_unit_tests/test_y_bus.cpp b/tests/cpp_unit_tests/test_y_bus.cpp index 9df91a11c6..9a12fcd06e 100644 --- a/tests/cpp_unit_tests/test_y_bus.cpp +++ b/tests/cpp_unit_tests/test_y_bus.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 { diff --git a/tests/cpp_validation_tests/test_validation.cpp b/tests/cpp_validation_tests/test_validation.cpp index 195e5f63fc..8d5fab7953 100644 --- a/tests/cpp_validation_tests/test_validation.cpp +++ b/tests/cpp_validation_tests/test_validation.cpp @@ -4,25 +4,43 @@ #define PGM_ENABLE_EXPERIMENTAL -#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 namespace power_grid_model_cpp { namespace { @@ -315,7 +333,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 diff --git a/tests/native_api_tests/test_api_buffer.cpp b/tests/native_api_tests/test_api_buffer.cpp index 54528fa6eb..496bc81a3a 100644 --- a/tests/native_api_tests/test_api_buffer.cpp +++ b/tests/native_api_tests/test_api_buffer.cpp @@ -2,21 +2,17 @@ // // 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_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..734474883d 100644 --- a/tests/native_api_tests/test_api_meta_data.cpp +++ b/tests/native_api_tests/test_api_meta_data.cpp @@ -2,11 +2,13 @@ // // 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..cd2a362783 100644 --- a/tests/native_api_tests/test_api_model.cpp +++ b/tests/native_api_tests/test_api_model.cpp @@ -4,22 +4,30 @@ #include "load_dataset.hpp" -#include "power_grid_model_cpp.hpp" - +#include +#include +#include +#include +#include +#include + +#include #include #include #include #include -#include -#include +#include +#include // NOLINT(misc-include-cleaner) #include #include +#include #include +#include /* -Testing network +Testing network- source_1 -- node_0 |---- line_5 ----| node_4 | |---- line_6 ----| @@ -119,7 +127,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", @@ -138,7 +146,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_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 c4eaef0435..d451a3a5d9 100644 --- a/tests/native_api_tests/test_api_model_update.cpp +++ b/tests/native_api_tests/test_api_model_update.cpp @@ -4,17 +4,21 @@ #include "load_dataset.hpp" +#include #include +#include +#include +#include +#include #include #include +#include #include #include -#include -#include +#include #include -#include #include #include @@ -310,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", @@ -336,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", @@ -356,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..ab9db7aef1 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 +#include +#include +#include +#include +#include + +#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") {