mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 11:55:51 +00:00
Code Activity

use lazy explanation function for slices, use euf-bv-plugin to extract slices

Browse source
This commit is contained in:
Nikolaj Bjorner 2023-12-23 11:10:18 -08:00
parent 5bbec43235
commit fbbad72c29
11 changed files with 243 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/sat/smt/polysat_solver.cpp
View file

@ -24,7 +24,7 @@ The result of polysat::core::check is one of:
--*/
#include "ast/euf/euf_bv_plugin.h"
#include "sat/smt/polysat_solver.h"
#include "sat/smt/euf_solver.h"
#include "sat/smt/polysat/ule_constraint.h"
@ -144,26 +144,6 @@ namespace polysat {
return { core, eqs };
}
// If an MCSat lemma is added, then backjump based on the lemma level and
// add the lemma to the solver with potentially fresh literals.
// return l_false to signal sat::solver that backjumping has been taken care of internally.
lbool solver::resolve_conflict() {
if (!m_has_lemma)
return l_undef;
SASSERT(m_lemma_level > 0);
unsigned num_scopes = s().scope_lvl() - m_lemma_level - 1;
NOT_IMPLEMENTED_YET();
// s().pop_reinit(num_scopes);
sat::literal_vector lits;
for (auto* e : m_lemma)
lits.push_back(~ctx.mk_literal(e));
s().add_clause(lits.size(), lits.data(), sat::status::th(true, get_id(), nullptr));
return l_false;
}
// Create an equality literal that represents the value assignment
// Prefer case split to true.
// The equality gets added in a callback using asserted().
@ -269,9 +249,12 @@ namespace polysat {
auto [v1, v2] = d.eq();
lits.push_back(~eq_internalize(var2enode(v1), var2enode(v2)));
}
else if (d.is_eqs()) {
for (auto [v1, v2] : d.eqs())
lits.push_back(~eq_internalize(var2enode(v1), var2enode(v2)));
else if (d.is_offset_claim()) {
auto [v, w, offset] = d.offset();
std::function<void(euf::enode*, euf::enode*)> consume = [&](auto* a, auto* b) {
lits.push_back(~eq_internalize(a, b));
};
explain_slice(v, w, offset, consume);
}
else {
SASSERT(d.is_axiom());