Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Revert "Feature/remove needless id lookup"" #460

Merged
merged 4 commits into from
Jan 9, 2024
Merged

Revert "Revert "Feature/remove needless id lookup"" #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8b6b74
Revert "Revert "Feature/remove needless id lookup""
mgovers Jan 4, 2024
d1190c8
thread owns sequence index
mgovers Jan 4, 2024
bf68735
clang-tidy
mgovers Jan 5, 2024
9119927
Merge remote-tracking branch 'origin/main' into revert-459-revert-456…
mgovers Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 34 additions & 15 deletions power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,48 @@
namespace power_grid_model::main_core {

namespace detail {
template <std::derived_from<Base> Component, class ComponentContainer, std::forward_iterator ForwardIterator,
typename Func>
template <std::derived_from<Base> Component, class ComponentContainer, typename UpdateType>
requires model_component_state<MainModelState, ComponentContainer, Component> &&
std::invocable<std::remove_cvref_t<Func>, typename Component::UpdateType, Idx2D const&>
inline void iterate_component_sequence(Func&& func, MainModelState<ComponentContainer> const& state,
ForwardIterator begin, ForwardIterator end,
std::same_as<std::remove_cvref_t<typename Component::UpdateType>, std::remove_cvref_t<UpdateType>>
inline Idx2D get_idx_by_id(MainModelState<ComponentContainer> const& state, UpdateType const& update) {
return state.components.template get_idx_by_id<Component>(update.id);
}

template <std::derived_from<Base> Component, std::forward_iterator ForwardIterator, typename Func>
requires std::invocable<std::remove_cvref_t<Func>, typename Component::UpdateType, Idx2D const&>
inline void iterate_component_sequence(Func&& func, ForwardIterator begin, ForwardIterator end,
std::vector<Idx2D> const& sequence_idx) {
bool const has_sequence_id = !sequence_idx.empty();
Idx seq = 0;

// loop to to update component
for (auto it = begin; it != end; ++it, ++seq) {
// get component
// either using ID via hash map
// either directly using sequence id
Idx2D const sequence_single =
has_sequence_id ? sequence_idx[seq] : state.components.template get_idx_by_id<Component>(it->id);

func(*it, sequence_single);
// get component directly using sequence id
func(*it, sequence_idx[seq]);
}
}
} // namespace detail

template <std::derived_from<Base> Component, class ComponentContainer, std::forward_iterator ForwardIterator,
std::output_iterator<Idx2D> OutputIterator>
requires model_component_state<MainModelState, ComponentContainer, Component>
inline void get_component_sequence(MainModelState<ComponentContainer> const& state, ForwardIterator begin,
ForwardIterator end, OutputIterator destination) {
using UpdateType = typename Component::UpdateType;

std::transform(begin, end, destination,
[&state](UpdateType const& update) { return detail::get_idx_by_id<Component>(state, update); });
}

template <std::derived_from<Base> Component, class ComponentContainer, std::forward_iterator ForwardIterator>
requires model_component_state<MainModelState, ComponentContainer, Component>
inline std::vector<Idx2D> get_component_sequence(MainModelState<ComponentContainer> const& state, ForwardIterator begin,
ForwardIterator end) {
std::vector<Idx2D> result;
result.reserve(std::distance(begin, end));
get_component_sequence<Component>(state, begin, end, std::back_inserter(result));
return result;
}

// template to update components
// using forward interators
// different selection based on component type
Expand All @@ -53,7 +72,7 @@ inline UpdateChange update_component(MainModelState<ComponentContainer>& state,
auto& comp = state.components.template get_item<Component>(sequence_single);
changed = changed || comp.update(update_data);
},
state, begin, end, sequence_idx);
begin, end, sequence_idx);

return changed;
}
Expand All @@ -74,7 +93,7 @@ inline void update_inverse(MainModelState<ComponentContainer> const& state, Forw
auto const& comp = state.components.template get_item<Component>(sequence_single);
*destination++ = comp.inverse(update_data);
},
state, begin, end, sequence_idx);
begin, end, sequence_idx);
}

template <bool sym>
Expand Down