#define SIMGRID_MC_UDPOR_MAXIMAL_SUBSETS_ITERATOR_HPP
#include "src/mc/explo/udpor/Configuration.hpp"
+#include "src/xbt/utils/iter/iterator_wrapping.hpp"
#include <boost/iterator/iterator_facade.hpp>
+#include <functional>
#include <optional>
#include <stack>
#include <unordered_map>
/**
* @brief An iterator over the tree of sets of (non-empty) maximal events that
- * can be generated from a given configuration
+ * can be generated from a given set of events
*
* This iterator traverses all possible sets of maximal events that
- * can be formed from a configuration, each of which satisfy a predicate.
+ * can be formed from some subset of events of an unfolding,
+ * each of which satisfy a predicate.
*
* Iteration over the maximal events of a configuration is an important
* step in computing the extension set of a configuration for an action
using topological_order_position = std::vector<const UnfoldingEvent*>::const_iterator;
maximal_subsets_iterator() = default;
- explicit maximal_subsets_iterator(const Configuration& config) : maximal_subsets_iterator(config, std::nullopt) {}
+ explicit maximal_subsets_iterator(const Configuration& config) : maximal_subsets_iterator(config.get_events()) {}
+ explicit maximal_subsets_iterator(const EventSet& events) : maximal_subsets_iterator(events, std::nullopt) {}
maximal_subsets_iterator(const Configuration& config, std::optional<node_filter_function> filter)
- : config({config})
- , topological_ordering(config.get_topologically_sorted_events_of_reverse_graph())
- , current_maximal_set({EventSet()})
- , bookkeeper(filter)
+ : maximal_subsets_iterator(config.get_events(), filter)
{
}
+ maximal_subsets_iterator(const EventSet& events, std::optional<node_filter_function> filter);
private:
- const std::optional<std::reference_wrapper<const Configuration>> config;
- const std::vector<const UnfoldingEvent*> topological_ordering;
+ std::vector<const UnfoldingEvent*> topological_ordering;
// The boolean is a bit of an annoyance, but it works. Effectively,
// there's no way to distinguish between "we're starting the search
struct bookkeeper {
public:
using topological_order_position = maximal_subsets_iterator::topological_order_position;
- explicit bookkeeper(std::optional<node_filter_function> filter = std::nullopt) : filter_function(filter) {}
void mark_included_in_maximal_set(const UnfoldingEvent*);
void mark_removed_from_maximal_set(const UnfoldingEvent*);
private:
std::unordered_map<const UnfoldingEvent*, unsigned> event_counts;
- const std::optional<node_filter_function> filter_function;
/// @brief Whether or not the given event, according to the
/// bookkeeping that has been done thus far, can be added to the
/// current candidate maximal set
bool is_candidate_event(const UnfoldingEvent*) const;
-
} bookkeeper;
void add_element_to_current_maximal_set(const UnfoldingEvent*);
friend class boost::iterator_core_access;
};
+using maximal_subsets_iterator_wrapper =
+ simgrid::xbt::iterator_wrapping<maximal_subsets_iterator, const Configuration&>;
+
} // namespace simgrid::mc::udpor
#endif