#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) {}
- maximal_subsets_iterator(const Configuration& config, std::optional<node_filter_function> filter);
+ 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)
+ : 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 = std::nullopt;
std::vector<const UnfoldingEvent*> topological_ordering;
// The boolean is a bit of an annoyance, but it works. Effectively,
friend class boost::iterator_core_access;
};
-/**
- * @brief A collection whose contents consist of
- * the maximal event sets of some configuration
- *
- * @note You should treat this class as a small
- * wrapper that is more convenient and readable
- * than creating iterators directly, and thus should
- * not e.g. store instanca
- */
-class maximal_subsets_iterator_wrapper {
-public:
- using node_filter_function = maximal_subsets_iterator::node_filter_function;
-
- maximal_subsets_iterator_wrapper(const maximal_subsets_iterator_wrapper&) = delete;
- maximal_subsets_iterator_wrapper& operator=(const maximal_subsets_iterator_wrapper&) = delete;
- maximal_subsets_iterator_wrapper(const maximal_subsets_iterator_wrapper&&) = delete;
- maximal_subsets_iterator_wrapper& operator=(const maximal_subsets_iterator_wrapper&&) = delete;
-
- explicit maximal_subsets_iterator_wrapper(const Configuration& config) : config(config) {}
- maximal_subsets_iterator_wrapper(const Configuration& config, node_filter_function filter)
- : config(config), filter({filter})
- {
- }
-
- auto begin() const { return maximal_subsets_iterator(config, filter); }
- auto end() const { return maximal_subsets_iterator(); }
-
-private:
- const Configuration& config;
- std::optional<node_filter_function> filter = std::nullopt;
-};
+using maximal_subsets_iterator_wrapper =
+ simgrid::xbt::iterator_wrapping<maximal_subsets_iterator, const Configuration&>;
} // namespace simgrid::mc::udpor
#endif