mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-06-30 04:18:53 +00:00
Code Activity

add stubs for bounds refinement

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-11-19 10:42:28 -08:00
parent 179601ffac
commit 5de01e5d1d
7 changed files with 369 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/nlsat/nlsat_params.pyg
View file

@ -8,6 +8,7 @@ def_module_params('nlsat',
('cell_sample', BOOL, True, "cell sample projection"),
('lazy', UINT, 0, "how lazy the solver is."),
('reorder', BOOL, True, "reorder variables."),
('model_bounds', BOOL, False, "constraint integer search using model bounds."),
('log_lemmas', BOOL, False, "display lemmas as self-contained SMT formulas"),
('dump_mathematica', BOOL, False, "display lemmas as matematica"),
('check_lemmas', BOOL, False, "check lemmas on the fly using an independent nlsat solver"),

51
src/nlsat/nlsat_solver.cpp
View file

@ -1918,6 +1918,36 @@ namespace nlsat {
<< " :propagations " << m_stats.m_propagations
<< " :clauses " << m_clauses.size()
<< " :learned " << m_learned.size() << ")\n");
#if 0
// todo, review, test
// cut on the first model value
if (!m_model_values.empty()) {
bool found = false;
for (auto const &[x, bound] : bounds) {
for (auto const &[mx, mvalue, lo, hi] : m_model_values) {
if (mx == x) {
polynomial_ref p(m_pm);
rational one(1);
bool is_even = false;
p = m_pm.mk_linear(1, &one, &x, mvalue);
auto* p1 = p.get();
if (mvalue < bound) {
mk_external_clause(1, &mk_ineq_literal(atom::GT, 1, &p1, &is_even), assumption(lo));
}
else {
mk_external_clause(1, &mk_ineq_literal(atom::LT, 1, &p1, &is_even), assumption(hi));
}
found = true;
break;
}
}
if (found)
break;
}
}
#endif
for (auto const& b : bounds) {
var x = b.first;
rational lo = b.second;
@ -1944,6 +1974,19 @@ namespace nlsat {
return r;
}
struct model_value {
var x;
rational v;
_assumption_set lo, hi;
};
vector<model_value> m_model_values;
void track_model_value(var x, rational const &v, _assumption_set lo, _assumption_set hi) {
m_model_values.push_back(model_value{x, v, lo, hi});
}
void reset_model_values() {
m_model_values.reset();
}
bool m_reordered = false;
bool simple_check() {
literal_vector learned_unit;
@ -4388,6 +4431,14 @@ namespace nlsat {
assumption solver::join(assumption a, assumption b) {
return (m_imp->m_asm.mk_join(static_cast<imp::_assumption_set>(a), static_cast<imp::_assumption_set>(b)));
}
void solver::track_model_value(var x, rational const& v, assumption lo, assumption hi) {
m_imp->track_model_value(x, v, static_cast<imp::_assumption_set>(lo), static_cast<imp::_assumption_set>(hi));
}
void solver::reset_model_values() {
m_imp->reset_model_values();
}
};

4
src/nlsat/nlsat_solver.h
View file

@ -133,6 +133,10 @@ namespace nlsat {
*/
void mk_clause(unsigned num_lits, literal * lits, assumption a = nullptr);
void track_model_value(var x, rational const &v, assumption lo, assumption hi);
void reset_model_values();
// -----------------------
//
// Basic