michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(library/blast/state): inactive hypotheses should be printed "after" active ones

Browse source
This commit is contained in:
Leonardo de Moura 2015-12-30 11:46:41 -08:00
parent 2a454ce791
commit f2d4e81889
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/library/blast/state.cpp
View file

@ -517,9 +517,21 @@ struct hypothesis_dep_depth_lt {
bool operator()(unsigned hidx1, unsigned hidx2) const { bool operator()(unsigned hidx1, unsigned hidx2) const {
hypothesis const & h1 = m_state.get_hypothesis_decl(hidx1); hypothesis const & h1 = m_state.get_hypothesis_decl(hidx1);
hypothesis const & h2 = m_state.get_hypothesis_decl(hidx2); hypothesis const & h2 = m_state.get_hypothesis_decl(hidx2);
return bool act1 = m_state.is_active(hidx1);
h1.get_dep_depth() < h2.get_dep_depth() && bool act2 = m_state.is_active(hidx2);
(h1.get_dep_depth() == h2.get_dep_depth() && hidx1 < hidx2); if (act1 != act2) {
return act1 && !act2; // active hypotheses should occur before non-active ones
} else if (act1) {
lean_assert(act1 && act2);
if (h1.get_dep_depth() != h2.get_dep_depth())
return h1.get_dep_depth() < h2.get_dep_depth();
else
return hidx1 < hidx2;
} else {
// for inactive hypotheses we just compare hidx's
lean_assert(!act1 && !act2);
return hidx1 < hidx2;
}
} }
}; };

2
src/library/blast/state.h
View file

@ -301,6 +301,8 @@ public:
optional<hypothesis_idx> select_hypothesis_to_activate(); optional<hypothesis_idx> select_hypothesis_to_activate();
void activate_hypothesis(hypothesis_idx hidx); void activate_hypothesis(hypothesis_idx hidx);
bool is_active(hypothesis_idx hidx) const { return m_branch.m_active.contains(hidx); }
/** \brief Deactivate all active hypotheses */ /** \brief Deactivate all active hypotheses */
void deactivate_all(); void deactivate_all();