From fa640887e373f7bf7dcba89d3e07a44dd9028b7b Mon Sep 17 00:00:00 2001 From: Maxwell Pirtle Date: Tue, 7 Mar 2023 10:05:45 +0100 Subject: [PATCH] Rename `EventSet::is_maximal_event_set()` The method `is_maximal_event_set()` was renamed to simply `is_maximal()`, since the question is already being asked about some event set (i.e. the `_event_set` bit is redundant) --- src/mc/explo/udpor/Configuration_test.cpp | 6 +- src/mc/explo/udpor/EventSet.cpp | 2 +- src/mc/explo/udpor/EventSet.hpp | 2 +- src/mc/explo/udpor/EventSet_test.cpp | 128 +++++++++++----------- 4 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/mc/explo/udpor/Configuration_test.cpp b/src/mc/explo/udpor/Configuration_test.cpp index d1f1030632..aadcbd1241 100644 --- a/src/mc/explo/udpor/Configuration_test.cpp +++ b/src/mc/explo/udpor/Configuration_test.cpp @@ -464,7 +464,7 @@ TEST_CASE("simgrid::mc::udpor::maximal_subsets_iterator: Basic Testing of Maxima // Only events in `interesting_bunch` can appear: thus no set // should include anything else other than `interesting_bunch` REQUIRE(event_set.is_subset_of(interesting_bunch)); - REQUIRE(event_set.is_maximal_event_set()); + REQUIRE(event_set.is_maximal()); maximal_subset_counts[event_set.size()]++; } @@ -497,7 +497,7 @@ TEST_CASE("simgrid::mc::udpor::maximal_subsets_iterator: Basic Testing of Maxima // Only events in `interesting_bunch` can appear: thus no set // should include anything else other than `interesting_bunch` REQUIRE(event_set.is_subset_of(interesting_bunch)); - REQUIRE(event_set.is_maximal_event_set()); + REQUIRE(event_set.is_maximal()); maximal_subset_counts[event_set.size()]++; } @@ -561,7 +561,7 @@ TEST_CASE("simgrid::mc::udpor::maximal_subsets_iterator: Stress Test for Maximal for (; first != last; ++first) { REQUIRE((*first).size() <= C.get_events().size()); - REQUIRE((*first).is_maximal_event_set()); + REQUIRE((*first).is_maximal()); } } } \ No newline at end of file diff --git a/src/mc/explo/udpor/EventSet.cpp b/src/mc/explo/udpor/EventSet.cpp index 5417103f13..3982cbeeae 100644 --- a/src/mc/explo/udpor/EventSet.cpp +++ b/src/mc/explo/udpor/EventSet.cpp @@ -129,7 +129,7 @@ bool EventSet::contains(const History& history) const return std::all_of(history.begin(), history.end(), [=](const UnfoldingEvent* e) { return this->contains(e); }); } -bool EventSet::is_maximal_event_set() const +bool EventSet::is_maximal() const { const History history(*this); return *this == history.get_all_maximal_events(); diff --git a/src/mc/explo/udpor/EventSet.hpp b/src/mc/explo/udpor/EventSet.hpp index b9b635ff18..f682224011 100644 --- a/src/mc/explo/udpor/EventSet.hpp +++ b/src/mc/explo/udpor/EventSet.hpp @@ -75,7 +75,7 @@ public: * 1. For each event `e` in `E`, there is no event * `e'` in `E` such that `e < e'` */ - bool is_maximal_event_set() const; + bool is_maximal() const; }; } // namespace simgrid::mc::udpor diff --git a/src/mc/explo/udpor/EventSet_test.cpp b/src/mc/explo/udpor/EventSet_test.cpp index d7342b39a6..534a616e38 100644 --- a/src/mc/explo/udpor/EventSet_test.cpp +++ b/src/mc/explo/udpor/EventSet_test.cpp @@ -642,81 +642,81 @@ TEST_CASE("simgrid::mc::udpor::EventSet: Testing Configurations") SECTION("Maximal event sets") { // 6 choose 0 = 1 test - REQUIRE(EventSet().is_maximal_event_set()); + REQUIRE(EventSet().is_maximal()); // 6 choose 1 = 6 tests - REQUIRE(EventSet({&e1}).is_maximal_event_set()); - REQUIRE(EventSet({&e2}).is_maximal_event_set()); - REQUIRE(EventSet({&e3}).is_maximal_event_set()); - REQUIRE(EventSet({&e4}).is_maximal_event_set()); - REQUIRE(EventSet({&e5}).is_maximal_event_set()); - REQUIRE(EventSet({&e6}).is_maximal_event_set()); + REQUIRE(EventSet({&e1}).is_maximal()); + REQUIRE(EventSet({&e2}).is_maximal()); + REQUIRE(EventSet({&e3}).is_maximal()); + REQUIRE(EventSet({&e4}).is_maximal()); + REQUIRE(EventSet({&e5}).is_maximal()); + REQUIRE(EventSet({&e6}).is_maximal()); // 6 choose 2 = 15 tests - REQUIRE_FALSE(EventSet({&e1, &e2}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e4}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e4}).is_maximal_event_set()); - REQUIRE(EventSet({&e2, &e5}).is_maximal_event_set()); - REQUIRE(EventSet({&e2, &e6}).is_maximal_event_set()); - REQUIRE(EventSet({&e3, &e4}).is_maximal_event_set()); - REQUIRE(EventSet({&e3, &e5}).is_maximal_event_set()); - REQUIRE(EventSet({&e3, &e6}).is_maximal_event_set()); - REQUIRE(EventSet({&e4, &e5}).is_maximal_event_set()); - REQUIRE(EventSet({&e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e5, &e6}).is_maximal_event_set()); + REQUIRE_FALSE(EventSet({&e1, &e2}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e4}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e4}).is_maximal()); + REQUIRE(EventSet({&e2, &e5}).is_maximal()); + REQUIRE(EventSet({&e2, &e6}).is_maximal()); + REQUIRE(EventSet({&e3, &e4}).is_maximal()); + REQUIRE(EventSet({&e3, &e5}).is_maximal()); + REQUIRE(EventSet({&e3, &e6}).is_maximal()); + REQUIRE(EventSet({&e4, &e5}).is_maximal()); + REQUIRE(EventSet({&e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e5, &e6}).is_maximal()); // 6 choose 3 = 20 tests - REQUIRE_FALSE(EventSet({&e1, &e2, &e3}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e4}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3, &e4}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e4, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3, &e4}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e4, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e5, &e6}).is_maximal_event_set()); - REQUIRE(EventSet({&e3, &e4, &e5}).is_maximal_event_set()); - REQUIRE(EventSet({&e3, &e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e3, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e4, &e5, &e6}).is_maximal_event_set()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e4}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3, &e4}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e4, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3, &e4}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e4, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e5, &e6}).is_maximal()); + REQUIRE(EventSet({&e3, &e4, &e5}).is_maximal()); + REQUIRE(EventSet({&e3, &e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e3, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e4, &e5, &e6}).is_maximal()); // 6 choose 4 = 15 tests - REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e4, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3, &e4, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3, &e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e4, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3, &e4, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3, &e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e4, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e3, &e4, &e5, &e6}).is_maximal_event_set()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e4, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3, &e4, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3, &e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e4, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3, &e4, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3, &e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e4, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e3, &e4, &e5, &e6}).is_maximal()); // 6 choose 5 = 6 tests - REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4, &e5}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e2, &e4, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e1, &e3, &e4, &e5, &e6}).is_maximal_event_set()); - REQUIRE_FALSE(EventSet({&e2, &e3, &e4, &e5, &e6}).is_maximal_event_set()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4, &e5}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e4, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e1, &e3, &e4, &e5, &e6}).is_maximal()); + REQUIRE_FALSE(EventSet({&e2, &e3, &e4, &e5, &e6}).is_maximal()); // 6 choose 6 = 1 test - REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4, &e5, &e6}).is_maximal_event_set()); + REQUIRE_FALSE(EventSet({&e1, &e2, &e3, &e4, &e5, &e6}).is_maximal()); } } \ No newline at end of file -- 2.20.1