mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

simplify patch_blocker()

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-04-06 15:32:35 -07:00
parent 80994f74bf
commit c846902285
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/math/lp/nla_core.cpp
View file

@ -1370,7 +1370,7 @@ void core::update_to_refine_of_var(lpvar j) {
} }
} }
bool core::patch_blocker(lpvar patched_j, lpvar u, const monic& m) const { bool core::patch_blocker(lpvar u, const monic& m) const {
SASSERT(m_to_refine.contains(m.var())); SASSERT(m_to_refine.contains(m.var()));
if (var_is_used_in_a_correct_monic(u)) { if (var_is_used_in_a_correct_monic(u)) {
TRACE("nla_solver", tout << "u = " << u << " blocked as used in a correct monomial\n";); TRACE("nla_solver", tout << "u = " << u << " blocked as used in a correct monomial\n";);
@ -1391,7 +1391,10 @@ bool core::patch_blocker(lpvar patched_j, lpvar u, const monic& m) const {
bool core::try_to_patch(lpvar k, const rational& v, const monic & m) { bool core::try_to_patch(lpvar k, const rational& v, const monic & m) {
return m_lar_solver.try_to_patch(k, v, return m_lar_solver.try_to_patch(k, v,
[this, k, m](lpvar u) { return patch_blocker(k, u, m); }, [this, k, m](lpvar u) {
if (u == k)
return false; // ok to patch
return patch_blocker(u, m); },
[this](lpvar u) { update_to_refine_of_var(u); }); [this](lpvar u) { update_to_refine_of_var(u); });
} }

2
src/math/lp/nla_core.h
View file

@ -423,7 +423,7 @@ public:
void update_to_refine_of_var(lpvar j); void update_to_refine_of_var(lpvar j);
bool try_to_patch(lpvar, const rational&, const monic&); bool try_to_patch(lpvar, const rational&, const monic&);
bool to_refine_is_correct() const; bool to_refine_is_correct() const;
bool patch_blocker(lpvar patched_j, lpvar u, const monic& m) const; bool patch_blocker(lpvar u, const monic& m) const;
}; // end of core }; // end of core
struct pp_mon { struct pp_mon {