3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-06 06:16:02 +00:00

merge changes from master

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2023-10-05 07:50:13 -07:00
parent 45c0ed126e
commit b61f4ac51f
4 changed files with 29 additions and 11 deletions

View file

@ -2115,6 +2115,9 @@ public:
flush_bound_axioms();
// disabled in master:
propagate_nla();
if (ctx().inconsistent())
return true;
if (!can_propagate_core())
return false;
@ -2212,6 +2215,9 @@ public:
}
void propagate_bounds_with_lp_solver() {
if (!should_propagate())
return;
m_bp.init();
lp().propagate_bounds_for_touched_rows(m_bp);
@ -3546,7 +3552,6 @@ public:
if (r == l_true) {
nctx.display_asserted_formulas(std::cout);
std::cout.flush();
std::cout.flush();
}
return l_true != r;
}