mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 08:28:44 +00:00
Code Activity

reference get_wlist

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-02-07 16:03:14 -08:00
parent d684d4fce0
commit d7f2638ecf
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sat/ba_solver.cpp
View file

@ -1390,7 +1390,7 @@ namespace sat {
} }
} }
else { else {
slack -= abs(coeff); slack -= std::abs(coeff);
m_lemma.push_back(~lit); m_lemma.push_back(~lit);
} }
} }
@ -3655,7 +3655,7 @@ namespace sat {
m_active_var_set.insert(v); m_active_var_set.insert(v);
literal lit(v, coeff < 0); literal lit(v, coeff < 0);
p.m_lits.push_back(lit); p.m_lits.push_back(lit);
p.m_coeffs.push_back(abs(coeff)); p.m_coeffs.push_back(std::abs(coeff));
} }
} }

13
src/sat/sat_simplifier.cpp
View file

@ -71,11 +71,11 @@ namespace sat {
finalize(); finalize();
} }
inline watch_list & simplifier::get_wlist(literal l) { return s.get_wlist(l); } watch_list & simplifier::get_wlist(literal l) { return s.get_wlist(l); }
inline watch_list const & simplifier::get_wlist(literal l) const { return s.get_wlist(l); } watch_list const & simplifier::get_wlist(literal l) const { return s.get_wlist(l); }
inline bool simplifier::is_external(bool_var v) const { bool simplifier::is_external(bool_var v) const {
return return
s.is_assumption(v) || s.is_assumption(v) ||
(s.is_external(v) && s.is_incremental()) || (s.is_external(v) && s.is_incremental()) ||
@ -1317,16 +1317,15 @@ namespace sat {
m_ala_qhead = 0; m_ala_qhead = 0;
switch (et) { switch (et) {
case abce_t:
case bce_t:
k = model_converter::BLOCK_LIT;
break;
case cce_t: case cce_t:
k = model_converter::CCE; k = model_converter::CCE;
break; break;
case acce_t: case acce_t:
k = model_converter::ACCE; k = model_converter::ACCE;
break; break;
default:
k = model_converter::BLOCK_LIT;
break;
} }
/* /*