mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-19 09:40:20 +00:00
Code Activity

add mutex preprocessing to maxsat, add parsing functions to C++ API

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-10-07 12:42:08 -07:00
parent f452895f5f
commit 619cce0a52
7 changed files with 395 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,6 +107,7 @@ public:
return check_sat(num_assumptions, assumptions, 0, 0);
}
void display_weighted(std::ostream& out, unsigned sz, expr * const * assumptions, unsigned const* weights) {
m_weights.reset();
if (weights != 0) {
@ -231,6 +232,33 @@ public:
return 0;
}
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) {
sat::literal_vector ls;
u_map<expr*> lit2var;
for (unsigned i = 0; i < vars.size(); ++i) {
expr* e = vars[i];
bool neg = m.is_not(e, e);
sat::bool_var v = m_map.to_bool_var(e);
if (v != sat::null_bool_var) {
sat::literal lit(v, neg);
ls.push_back(lit);
lit2var.insert(lit.index(), vars[i]);
}
}
vector<sat::literal_vector> ls_mutexes;
m_solver.find_mutexes(ls, ls_mutexes);
for (unsigned i = 0; i < ls_mutexes.size(); ++i) {
sat::literal_vector const ls_mutex = ls_mutexes[i];
expr_ref_vector mutex(m);
for (unsigned j = 0; j < ls_mutex.size(); ++j) {
mutex.push_back(lit2var.find(ls_mutex[j].index()));
}
mutexes.push_back(mutex);
}
return l_true;
}
virtual std::string reason_unknown() const {
return m_unknown;
}