mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-03 01:40:22 +00:00
Code Activity

fix bug in unsat core extraction in sat solver

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-18 23:43:51 -07:00
parent 1c56d6ee95
commit a47f3df703
14 changed files with 70 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/opt/maxsmt.h
View file

@ -27,6 +27,8 @@ Notes:
namespace opt {
typedef vector<rational> const weights_t;
class context;
class maxsmt_solver {
@ -63,7 +65,7 @@ namespace opt {
params_ref m_params; // config
public:
maxsmt_solver_base(context& c, vector<rational> const& ws, expr_ref_vector const& soft);
maxsmt_solver_base(context& c, weights_t& ws, expr_ref_vector const& soft);
virtual ~maxsmt_solver_base() {}
virtual rational get_lower() const { return m_lower; }
@ -74,14 +76,14 @@ namespace opt {
virtual void get_model(model_ref& mdl) { mdl = m_model.get(); }
void set_model() { s().get_model(m_model); }
virtual void updt_params(params_ref& p);
virtual void init_soft(vector<rational> const& weights, expr_ref_vector const& soft);
virtual void init_soft(weights_t& weights, expr_ref_vector const& soft);
solver& s() { return m_s; }
void init();
expr* mk_not(expr* e);
void set_mus(bool f);
app* mk_fresh_bool(char const* name);
protected:
void enable_sls(expr_ref_vector const& soft, vector<rational> const& ws);
void enable_sls(expr_ref_vector const& soft, weights_t& ws);
};
/**
@ -122,7 +124,7 @@ namespace opt {
void display_answer(std::ostream& out) const;
void collect_statistics(statistics& st) const;
private:
bool is_maxsat_problem(vector<rational> const& ws) const;
bool is_maxsat_problem(weights_t& ws) const;
void verify_assignment();
};