Rename mc::CheckerAlgorithm to mc::ExplorationAlgorithm, because that's what it is

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index 96d76b6..3cd08dc 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -31,7 +31,7 @@ XBT_LOG_EXTERNAL_CATEGORY(mc_global);
 namespace simgrid {
 namespace mc {
 
-simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo)
+simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::ExplorationAlgorithm algo)
 {
   session_ = std::make_unique<simgrid::mc::Session>([argv] {
     int i = 1;
@@ -45,19 +45,19 @@ simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::CheckerAlgor
 
   simgrid::mc::Exploration* explo;
   switch (algo) {
-    case CheckerAlgorithm::CommDeterminism:
+    case ExplorationAlgorithm::CommDeterminism:
       explo = simgrid::mc::create_communication_determinism_checker(session_.get());
       break;
 
-    case CheckerAlgorithm::UDPOR:
+    case ExplorationAlgorithm::UDPOR:
       explo = simgrid::mc::create_udpor_checker(session_.get());
       break;
 
-    case CheckerAlgorithm::Safety:
+    case ExplorationAlgorithm::Safety:
       explo = simgrid::mc::create_safety_checker(session_.get());
       break;
 
-    case CheckerAlgorithm::Liveness:
+    case ExplorationAlgorithm::Liveness:
       explo = simgrid::mc::create_liveness_checker(session_.get());
       break;
 

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index 0e6ee9a..39d658e 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -20,7 +20,7 @@
 namespace simgrid {
 namespace mc {
 
-XBT_DECLARE_ENUM_CLASS(CheckerAlgorithm, Safety, UDPOR, Liveness, CommDeterminism);
+XBT_DECLARE_ENUM_CLASS(ExplorationAlgorithm, Safety, UDPOR, Liveness, CommDeterminism);
 
 /*
 ** This class aimes to implement FACADE APIs for simgrid. The FACADE layer sits between the CheckerSide
@@ -54,7 +54,7 @@ public:
     return api;
   }
 
-  simgrid::mc::Exploration* initialize(char** argv, simgrid::mc::CheckerAlgorithm algo);
+  simgrid::mc::Exploration* initialize(char** argv, simgrid::mc::ExplorationAlgorithm algo);
 
   // ACTOR APIs
   std::vector<simgrid::mc::ActorInformation>& get_actors() const;

diff --git a/src/mc/explo/simgrid_mc.cpp b/src/mc/explo/simgrid_mc.cpp
index 6d47450..afd997a 100644 (file)
--- a/src/mc/explo/simgrid_mc.cpp
+++ b/src/mc/explo/simgrid_mc.cpp
@@ -34,15 +34,15 @@ int main(int argc, char** argv)
 #endif
   sg_config_init(&argc, argv);
 
-  simgrid::mc::CheckerAlgorithm algo;
+  simgrid::mc::ExplorationAlgorithm algo;
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
-    algo = simgrid::mc::CheckerAlgorithm::CommDeterminism;
+    algo = simgrid::mc::ExplorationAlgorithm::CommDeterminism;
   else if (_sg_mc_unfolding_checker)
-    algo = simgrid::mc::CheckerAlgorithm::UDPOR;
+    algo = simgrid::mc::ExplorationAlgorithm::UDPOR;
   else if (_sg_mc_property_file.get().empty())
-    algo = simgrid::mc::CheckerAlgorithm::Safety;
+    algo = simgrid::mc::ExplorationAlgorithm::Safety;
   else
-    algo = simgrid::mc::CheckerAlgorithm::Liveness;
+    algo = simgrid::mc::ExplorationAlgorithm::Liveness;
 
   int res      = SIMGRID_MC_EXIT_SUCCESS;
   std::unique_ptr<simgrid::mc::Exploration> checker{simgrid::mc::Api::get().initialize(argv_copy.data(), algo)};