bool UnfoldingEvent::operator==(const UnfoldingEvent& other) const
{
- const bool same_actor = associated_transition->aid_ == other.associated_transition->aid_;
- if (!same_actor)
- return false;
-
- // TODO: Add in information to determine which step in the sequence this actor was executed
-
- // All unfolding event objects are created in reference to
- // an Unfolding object which owns them. Hence, the references
+ // Two events are equivalent iff:
+ // 1. they have the same action
+ // 2. they have the same history
+ //
+ // NOTE: All unfolding event objects are created in reference to
+ // an `Unfolding` object which owns them. Hence, the references
// they contain to other events in the unfolding can
// be used as intrinsic identities (i.e. we don't need to
// recursively check if each of our causes has a `==` in
// the other event's causes)
- return this->immediate_causes == other.immediate_causes;
+ return associated_transition->aid_ == other.associated_transition->aid_ &&
+ associated_transition->type_ == other.associated_transition->type_ &&
+ associated_transition->times_considered_ == other.associated_transition->times_considered_ &&
+ this->immediate_causes == other.immediate_causes;
}
EventSet UnfoldingEvent::get_history() const
const EventSet unique_to_me = my_history.subtracting(other_history);
const EventSet unique_to_other = other_history.subtracting(my_history);
- for (const auto e_me : unique_to_me) {
- for (const auto e_other : unique_to_other) {
- if (e_me->has_conflicting_transition_with(e_other)) {
- return true;
- }
- }
- }
- return false;
+ const bool conflicts_with_me = std::any_of(unique_to_me.begin(), unique_to_me.end(),
+ [&](const UnfoldingEvent* e) { return e->is_dependent_with(other); });
+ const bool conflicts_with_other = std::any_of(unique_to_other.begin(), unique_to_other.end(),
+ [&](const UnfoldingEvent* e) { return e->is_dependent_with(this); });
+ return conflicts_with_me or conflicts_with_other;
}
bool UnfoldingEvent::conflicts_with(const Configuration& config) const
// if they are not related)
const EventSet potential_conflicts = config.get_events().subtracting(get_history());
return std::any_of(potential_conflicts.cbegin(), potential_conflicts.cend(),
- [&](const UnfoldingEvent* e) { return this->has_conflicting_transition_with(e); });
+ [&](const UnfoldingEvent* e) { return this->is_dependent_with(e); });
+}
+
+bool UnfoldingEvent::immediately_conflicts_with(const UnfoldingEvent* other) const
+{
+ // They have to be in conflict at a minimum
+ if (not conflicts_with(other)) {
+ return false;
+ }
+
+ auto combined_events = History(EventSet{this, other}).get_all_events();
+
+ // See the definition of immediate conflicts in the original paper on UDPOR
+ {
+ combined_events.remove(this);
+ if (not combined_events.is_valid_configuration()) {
+ return false;
+ }
+ combined_events.insert(this);
+ }
+
+ {
+ combined_events.remove(other);
+ if (not combined_events.is_valid_configuration()) {
+ return false;
+ }
+ combined_events.insert(other);
+ }
+
+ return true;
+}
+
+bool UnfoldingEvent::is_dependent_with(const Transition* t) const
+{
+ return associated_transition->depends(t);
}
-bool UnfoldingEvent::has_conflicting_transition_with(const UnfoldingEvent* other) const
+bool UnfoldingEvent::is_dependent_with(const UnfoldingEvent* other) const
{
- return associated_transition->depends(other->associated_transition.get());
+ return is_dependent_with(other->associated_transition.get());
}
} // namespace simgrid::mc::udpor
