Add clean up phase to UDPOR

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

diff --git a/src/mc/explo/udpor/EventSet.cpp b/src/mc/explo/udpor/EventSet.cpp
index 33442cd..ea42f8b 100644 (file)
--- a/src/mc/explo/udpor/EventSet.cpp
+++ b/src/mc/explo/udpor/EventSet.cpp
@@ -7,9 +7,10 @@
 #include "src/mc/explo/udpor/Configuration.hpp"
 #include "src/mc/explo/udpor/History.hpp"
 #include "src/mc/explo/udpor/UnfoldingEvent.hpp"
+#include "src/xbt/utils/iter/variable_for_loop.hpp"
 
-#include <iterator>
 #include <stack>
+#include <vector>
 
 namespace simgrid::mc::udpor {
 
@@ -89,6 +90,11 @@ EventSet EventSet::make_union(const Configuration& config) const
   return make_union(config.get_events());
 }
 
+EventSet EventSet::get_local_config() const
+{
+  return History(*this).get_all_events();
+}
+
 size_t EventSet::size() const
 {
   return this->events_.size();
@@ -123,7 +129,7 @@ bool EventSet::is_valid_configuration() const
   /// which requires that all events have their history contained
   /// in the set
   const History history(*this);
-  return this->contains(history);
+  return contains(history) && is_conflict_free();
 }
 
 bool EventSet::contains(const History& history) const
@@ -133,13 +139,22 @@ bool EventSet::contains(const History& history) const
 
 bool EventSet::is_maximal() const
 {
+  // A set of events is maximal if no event from
+  // the original set is ruled out when traversing
+  // the history of the events
   const History history(*this);
   return *this == history.get_all_maximal_events();
 }
 
 bool EventSet::is_conflict_free() const
 {
-  return false;
+  const auto begin = simgrid::xbt::variable_for_loop<const EventSet>{{*this}, {*this}};
+  const auto end   = simgrid::xbt::variable_for_loop<const EventSet>();
+  return std::none_of(begin, end, [=](const auto event_pair) {
+    const UnfoldingEvent* e1 = *event_pair[0];
+    const UnfoldingEvent* e2 = *event_pair[1];
+    return e1->conflicts_with(e2);
+  });
 }
 
 std::vector<const UnfoldingEvent*> EventSet::get_topological_ordering() const
@@ -213,4 +228,16 @@ std::vector<const UnfoldingEvent*> EventSet::get_topological_ordering_of_reverse
   return topological_events;
 }
 
+std::vector<const UnfoldingEvent*> EventSet::move_into_vector() const&&
+{
+  std::vector<const UnfoldingEvent*> contents;
+  contents.reserve(size());
+
+  for (auto&& event : *this) {
+    contents.push_back(event);
+  }
+
+  return contents;
+}
+
 } // namespace simgrid::mc::udpor
\ No newline at end of file