using topological_order_position = std::vector<const UnfoldingEvent*>::const_iterator;
maximal_subsets_iterator() = default;
- maximal_subsets_iterator(maximal_subsets_iterator&&) noexcept = default;
explicit maximal_subsets_iterator(const Configuration& config,
- std::optional<node_filter_function> filter = std::nullopt,
- std::optional<size_t> maximum_subset_size = std::nullopt)
+ const std::optional<node_filter_function>& filter = std::nullopt,
+ std::optional<size_t> maximum_subset_size = std::nullopt)
: maximal_subsets_iterator(config.get_events(), filter, maximum_subset_size)
{
}
- explicit maximal_subsets_iterator(const EventSet& events, std::optional<node_filter_function> filter = std::nullopt,
- std::optional<size_t> maximum_subset_size = std::nullopt);
+ explicit maximal_subsets_iterator(const EventSet& events,
+ const std::optional<node_filter_function>& filter = std::nullopt,
+ std::optional<size_t> maximum_subset_size = std::nullopt);
private:
std::vector<const UnfoldingEvent*> topological_ordering;
bool has_started_searching = false;
std::optional<size_t> maximum_subset_size = std::nullopt;
std::optional<EventSet> current_maximal_set = std::nullopt;
- std::stack<topological_order_position> backtrack_points = std::stack<topological_order_position>();
+ std::stack<topological_order_position, std::vector<topological_order_position>> backtrack_points;
/**
* @brief A small class which provides functionality for managing
* with events that are its current maximal event set (i.e.
* its `current_maximal_set`)
*/
- struct bookkeeper {
+ struct Bookkeeper {
public:
using topological_order_position = maximal_subsets_iterator::topological_order_position;
- bookkeeper() = default;
- bookkeeper(bookkeeper&&) = default;
- bookkeeper& operator=(bookkeeper&) = default;
- bookkeeper& operator=(bookkeeper&&) = default;
-
void mark_included_in_maximal_set(const UnfoldingEvent*);
void mark_removed_from_maximal_set(const UnfoldingEvent*);
topological_order_position find_next_candidate_event(topological_order_position first,
/// bookkeeping that has been done thus far, can be added to the
/// current candidate maximal set
bool is_candidate_event(const UnfoldingEvent*) const;
- } bookkeeper;
+ };
+ Bookkeeper bookkeeper;
void add_element_to_current_maximal_set(const UnfoldingEvent*);
void remove_element_from_current_maximal_set(const UnfoldingEvent*);
bool equal(const maximal_subsets_iterator& other) const { return current_maximal_set == other.current_maximal_set; }
const EventSet& dereference() const
{
- static const EventSet empty_set = EventSet();
+ static const EventSet empty_set;
if (current_maximal_set.has_value()) {
return current_maximal_set.value();
}