mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 11:42:28 +00:00
Code Activity

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-01-26 21:53:10 +01:00
commit d1fcc41c7f
8 changed files with 121 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/sat/smt/bv_polysat.cpp
View file

@ -204,7 +204,7 @@ namespace bv {
sat::literal lit(a->m_bv, sign);
if (sign)
sc = ~sc;
m_polysat.assign_eh(sc, 1 + 2*lit.index());
m_polysat.assign_eh(sc, polysat::dependency(1 + 2*lit.index()));
}
bool solver::polysat_merge_eh(theory_var r1, theory_var r2, theory_var v1, theory_var v2) {
@ -215,7 +215,7 @@ namespace bv {
auto sc = m_polysat.eq(p, q);
m_var_eqs.setx(m_var_eqs_head, std::make_pair(v1, v2), std::make_pair(v1, v2));
ctx.push(value_trail<unsigned>(m_var_eqs_head));
m_polysat.assign_eh(sc, 2 * m_var_eqs_head);
m_polysat.assign_eh(sc, polysat::dependency(2 * m_var_eqs_head));
m_var_eqs_head++;
return true;
}
@ -226,7 +226,7 @@ namespace bv {
pdd q = var2pdd(v2);
auto sc = ~m_polysat.eq(p, q);
sat::literal neq = ~expr2literal(ne.eq());
m_polysat.assign_eh(sc, 1 + 2 * neq.index());
m_polysat.assign_eh(sc, polysat::dependency(1 + 2 * neq.index()));
return true;
}
@ -248,15 +248,15 @@ namespace bv {
}
void solver::polysat_core() {
svector<polysat::dep_t> deps;
polysat::dependency_vector deps;
sat::literal_vector core;
euf::enode_pair_vector eqs;
m_polysat.unsat_core(deps);
for (auto n : deps) {
if (0 != (n & 1))
core.push_back(sat::to_literal(n / 2));
if (0 != (n.val() & 1))
core.push_back(sat::to_literal(n.val() / 2));
else {
auto [v1, v2] = m_var_eqs[n / 2];
auto [v1, v2] = m_var_eqs[n.val() / 2];
eqs.push_back(euf::enode_pair(var2enode(v1), var2enode(v2)));
}
}
@ -321,4 +321,4 @@ namespace bv {
VERIFY(m_polysat.try_eval(p, val));
values[n->get_root_id()] = bv.mk_numeral(val, get_bv_size(n));
}
}
}