- auto acceptance_pairs = simgrid::xbt::range<simgrid::mc::VisitedPair*>(::acceptance_pairs);
- auto new_pair =
- std::unique_ptr<simgrid::mc::VisitedPair>(new VisitedPair(
- pair->num, pair->automaton_state, pair->atomic_propositions.get(),
- pair->graph_state));
- new_pair->acceptance_pair = 1;
-
- auto res = std::equal_range(acceptance_pairs.begin(), acceptance_pairs.end(),
- new_pair, simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
-
- if (pair->search_cycle == 1)
- for (auto i = res.first; i != res.second; ++i) {
- simgrid::mc::VisitedPair* pair_test = *i;
- if (xbt_automaton_state_compare(pair_test->automaton_state, new_pair->automaton_state) == 0) {
- if (xbt_automaton_propositional_symbols_compare_value(
- pair_test->atomic_propositions.get(),
- new_pair->atomic_propositions.get()) == 0) {
- if (this->compare(pair_test, new_pair.get()) == 0) {
- XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
- xbt_fifo_shift(mc_stack);
- if (dot_output != nullptr)
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, pair_test->num, initial_global_state->prev_req);
- return nullptr;
- }
- }
- }
- }
+ std::shared_ptr<VisitedPair> new_pair = std::make_shared<VisitedPair>(
+ pair->num, pair->automaton_state, pair->atomic_propositions,
+ pair->graph_state);
+
+ auto res = std::equal_range(acceptancePairs_.begin(), acceptancePairs_.end(),
+ new_pair.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
+
+ if (pair->search_cycle) for (auto i = res.first; i != res.second; ++i) {
+ std::shared_ptr<simgrid::mc::VisitedPair> const& pair_test = *i;
+ if (xbt_automaton_state_compare(
+ pair_test->automaton_state, new_pair->automaton_state) != 0
+ || pair_test->atomic_propositions != new_pair->atomic_propositions
+ || this->compare(pair_test.get(), new_pair.get()) != 0)
+ continue;
+ XBT_INFO("Pair %d already reached (equal to pair %d) !",
+ new_pair->num, pair_test->num);
+ livenessStack_.pop_back();
+ if (dot_output != nullptr)
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
+ initial_global_state->prev_pair, pair_test->num,
+ initial_global_state->prev_req);
+ return nullptr;
+ }