mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-22 02:57:50 +00:00
Code Activity

fixes to model generation of weighted maxsat

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-12-14 09:37:42 +02:00
parent 5225ea18b7
commit 04824d86df
8 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/opt/maxsmt.h
View file

@ -19,7 +19,6 @@ Notes:
#ifndef _OPT_MAXSMT_H_
#define _OPT_MAXSMT_H_
#include "solver.h"
#include "opt_solver.h"
#include "statistics.h"
@ -44,7 +43,7 @@ namespace opt {
class maxsmt {
ast_manager& m;
solver* m_s;
opt_solver* m_s;
volatile bool m_cancel;
expr_ref_vector m_soft_constraints;
expr_ref_vector m_answer;
@ -57,7 +56,7 @@ namespace opt {
public:
maxsmt(ast_manager& m): m(m), m_s(0), m_cancel(false), m_soft_constraints(m), m_answer(m) {}
lbool operator()(solver& s);
lbool operator()(opt_solver& s);
void set_cancel(bool f);