mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Code Activity

maxres revised to handle weighted constraints

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-07-22 15:42:08 +02:00
parent bf35a62da7
commit 5e9bf2ef53
5 changed files with 177 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/opt/maxsmt.cpp
View file

@ -39,16 +39,16 @@ namespace opt {
m_msolver = 0;
is_sat = m_s->check_sat(0, 0);
}
else if (m_maxsat_engine == symbol("maxres")) {
m_msolver = alloc(maxres, m, *m_s, m_soft_constraints, m_weights);
}
else if (is_maxsat_problem(m_weights)) {
if (m_maxsat_engine == symbol("core_maxsat")) {
m_msolver = alloc(core_maxsat, m, *m_s, m_soft_constraints);
}
else if (m_maxsat_engine == symbol("weighted_maxsat")) {
m_msolver = alloc(wmaxsmt, m, m_s.get(), m_soft_constraints, m_weights);
}
else if (m_maxsat_engine == symbol("maxres")) {
m_msolver = alloc(maxres, m, *m_s, m_soft_constraints);
}
}
else {
m_msolver = alloc(fu_malik, m, *m_s, m_soft_constraints);
}