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

moving to maxres consolidation

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-03 00:17:55 -07:00
parent a41b1d34ce
commit 6a4c08c7cb
4 changed files with 68 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/opt/maxsmt.cpp
View file

@ -22,7 +22,6 @@ Notes:
#include "fu_malik.h"
#include "core_maxsat.h"
#include "maxres.h"
#include "dual_maxres.h"
#include "maxhs.h"
#include "bcd2.h"
#include "wpm2.h"
@ -181,8 +180,8 @@ namespace opt {
else if (m_maxsat_engine == symbol("maxres")) {
m_msolver = mk_maxres(m, s, m_params, m_weights, m_soft_constraints);
}
else if (m_maxsat_engine == symbol("dual-maxres")) {
m_msolver = mk_dual_maxres(m, s, m_params, m_weights, m_soft_constraints);
else if (m_maxsat_engine == symbol("mus-mss-maxres")) {
m_msolver = mk_mus_mss_maxres(m, s, m_params, m_weights, m_soft_constraints);
}
else if (m_maxsat_engine == symbol("pbmax")) {
m_msolver = mk_pbmax(m, s, m_params, m_weights, m_soft_constraints);