Add working implementation of maximal_subsets_iterator

[simgrid.git] / src / mc / explo / udpor / History.cpp

diff --git a/src/mc/explo/udpor/History.cpp b/src/mc/explo/udpor/History.cpp
index 544980a8cf3ac4bc64c289ddd76ca11042841727..d9d43d313304caa3907a37cddfc06ffaac35be50 100644 (file)
--- a/src/mc/explo/udpor/History.cpp
+++ b/src/mc/explo/udpor/History.cpp
@@ -20,11 +20,11 @@ History::Iterator::Iterator(const EventSet& initial_events, optional_configurati
   // and all subsequent events that are added by the iterator
 }
 
-History::Iterator& History::Iterator::operator++()
+void History::Iterator::increment()
 {
   if (not frontier.empty()) {
     // "Pop" the event at the "front"
-    UnfoldingEvent* e = *frontier.begin();
+    const UnfoldingEvent* e = *frontier.begin();
     frontier.remove(e);
 
     // If there is a configuration and if the
@@ -33,7 +33,7 @@ History::Iterator& History::Iterator::operator++()
     // be searched since the configuration contains
     // them (configuration invariant)
     if (configuration.has_value() && configuration->get().contains(e)) {
-      return *this;
+      return;
     }
 
     // Mark this event as seen
@@ -45,9 +45,21 @@ History::Iterator& History::Iterator::operator++()
     maximal_events.subtract(candidates);
 
     candidates.subtract(current_history);
-    frontier.form_union(std::move(candidates));
+    frontier.form_union(candidates);
   }
-  return *this;
+}
+
+const UnfoldingEvent* const& History::Iterator::dereference() const
+{
+  return *frontier.begin();
+}
+
+bool History::Iterator::equal(const Iterator& other) const
+{
+  // If what the iterator sees next is the same, we consider them
+  // to be the same iterator. This way, once the iterator has completed
+  // its search, it will be "equal" to an iterator searching nothing
+  return this->frontier == other.frontier;
 }
 
 EventSet History::get_all_events() const
@@ -72,15 +84,15 @@ EventSet History::get_all_maximal_events() const
   return first.maximal_events;
 }
 
-bool History::contains(UnfoldingEvent* e) const
+bool History::contains(const UnfoldingEvent* e) const
 {
-  return std::any_of(this->begin(), this->end(), [=](UnfoldingEvent* e_hist) { return e == e_hist; });
+  return std::any_of(this->begin(), this->end(), [=](const UnfoldingEvent* e_hist) { return e == e_hist; });
 }
 
 EventSet History::get_event_diff_with(const Configuration& config) const
 {
   auto wrapped_config = std::optional<std::reference_wrapper<const Configuration>>{config};
-  auto first          = Iterator(events_, std::move(wrapped_config));
+  auto first          = Iterator(events_, wrapped_config);
   const auto last     = this->end();
 
   for (; first != last; ++first)