mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-18 20:03:38 +00:00
Code Activity

trying Cezary's example

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-12-17 05:03:20 +02:00
parent 56b9c4c8a2
commit 02f74f1028
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/opt/maxsmt.cpp
View file

@ -39,6 +39,9 @@ namespace opt {
if (m_maxsat_engine == symbol("core_maxsat")) { if (m_maxsat_engine == symbol("core_maxsat")) {
m_msolver = alloc(core_maxsat, m, s, m_soft_constraints); m_msolver = alloc(core_maxsat, m, s, m_soft_constraints);
} }
else if (m_maxsat_engine == symbol("weighted_maxsat")) {
m_msolver = alloc(wmaxsmt, m, opt_solver::to_opt(s), m_soft_constraints, m_weights);
}
else { else {
m_msolver = alloc(fu_malik, m, s, m_soft_constraints); m_msolver = alloc(fu_malik, m, s, m_soft_constraints);
} }

1
src/opt/weighted_maxsat.cpp
View file

@ -253,6 +253,7 @@ namespace smt {
disj.push_back(m.mk_not(m_min_cost_atom)); disj.push_back(m.mk_not(m_min_cost_atom));
} }
if (is_optimal()) { if (is_optimal()) {
IF_VERBOSE(1, verbose_stream() << "(wmaxsat with lower bound: " << weight << "\n";);
m_min_cost = weight; m_min_cost = weight;
m_cost_save.reset(); m_cost_save.reset();
m_cost_save.append(m_costs); m_cost_save.append(m_costs);