mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-25 15:09:32 +00:00
Code Activity

updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-11-19 14:02:27 -08:00
parent 5d316a51d1
commit 823800541e
3 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/math/lp/nla_order_lemmas.cpp
View file

@ -24,6 +24,8 @@ void order::order_lemma() {
TRACE(nla_solver, tout << "not generating order lemmas\n";);
return;
}
if (!c().params().arith_nl_linearize())
return;
for (auto j : c().m_to_refine) {
if (done()) break;

9
src/math/lp/nra_solver.cpp
View file

@ -129,6 +129,7 @@ struct solver::imp {
}
auto lit = add_constraint(p, ci, k);
}
definitions.reset();
}
void setup_solver_terms() {
@ -153,10 +154,10 @@ struct solver::imp {
continue;
auto value = m_nla_core.val(v);
SASSERT(value.is_int());
unsigned sz = m_model_bounds.size();
unsigned offset = m_model_bounds.size() + m_max_constraint_index;
m_model_bounds.push_back({v, value, true});
m_model_bounds.push_back({v, value, false});
m_nlsat->track_model_value(lp2nl(v), value, this + sz, this + sz + 1);
m_nlsat->track_model_value(lp2nl(v), value, this + offset, this + offset + 1);
}
}
@ -174,7 +175,7 @@ struct solver::imp {
lbool check() {
SASSERT(need_check());
reset();
vector<nlsat::assumption, false> core;
vector<nlsat::assumption, false> core;
smt_params_helper p(m_params);
@ -250,6 +251,7 @@ struct solver::imp {
nla::lemma_builder lemma(m_nla_core, __FUNCTION__);
for (auto c : core) {
unsigned idx = static_cast<unsigned>(static_cast<imp*>(c) - this);
TRACE(nra, tout << "core index " << idx << " " << m_max_constraint_index << "\n");
if (idx <= m_max_constraint_index)
ex.push_back(idx);
else {
@ -360,6 +362,7 @@ struct solver::imp {
}
nlsat::literal add_constraint(polynomial::polynomial *p, unsigned idx, lp::lconstraint_kind k) {
m_max_constraint_index = std::max(m_max_constraint_index, idx);
polynomial::polynomial *ps[1] = {p};
bool is_even[1] = {false};
nlsat::literal lit;