Skip to content

Commit 0711e10

Browse files
nitbharambenitbharambe
committed
add to common namespace
Signed-off-by: Nitish Bharambe <[email protected]>
1 parent f339e21 commit 0711e10

File tree

9 files changed

+53
-52
lines changed

9 files changed

+53
-52
lines changed

‎power_grid_model_c/power_grid_model/include/power_grid_model/container_fwd.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <concepts>
1010

11-
namespace power_grid_model {
11+
namespace power_grid_model::common {
1212

1313
template <typename ContainerType, typename RetrievableType>
1414
concept component_container_c = requires(ContainerType const& c, ID id, Idx2D idx2d) {
@@ -24,4 +24,4 @@ concept component_container_c = requires(ContainerType const& c, ID id, Idx2D id
2424
template <typename ContainerType, typename... RetrievableType>
2525
concept multi_component_container_c = (component_container_c<ContainerType, RetrievableType> && ...);
2626

27-
} // namespace power_grid_model
27+
} // namespace power_grid_model::common

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ namespace power_grid_model::main_core {
1111
// TODO Reconfirm if there is duplication with state_queries and if we can remove either one of them
1212

1313
template <typename ComponentType, class ComponentContainer>
14-
requires component_container_c<ComponentContainer, ComponentType>
14+
requires common::component_container_c<ComponentContainer, ComponentType>
1515
constexpr auto get_component_size(ComponentContainer const& components) {
1616
return components.template size<ComponentType>();
1717
}
1818

1919
template <typename ComponentType, class ComponentContainer>
20-
requires component_container_c<ComponentContainer, ComponentType>
20+
requires common::component_container_c<ComponentContainer, ComponentType>
2121
inline Idx get_component_sequence_idx(ComponentContainer const& components, auto const& id_or_index) {
2222
return components.template get_seq<ComponentType>(id_or_index);
2323
}

‎power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ concept main_model_state_c = std::same_as<StateType, MainModelState<typename Sta
3030

3131
template <template <typename T> class StateType, typename ContainerType, typename ComponentType>
3232
concept model_component_state_c =
33-
component_container_c<typename StateType<ContainerType>::ComponentContainer, ComponentType> &&
33+
common::component_container_c<typename StateType<ContainerType>::ComponentContainer, ComponentType> &&
3434
std::same_as<StateType<ContainerType>, MainModelState<ContainerType>>;
3535

3636
} // namespace power_grid_model::main_core

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace power_grid_model::main_core {
1313
namespace detail {
1414

1515
template <typename Component, class ComponentContainer, typename ResType, typename ResFunc>
16-
requires component_container_c<ComponentContainer, Component> &&
16+
requires common::component_container_c<ComponentContainer, Component> &&
1717
std::invocable<std::remove_cvref_t<ResFunc>, Component const&> &&
1818
std::convertible_to<std::invoke_result_t<ResFunc, Component const&>, ResType>
1919
constexpr void apply_registration(ComponentContainer const& components, std::vector<ResType>& target, ResFunc&& func) {
@@ -25,13 +25,13 @@ constexpr void apply_registration(ComponentContainer const& components, std::vec
2525
}
2626

2727
template <std::same_as<Node> Component, class ComponentContainer>
28-
requires component_container_c<ComponentContainer, Component>
28+
requires common::component_container_c<ComponentContainer, Component>
2929
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
3030
comp_topo.n_node = get_component_size<Node>(components);
3131
}
3232

3333
template <std::same_as<Branch> Component, class ComponentContainer>
34-
requires multi_component_container_c<ComponentContainer, Component, Node>
34+
requires common::multi_component_container_c<ComponentContainer, Component, Node>
3535
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
3636
apply_registration<Component>(components, comp_topo.branch_node_idx, [&components](Branch const& branch) {
3737
return BranchIdx{get_component_sequence_idx<Node>(components, branch.from_node()),
@@ -40,7 +40,7 @@ constexpr void register_topology_components(ComponentContainer const& components
4040
}
4141

4242
template <std::same_as<Branch3> Component, class ComponentContainer>
43-
requires multi_component_container_c<ComponentContainer, Component, Node>
43+
requires common::multi_component_container_c<ComponentContainer, Component, Node>
4444
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
4545
apply_registration<Component>(components, comp_topo.branch3_node_idx, [&components](Branch3 const& branch3) {
4646
return Branch3Idx{get_component_sequence_idx<Node>(components, branch3.node_1()),
@@ -50,23 +50,23 @@ constexpr void register_topology_components(ComponentContainer const& components
5050
}
5151

5252
template <std::same_as<Source> Component, class ComponentContainer>
53-
requires multi_component_container_c<ComponentContainer, Component, Node>
53+
requires common::multi_component_container_c<ComponentContainer, Component, Node>
5454
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
5555
apply_registration<Component>(components, comp_topo.source_node_idx, [&components](Source const& source) {
5656
return get_component_sequence_idx<Node>(components, source.node());
5757
});
5858
}
5959

6060
template <std::same_as<Shunt> Component, class ComponentContainer>
61-
requires multi_component_container_c<ComponentContainer, Component, Node>
61+
requires common::multi_component_container_c<ComponentContainer, Component, Node>
6262
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
6363
apply_registration<Component>(components, comp_topo.shunt_node_idx, [&components](Shunt const& shunt) {
6464
return get_component_sequence_idx<Node>(components, shunt.node());
6565
});
6666
}
6767

6868
template <std::same_as<GenericLoadGen> Component, class ComponentContainer>
69-
requires multi_component_container_c<ComponentContainer, Component, Node>
69+
requires common::multi_component_container_c<ComponentContainer, Component, Node>
7070
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
7171
apply_registration<Component>(components, comp_topo.load_gen_node_idx,
7272
[&components](GenericLoadGen const& load_gen) {
@@ -78,7 +78,7 @@ constexpr void register_topology_components(ComponentContainer const& components
7878
}
7979

8080
template <std::same_as<GenericVoltageSensor> Component, class ComponentContainer>
81-
requires multi_component_container_c<ComponentContainer, Component, Node>
81+
requires common::multi_component_container_c<ComponentContainer, Component, Node>
8282
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
8383
apply_registration<Component>(
8484
components, comp_topo.voltage_sensor_node_idx, [&components](GenericVoltageSensor const& voltage_sensor) {
@@ -87,8 +87,8 @@ constexpr void register_topology_components(ComponentContainer const& components
8787
}
8888

8989
template <std::same_as<GenericPowerSensor> Component, class ComponentContainer>
90-
requires multi_component_container_c<ComponentContainer, Component, Branch, Source, Shunt, GenericLoadGen, Branch3,
91-
Node>
90+
requires common::multi_component_container_c<ComponentContainer, Component, Branch, Source, Shunt, GenericLoadGen,
91+
Branch3, Node>
9292
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
9393
apply_registration<Component>(
9494
components, comp_topo.power_sensor_object_idx, [&components](GenericPowerSensor const& power_sensor) {
@@ -129,7 +129,7 @@ constexpr void register_topology_components(ComponentContainer const& components
129129
}
130130

131131
template <std::same_as<GenericCurrentSensor> Component, class ComponentContainer>
132-
requires multi_component_container_c<ComponentContainer, Component, Branch, Branch3>
132+
requires common::multi_component_container_c<ComponentContainer, Component, Branch, Branch3>
133133
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
134134
apply_registration<Component>(components, comp_topo.current_sensor_object_idx,
135135
[&components](GenericCurrentSensor const& current_sensor) {
@@ -160,7 +160,7 @@ constexpr void register_topology_components(ComponentContainer const& components
160160
}
161161

162162
template <std::derived_from<Regulator> Component, class ComponentContainer>
163-
requires multi_component_container_c<ComponentContainer, Component, Branch, Branch3>
163+
requires common::multi_component_container_c<ComponentContainer, Component, Branch, Branch3>
164164
constexpr void register_topology_components(ComponentContainer const& components, ComponentTopology& comp_topo) {
165165
apply_registration<Component>(
166166
components, comp_topo.regulated_object_idx, [&components](Regulator const& regulator) {
@@ -179,7 +179,7 @@ constexpr void register_topology_components(ComponentContainer const& components
179179
}
180180

181181
template <std::same_as<Branch> Component, class ComponentContainer>
182-
requires component_container_c<ComponentContainer, Component>
182+
requires common::component_container_c<ComponentContainer, Component>
183183
constexpr void register_connections_components(ComponentContainer components, ComponentConnections& comp_conn) {
184184
apply_registration<Component>(components, comp_conn.branch_connected, [](Branch const& branch) {
185185
return BranchConnected{static_cast<IntS>(branch.from_status()), static_cast<IntS>(branch.to_status())};
@@ -188,7 +188,7 @@ constexpr void register_connections_components(ComponentContainer components, Co
188188
[](Branch const& branch) { return branch.phase_shift(); });
189189
}
190190
template <std::same_as<Branch3> Component, class ComponentContainer>
191-
requires component_container_c<ComponentContainer, Component>
191+
requires common::component_container_c<ComponentContainer, Component>
192192
constexpr void register_connections_components(ComponentContainer components, ComponentConnections& comp_conn) {
193193
apply_registration<Component>(components, comp_conn.branch3_connected, [](Branch3 const& branch3) {
194194
return Branch3Connected{static_cast<IntS>(branch3.status_1()), static_cast<IntS>(branch3.status_2()),
@@ -199,7 +199,7 @@ constexpr void register_connections_components(ComponentContainer components, Co
199199
}
200200

201201
template <std::same_as<Source> Component, class ComponentContainer>
202-
requires component_container_c<ComponentContainer, Component>
202+
requires common::component_container_c<ComponentContainer, Component>
203203
constexpr void register_connections_components(ComponentContainer components, ComponentConnections& comp_conn) {
204204
apply_registration<Component>(components, comp_conn.source_connected,
205205
[](Source const& source) { return source.status(); });
@@ -208,8 +208,9 @@ constexpr void register_connections_components(ComponentContainer components, Co
208208
} // namespace detail
209209

210210
template <typename ComponentContainer>
211-
requires multi_component_container_c<ComponentContainer, Branch, Branch3, Source, Shunt, GenericLoadGen,
212-
GenericVoltageSensor, GenericPowerSensor, GenericCurrentSensor, Regulator>
211+
requires common::multi_component_container_c<ComponentContainer, Branch, Branch3, Source, Shunt, GenericLoadGen,
212+
GenericVoltageSensor, GenericPowerSensor, GenericCurrentSensor,
213+
Regulator>
213214
ComponentTopology construct_topology(ComponentContainer const& components) {
214215
ComponentTopology comp_topo;
215216
detail::register_topology_components<Node>(components, comp_topo);
@@ -226,7 +227,7 @@ ComponentTopology construct_topology(ComponentContainer const& components) {
226227
}
227228

228229
template <typename ComponentContainer>
229-
requires multi_component_container_c<ComponentContainer, Branch, Branch3, Source>
230+
requires common::multi_component_container_c<ComponentContainer, Branch, Branch3, Source>
230231
ComponentConnections construct_components_connections(ComponentContainer const& components) {
231232
ComponentConnections comp_conn;
232233
detail::register_connections_components<Branch>(components, comp_conn);

‎power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/optimizer.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ constexpr auto get_optimizer(OptimizerType optimizer_type, OptimizerStrategy str
2929
case automatic_tap_adjustment:
3030
if constexpr (detail::steady_state_calculator_c<StateCalculator, State> &&
3131
std::invocable<std::remove_cvref_t<StateUpdater>, ConstDataset const&> &&
32-
component_container_c<typename State::ComponentContainer, TransformerTapRegulator>) {
32+
common::component_container_c<typename State::ComponentContainer, TransformerTapRegulator>) {
3333
return BaseOptimizer::template make_shared<TapPositionOptimizer<StateCalculator, StateUpdater, State>>(
3434
std::move(calculator), std::move(updater), strategy, meta_data, search);
3535
}

‎power_grid_model_c/power_grid_model/include/power_grid_model/optimizer/tap_position_optimizer.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ template <transformer_c... TransformerTypes> struct TapRegulatorRef {
471471
};
472472

473473
template <typename State>
474-
requires component_container_c<typename State::ComponentContainer, TransformerTapRegulator>
474+
requires common::component_container_c<typename State::ComponentContainer, TransformerTapRegulator>
475475
TransformerTapRegulator const& find_regulator(State const& state, ID regulated_object) {
476476
auto const regulators = get_component_citer<TransformerTapRegulator>(state);
477477

@@ -503,7 +503,7 @@ template <typename... Ts> struct transformer_types_s<std::tuple<std::tuple<Ts...
503503
template <typename... Ts> using transformer_types_t = typename transformer_types_s<std::tuple<Ts...>>::type;
504504

505505
template <transformer_c... TransformerTypes, typename State>
506-
requires(component_container_c<typename State::ComponentContainer, TransformerTypes> && ...)
506+
requires(common::component_container_c<typename State::ComponentContainer, TransformerTypes> && ...)
507507
inline TapRegulatorRef<TransformerTypes...> regulator_mapping(State const& state, Idx2D const& transformer_index) {
508508
using ResultType = TapRegulatorRef<TransformerTypes...>;
509509
using IsType = bool (*)(Idx2D const&);
@@ -536,7 +536,7 @@ inline TapRegulatorRef<TransformerTypes...> regulator_mapping(State const& state
536536
}
537537

538538
template <transformer_c... TransformerTypes, typename State>
539-
requires(component_container_c<typename State::ComponentContainer, TransformerTypes> && ...)
539+
requires(common::component_container_c<typename State::ComponentContainer, TransformerTypes> && ...)
540540
inline auto regulator_mapping(State const& state, std::vector<Idx2D> const& order) {
541541
std::vector<TapRegulatorRef<TransformerTypes...>> result;
542542
result.reserve(order.size());
@@ -549,7 +549,7 @@ inline auto regulator_mapping(State const& state, std::vector<Idx2D> const& orde
549549
}
550550

551551
template <transformer_c... TransformerTypes, typename State>
552-
requires(component_container_c<typename State::ComponentContainer, TransformerTypes> && ...)
552+
requires(common::component_container_c<typename State::ComponentContainer, TransformerTypes> && ...)
553553
inline auto regulator_mapping(State const& state, RankedTransformerGroups const& order) {
554554
std::vector<std::vector<TapRegulatorRef<TransformerTypes...>>> result;
555555
result.reserve(order.size());
@@ -598,15 +598,15 @@ inline auto i_pu(std::vector<SolverOutputType> const& solver_output, Idx2DBranch
598598

599599
template <component_c ComponentType, typename... RegulatedTypes, typename State,
600600
steady_state_solver_output_type SolverOutputType>
601-
requires component_container_c<typename State::ComponentContainer, ComponentType>
601+
requires common::component_container_c<typename State::ComponentContainer, ComponentType>
602602
inline auto i_pu_controlled_node(TapRegulatorRef<RegulatedTypes...> const& regulator, State const& state,
603603
std::vector<SolverOutputType> const& solver_output) {
604604
auto const& branch_math_id = get_math_id<ComponentType>(state, regulator.transformer.topology_index());
605605
return i_pu<ComponentType>(solver_output, branch_math_id, regulator.regulator.get().control_side());
606606
}
607607

608608
template <transformer_c ComponentType, typename State, steady_state_solver_output_type SolverOutputType>
609-
requires component_container_c<typename State::ComponentContainer, ComponentType> &&
609+
requires common::component_container_c<typename State::ComponentContainer, ComponentType> &&
610610
requires(State const& state, Idx const i) {
611611
{ get_branch_nodes<ComponentType>(state, i)[i] } -> std::convertible_to<Idx>;
612612
}
@@ -619,15 +619,15 @@ inline auto u_pu(State const& state, std::vector<SolverOutputType> const& solver
619619

620620
template <component_c ComponentType, typename... RegulatedTypes, typename State,
621621
steady_state_solver_output_type SolverOutputType>
622-
requires component_container_c<typename State::ComponentContainer, ComponentType>
622+
requires common::component_container_c<typename State::ComponentContainer, ComponentType>
623623
inline auto u_pu_controlled_node(TapRegulatorRef<RegulatedTypes...> const& regulator, State const& state,
624624
std::vector<SolverOutputType> const& solver_output) {
625625
return u_pu<ComponentType>(state, solver_output, regulator.transformer.topology_index(),
626626
regulator.regulator.get().control_side());
627627
}
628628

629629
template <component_c ComponentType, typename... RegulatedTypes, typename State>
630-
requires component_container_c<typename State::ComponentContainer, ComponentType>
630+
requires common::component_container_c<typename State::ComponentContainer, ComponentType>
631631
inline bool is_regulated_transformer_connected(TapRegulatorRef<RegulatedTypes...> const& regulator,
632632
State const& state) {
633633
auto const controlled_node_idx = get_topo_node<ComponentType>(state, regulator.transformer.topology_index(),
@@ -702,7 +702,7 @@ class RankIteration {
702702
template <typename... T> class TapPositionOptimizerImpl;
703703
template <transformer_c... TransformerTypes, typename StateCalculator, typename StateUpdater_, typename State_,
704704
typename TransformerRanker_>
705-
requires(component_container_c<typename State_::ComponentContainer, TransformerTypes> && ...) &&
705+
requires(common::component_container_c<typename State_::ComponentContainer, TransformerTypes> && ...) &&
706706
detail::steady_state_calculator_c<StateCalculator, State_> &&
707707
std::invocable<std::remove_cvref_t<StateUpdater_>, ConstDataset const&> &&
708708
requires(TransformerRanker_ const& ranker, State_ const& state) {

0 commit comments

Comments
 (0)