Merge branch 'udpor-phase6' into 'master'

[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 2cdb6fb..09cb66b 100644 (file)
--- a/src/mc/explo/udpor/EventSet.cpp
+++ b/src/mc/explo/udpor/EventSet.cpp
@@ -7,7 +7,7 @@
 #include "src/mc/explo/udpor/Configuration.hpp"
 #include "src/mc/explo/udpor/History.hpp"
 #include "src/mc/explo/udpor/UnfoldingEvent.hpp"
-#include "src/mc/explo/udpor/maximal_subsets_iterator.hpp"
+#include "src/xbt/utils/iter/variable_for_loop.hpp"
 
 #include <stack>
 #include <vector>
@@ -90,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();
@@ -124,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
@@ -132,6 +137,11 @@ bool EventSet::contains(const History& history) const
   return std::all_of(history.begin(), history.end(), [=](const UnfoldingEvent* e) { return this->contains(e); });
 }
 
+bool EventSet::intersects(const History& history) const
+{
+  return std::any_of(history.begin(), history.end(), [=](const UnfoldingEvent* e) { return this->contains(e); });
+}
+
 bool EventSet::is_maximal() const
 {
   // A set of events is maximal if no event from
@@ -143,12 +153,11 @@ bool EventSet::is_maximal() const
 
 bool EventSet::is_conflict_free() const
 {
-  const auto begin = maximal_subsets_iterator(*this, std::nullopt, {2});
-  const auto end   = maximal_subsets_iterator();
-  return std::none_of(begin, end, [](const EventSet event_pair) {
-    const auto events        = std::move(event_pair).move_into_vector();
-    const UnfoldingEvent* e1 = events[0];
-    const UnfoldingEvent* e2 = events[1];
+  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);
   });
 }