mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

prepare for variable scoping and autarkies

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-12-13 20:11:16 -08:00
parent aeabdb4aae
commit a74d18a695
18 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sat/sat_asymm_branch.h
View file

@ -42,7 +42,6 @@ namespace sat {
unsigned m_asymm_branch_rounds;
unsigned m_asymm_branch_delay;
bool m_asymm_branch_sampled;
bool m_asymm_branch_propagate;
bool m_asymm_branch_all;
int64 m_asymm_branch_limit;

3
src/sat/sat_elim_eqs.cpp
View file

@ -182,7 +182,8 @@ namespace sat {
literal l(v, false);
literal r = roots[v];
SASSERT(v != r.var());
if (m_solver.is_external(v) || !m_solver.set_root(l, r)) {
if (m_solver.is_external(v)) {
m_solver.set_root(l, r);
// cannot really eliminate v, since we have to notify extension of future assignments
m_solver.mk_bin_clause(~l, r, false);
m_solver.mk_bin_clause(l, ~r, false);

4
src/sat/sat_elim_vars.cpp
View file

@ -123,13 +123,13 @@ namespace sat{
TRACE("elim_vars",
tout << "eliminate " << v << "\n";
for (watched const& w : simp.get_wlist(~pos_l)) {
if (w.is_binary_unblocked_clause()) {
if (w.is_binary_non_learned_clause()) {
tout << pos_l << " " << w.get_literal() << "\n";
}
}
m.display(tout, b1);
for (watched const& w : simp.get_wlist(~neg_l)) {
if (w.is_binary_unblocked_clause()) {
if (w.is_binary_non_learned_clause()) {
tout << neg_l << " " << w.get_literal() << "\n";
}
}

2
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -305,7 +305,7 @@ public:
return 0;
}
virtual expr_ref_vector cube(unsigned backtrack_level) {
virtual expr_ref_vector cube(expr_ref_vector& vs, unsigned backtrack_level) {
if (!m_internalized) {
dep2asm_t dep2asm;
m_model = 0;