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

working on core-maxsat

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-11-09 15:54:38 -08:00
parent 2349a0fcdd
commit 293a97bdfc
7 changed files with 52 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/opt/maxsmt.cpp
View file

@ -3,7 +3,7 @@ Copyright (c) 2013 Microsoft Corporation
Module Name:
opt_maxsmt.cpp
maxsmt.cpp
Abstract:
@ -19,8 +19,10 @@ Notes:
#include "maxsmt.h"
#include "fu_malik.h"
#include "core_maxsat.h"
#include "weighted_maxsat.h"
#include "ast_pp.h"
#include "opt_params.hpp"
namespace opt {
@ -35,7 +37,12 @@ namespace opt {
m_answer.append(m_soft_constraints);
}
else if (is_maxsat_problem(m_weights)) {
m_msolver = alloc(fu_malik, m, s, m_soft_constraints);
if (m_maxsat_engine == symbol("core_maxsat")) {
m_msolver = alloc(core_maxsat, m, s, m_soft_constraints);
}
else {
m_msolver = alloc(fu_malik, m, s, m_soft_constraints);
}
}
else {
m_msolver = alloc(wmaxsmt, m, opt_solver::to_opt(s), m_soft_constraints, m_weights);
@ -110,6 +117,8 @@ namespace opt {
}
void maxsmt::updt_params(params_ref& p) {
opt_params _p(p);
m_maxsat_engine = _p.maxsat_engine();
}