X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1459ae1f3ca27cf74f3592980445151049defd1..cf75523de37862d1f4eddaa1cbdd276f20755fea:/src/mc/LivenessChecker.cpp diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp index 8dae669664..4f60bc148a 100644 --- a/src/mc/LivenessChecker.cpp +++ b/src/mc/LivenessChecker.cpp @@ -6,10 +6,11 @@ #include -#include #include #include +#include + #include #include @@ -124,7 +125,7 @@ std::shared_ptr LivenessChecker::insertAcceptancePair(simgrid::mc:: pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state); - auto res = std::equal_range(acceptancePairs_.begin(), acceptancePairs_.end(), + auto res = boost::range::equal_range(acceptancePairs_, new_pair.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap()); if (pair->search_cycle) for (auto i = res.first; i != res.second; ++i) { @@ -245,7 +246,7 @@ int LivenessChecker::insertVisitedPair(std::shared_ptr visited_pair pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state); - auto range = std::equal_range(visitedPairs_.begin(), visitedPairs_.end(), + auto range = boost::range::equal_range(visitedPairs_, visited_pair.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap()); for (auto i = range.first; i != range.second; ++i) { @@ -277,8 +278,7 @@ void LivenessChecker::purgeVisitedPairs() { if (_sg_mc_visited != 0 && visitedPairs_.size() > (std::size_t) _sg_mc_visited) { // Remove the oldest entry with a linear search: - visitedPairs_.erase(std::min_element( - visitedPairs_.begin(), visitedPairs_.end(), + visitedPairs_.erase(boost::min_element(visitedPairs_, [](std::shared_ptr const a, std::shared_ptr const& b) { return a->num < b->num; } )); } @@ -445,8 +445,8 @@ std::shared_ptr LivenessChecker::newPair(Pair* current_pair, xbt_automaton next_pair->depth = 1; /* Get enabled processes and insert them in the interleave set of the next graph_state */ for (auto& p : mc_model_checker->process().simix_processes()) - if (simgrid::mc::process_is_enabled(&p.copy)) - next_pair->graph_state->interleave(&p.copy); + if (simgrid::mc::process_is_enabled(p.copy.getBuffer())) + next_pair->graph_state->interleave(p.copy.getBuffer()); next_pair->requests = next_pair->graph_state->interleaveSize(); /* FIXME : get search_cycle value for each acceptant state */ if (next_pair->automaton_state->type == 1 ||