mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

remove dead (and incorrect) code

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-10-24 15:52:47 -07:00
parent a880e5f49b
commit e4d2c5867a
2 changed files with 26 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/sat/sat_solver.cpp
View file

@ -3151,7 +3151,7 @@ namespace sat {
lbool solver::get_consequences(literal_vector const& asms, literal_vector const& lits, vector<literal_vector>& conseq) {
m_antecedents.reset();
literal_set unfixed(lits), assumptions(asms);
literal_set vars(lits), assumptions(asms);
pop_to_base_level();
if (inconsistent()) return l_false;
@ -3162,11 +3162,12 @@ namespace sat {
propagate(false);
if (check_inconsistent()) return l_false;
unsigned num_units = 0;
extract_fixed_consequences(num_units, assumptions, unfixed, conseq);
while (!unfixed.empty()) {
unsigned num_units = 0, num_iterations = 0;
extract_fixed_consequences(num_units, assumptions, vars, conseq);
while (!vars.empty()) {
++num_iterations;
checkpoint();
literal_set::iterator it = unfixed.begin(), end = unfixed.end();
literal_set::iterator it = vars.begin(), end = vars.end();
for (; it != end; ++it) {
literal lit = *it;
if (value(lit) != l_undef) {
@ -3197,9 +3198,16 @@ namespace sat {
m_inconsistent = false;
}
if (is_sat == l_true) {
delete_unfixed(unfixed);
delete_unfixed(vars);
}
extract_fixed_consequences(num_units, assumptions, unfixed, conseq);
extract_fixed_consequences(num_units, assumptions, vars, conseq);
IF_VERBOSE(1, verbose_stream() << "(get-consequences"
<< " iterations: " << num_iterations
<< " variables: " << vars.size()
<< " fixed: " << conseq.size()
<< " unfixed: " << lits.size() - conseq.size() - vars.size()
<< ")\n";);
}
return l_true;
}