}
}
-Pair::Pair() : num(++mc_stats->expanded_pairs)
+Pair::Pair(unsigned long expanded_pairs) : num(expanded_pairs)
{}
Pair::~Pair() {}
}
/* Update statistics */
- mc_stats->visited_pairs++;
- mc_stats->executed_transitions++;
+ visitedPairsCount_++;
+ mc_model_checker->executed_transitions++;
depth++;
return res;
}
+void LivenessChecker::logState() // override
+{
+ Checker::logState();
+ XBT_INFO("Expanded pairs = %lu", expandedPairsCount_);
+ XBT_INFO("Visited pairs = %lu", visitedPairsCount_);
+ XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions);
+}
+
void LivenessChecker::showAcceptanceCycle(std::size_t depth)
{
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
simgrid::mc::request_to_string(
req, req_num, simgrid::mc::RequestType::simix).c_str());
- /* Update mc_stats */
- mc_stats->executed_transitions++;
+ /* Update stats */
+ mc_model_checker->executed_transitions++;
if (!current_pair->exploration_started)
- mc_stats->visited_pairs++;
+ visitedPairsCount_++;
/* Answer the request */
mc_model_checker->handle_simcall(current_pair->graph_state->transition);
std::shared_ptr<Pair> LivenessChecker::newPair(Pair* current_pair, xbt_automaton_state_t state, std::shared_ptr<const std::vector<int>> propositions)
{
- std::shared_ptr<Pair> next_pair = std::make_shared<Pair>();
+ std::shared_ptr<Pair> next_pair = std::make_shared<Pair>(++expandedPairsCount_);
next_pair->automaton_state = state;
- next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new());
+ next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new(++expandedStatesCount_));
next_pair->atomic_propositions = std::move(propositions);
if (current_pair)
next_pair->depth = current_pair->depth + 1;