#ifndef SIMGRID_MC_SAFETY_CHECKER_HPP
#define SIMGRID_MC_SAFETY_CHECKER_HPP
-#include "src/mc/VisitedState.hpp"
+#include "src/mc/api/State.hpp"
#include "src/mc/explo/Exploration.hpp"
+#if SIMGRID_HAVE_STATEFUL_MC
+#include "src/mc/VisitedState.hpp"
+#endif
+
#include <list>
#include <memory>
+#include <set>
#include <string>
#include <vector>
namespace simgrid::mc {
-typedef std::list<std::shared_ptr<State>> stack_t;
-
-/* Used to compare two stacks and decide which one is better to backtrack,
- * regarding the chosen guide in the last state. */
-class OpenedStatesCompare {
-public:
- bool operator()(std::shared_ptr<State> const& lhs, std::shared_ptr<State> const& rhs)
- {
- return lhs->next_transition_guided().second < rhs->next_transition_guided().second;
- }
-};
+using stack_t = std::list<std::shared_ptr<State>>;
class XBT_PRIVATE DFSExplorer : public Exploration {
-
XBT_DECLARE_ENUM_CLASS(ReductionMode, none, dpor);
ReductionMode reduction_mode_;
/** Stack representing the position in the exploration graph */
stack_t stack_;
+#if SIMGRID_HAVE_STATEFUL_MC
VisitedStates visited_states_;
std::unique_ptr<VisitedState> visited_state_;
+#else
+ void* visited_state_ = nullptr; /* The code uses it to detect whether we are doing stateful MC */
+#endif
/** Opened states are states that still contains todo actors.
* When backtracking, we pick a state from it*/
-
- std::priority_queue<std::shared_ptr<State>, std::vector<std::shared_ptr<State>>, OpenedStatesCompare> opened_states_;
+ std::vector<std::shared_ptr<State>> opened_states_;
+ std::shared_ptr<State> best_opened_state();
/** Change current stack_ value to correspond to the one we would have
* had if we executed transition to get to state. This is required when
