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

note that inline_vars isnt supported fix #3146

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-04 10:14:22 -08:00
parent 6b12da0b45
commit 6cbcd13224
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nlsat/nlsat_params.pyg
View file

@ -12,7 +12,7 @@ def_module_params('nlsat',
('randomize', BOOL, True, "randomize selection of a witness in nlsat."), ('randomize', BOOL, True, "randomize selection of a witness in nlsat."),
('max_conflicts', UINT, UINT_MAX, "maximum number of conflicts."), ('max_conflicts', UINT, UINT_MAX, "maximum number of conflicts."),
('shuffle_vars', BOOL, False, "use a random variable order."), ('shuffle_vars', BOOL, False, "use a random variable order."),
('inline_vars', BOOL, False, "inline variables that can be isolated from equations"), ('inline_vars', BOOL, False, "inline variables that can be isolated from equations (not supported in incremental mode)"),
('seed', UINT, 0, "random seed."), ('seed', UINT, 0, "random seed."),
('factor', BOOL, True, "factor polynomials produced during conflict resolution.") ('factor', BOOL, True, "factor polynomials produced during conflict resolution.")
)) ))

29
src/nlsat/nlsat_solver.cpp
View file

@ -1565,8 +1565,9 @@ namespace nlsat {
bool reordered = false; bool reordered = false;
if (!m_incremental && m_inline_vars) if (!m_incremental && m_inline_vars)
simplify(); if (!simplify())
return l_false;
if (!can_reorder()) { if (!can_reorder()) {
} }
@ -2604,7 +2605,7 @@ namespace nlsat {
The method ignores lemmas and assumes constraints don't use roots. The method ignores lemmas and assumes constraints don't use roots.
*/ */
void simplify() { bool simplify() {
polynomial_ref p(m_pm), q(m_pm); polynomial_ref p(m_pm), q(m_pm);
var v; var v;
init_var_signs(); init_var_signs();
@ -2619,12 +2620,14 @@ namespace nlsat {
m_patch_num.push_back(q); m_patch_num.push_back(q);
m_patch_denom.push_back(p); m_patch_denom.push_back(p);
del_clause(c, m_clauses); del_clause(c, m_clauses);
substitute_var(v, p, q); if (!substitute_var(v, p, q))
return false;
change = true; change = true;
break; break;
} }
} }
} }
return true;
} }
void fix_patch() { void fix_patch() {
@ -2645,7 +2648,8 @@ namespace nlsat {
} }
} }
void substitute_var(var x, poly* p, poly* q) { bool substitute_var(var x, poly* p, poly* q) {
bool is_sat = true;
polynomial_ref pr(m_pm); polynomial_ref pr(m_pm);
polynomial_ref_vector ps(m_pm); polynomial_ref_vector ps(m_pm);
u_map<literal> b2l; u_map<literal> b2l;
@ -2680,14 +2684,16 @@ namespace nlsat {
} }
} }
} }
update_clauses(b2l); is_sat = update_clauses(b2l);
for (auto const& kv : b2l) { for (auto const& kv : b2l) {
dec_ref(kv.m_value); dec_ref(kv.m_value);
} }
return is_sat;
} }
void update_clauses(u_map<literal> const& b2l) { bool update_clauses(u_map<literal> const& b2l) {
bool is_sat = true;
literal_vector lits; literal_vector lits;
clause_vector to_delete; clause_vector to_delete;
unsigned n = m_clauses.size(); unsigned n = m_clauses.size();
@ -2714,7 +2720,13 @@ namespace nlsat {
} }
if (changed) { if (changed) {
to_delete.push_back(c); to_delete.push_back(c);
if (!is_tautology) { if (is_tautology) {
continue;
}
if (lits.empty()) {
is_sat = false;
}
else {
mk_clause(lits.size(), lits.c_ptr(), c->is_learned(), static_cast<_assumption_set>(c->assumptions())); mk_clause(lits.size(), lits.c_ptr(), c->is_learned(), static_cast<_assumption_set>(c->assumptions()));
} }
} }
@ -2722,6 +2734,7 @@ namespace nlsat {
for (clause* c : to_delete) { for (clause* c : to_delete) {
del_clause(c, m_clauses); del_clause(c, m_clauses);
} }
return is_sat;
} }
bool is_unit_ineq(clause const& c) const { bool is_unit_ineq(clause const& c) const {