mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 19:05:51 +00:00
Code Activity

fix gc of pb constraints

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-01-19 03:38:00 -08:00
parent 01418a06a3
commit 64ba2a9fc9
6 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sat/sat_extension.h
View file

@ -117,6 +117,7 @@ namespace sat {
virtual void init_use_list(ext_use_list& ul) {}
virtual bool is_blocked(literal l, ext_constraint_idx) { return false; }
virtual bool check_model(model const& m) const { return true; }
virtual void gc_vars(unsigned num_vars) {}
virtual bool extract_pb(std::function<void(unsigned sz, literal const* c, unsigned k)>& card,
std::function<void(unsigned sz, literal const* c, unsigned const* coeffs, unsigned k)>& pb) {

3
src/sat/sat_gc.cpp
View file

@ -470,6 +470,9 @@ namespace sat {
};
gc_clauses(m_learned);
gc_clauses(m_clauses);
if (m_ext)
m_ext->gc_vars(max_var);
unsigned j = 0;
for (literal lit : m_trail) {

24
src/sat/smt/ba_solver.cpp
View file

@ -1892,9 +1892,31 @@ namespace sat {
m_stats.m_num_gc += removed;
m_learned.shrink(new_sz);
IF_VERBOSE(2, verbose_stream() << "(sat-gc :strategy " << st_name << " :deleted " << removed << ")\n";);
}
void ba_solver::gc_vars(unsigned num_vars) {
gc_vars(num_vars, m_constraints);
gc_vars(num_vars, m_learned);
}
void ba_solver::gc_vars(unsigned num_vars, ptr_vector<constraint>& cs) {
unsigned j = 0;
for (unsigned i = 0; i < cs.size(); ++i) {
auto* c = cs[i];
unsigned m = c->fold_max_var(0);
if (m >= num_vars) {
clear_watch(*c);
c->nullify_tracking_literal(*this);
c->deallocate(m_allocator);
}
else
cs[j++] = c;
}
cs.shrink(j);
}
lbool ba_solver::add_assign(card& c, literal alit) {
// literal is assigned to false.
unsigned sz = c.size();

2
src/sat/smt/ba_solver.h
View file

@ -187,6 +187,7 @@ namespace sat {
void cleanup_constraints();
void cleanup_constraints(ptr_vector<constraint>& cs, bool learned);
void remove_constraint(constraint& c, char const* reason);
void gc_vars(unsigned num_vars, ptr_vector<constraint>& cs);
// constraints
constraint& index2constraint(size_t idx) const { return *reinterpret_cast<constraint*>(constraint_base::from_index(idx)->mem()); }
@ -424,6 +425,7 @@ namespace sat {
void find_mutexes(literal_vector& lits, vector<literal_vector> & mutexes) override;
void pop_reinit() override;
void gc() override;
void gc_vars(unsigned num_vars) override;
bool is_extended_binary(ext_justification_idx idx, literal_vector & r) override;
void init_use_list(ext_use_list& ul) override;
bool is_blocked(literal l, ext_constraint_idx idx) override;

5
src/sat/smt/euf_solver.cpp
View file

@ -728,6 +728,11 @@ namespace euf {
return false;
return true;
}
void solver::gc_vars(unsigned num_vars) {
for (auto* e : m_solvers)
e->gc_vars(num_vars);
}
double solver::get_reward(literal l, ext_constraint_idx idx, sat::literal_occs_fun& occs) const {
auto* ext = sat::constraint_base::to_extension(idx);

1
src/sat/smt/euf_solver.h
View file

@ -304,6 +304,7 @@ namespace euf {
void init_use_list(sat::ext_use_list& ul) override;
bool is_blocked(literal l, ext_constraint_idx) override;
bool check_model(sat::model const& m) const override;
void gc_vars(unsigned num_vars) override;
// proof
bool use_drat() { return s().get_config().m_drat && (init_drat(), true); }