mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

cleanup cancelation logic

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-11 12:35:35 -08:00
parent 4e155887b2
commit 61dbb6168e
37 changed files with 93 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/opt/hitting_sets.cpp
View file

@ -88,7 +88,7 @@ namespace opt {
bool empty() const { return 0 == size(); }
};
volatile bool m_cancel;
reslimit& m_limit;
rational m_lower;
rational m_upper;
vector<rational> m_weights;
@ -144,8 +144,8 @@ namespace opt {
static unsigned const null_idx = UINT_MAX;
imp():
m_cancel(false),
imp(reslimit& lim):
m_limit(lim),
m_max_weight(0),
m_denominator(1),
m_alloc("hitting-sets"),
@ -155,6 +155,7 @@ namespace opt {
m_scope_lvl(0),
m_compare_scores(),
m_heap(0, m_compare_scores),
m_simplex(lim),
m_weights_var(0) {
m_enable_simplex = true;
m_compare_scores.m_imp = this;
@ -298,11 +299,6 @@ namespace opt {
m_model[idx] == l_true;
}
void set_cancel(bool f) {
m_cancel = f;
m_simplex.set_cancel(f);
}
void collect_statistics(::statistics& st) const {
m_simplex.collect_statistics(st);
}
@ -641,7 +637,7 @@ namespace opt {
inline unsigned scope_lvl() const { return m_scope_lvl; }
inline bool inconsistent() const { return m_inconsistent; }
inline bool canceled() const { return m_cancel; }
inline bool canceled() const { return !m_limit.inc(); }
inline unsigned lvl(unsigned idx) const { return m_level[idx]; }
inline lbool value(unsigned idx) const { return m_value[idx]; }
@ -1073,7 +1069,7 @@ namespace opt {
};
hitting_sets::hitting_sets() { m_imp = alloc(imp); }
hitting_sets::hitting_sets(reslimit& lim) { m_imp = alloc(imp, lim); }
hitting_sets::~hitting_sets() { dealloc(m_imp); }
void hitting_sets::add_weight(rational const& w) { m_imp->add_weight(w); }
void hitting_sets::add_exists_true(unsigned sz, unsigned const* elems) { m_imp->add_exists_true(sz, elems); }
@ -1084,7 +1080,6 @@ namespace opt {
rational hitting_sets::get_upper() { return m_imp->get_upper(); }
void hitting_sets::set_upper(rational const& r) { return m_imp->set_upper(r); }
bool hitting_sets::get_value(unsigned idx) { return m_imp->get_value(idx); }
void hitting_sets::set_cancel(bool f) { m_imp->set_cancel(f); }
void hitting_sets::collect_statistics(::statistics& st) const { m_imp->collect_statistics(st); }
void hitting_sets::reset() { m_imp->reset(); }

3
src/opt/hitting_sets.h
View file

@ -22,6 +22,7 @@ Notes:
#include "rational.h"
#include "statistics.h"
#include "lbool.h"
#include "rlimit.h"
namespace opt {
@ -29,7 +30,7 @@ namespace opt {
struct imp;
imp* m_imp;
public:
hitting_sets();
hitting_sets(reslimit& lim);
~hitting_sets();
void add_weight(rational const& w);
void add_exists_true(unsigned sz, unsigned const* elems);

2
src/opt/maxhs.cpp
View file

@ -77,6 +77,7 @@ namespace opt {
public:
maxhs(maxsat_context& c, weights_t& ws, expr_ref_vector const& soft):
maxsmt_solver_base(c, ws, soft),
m_hs(m.limit()),
m_aux(m),
m_at_lower_bound(false) {
}
@ -84,7 +85,6 @@ namespace opt {
virtual void set_cancel(bool f) {
maxsmt_solver_base::set_cancel(f);
m_hs.set_cancel(f);
}
virtual void collect_statistics(statistics& st) const {