mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-13 20:38:43 +00:00
Code Activity

debugging local

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-03-01 20:37:07 -08:00
parent 59baaea219
commit 2c7a978c16
4 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sat/card_extension.cpp
View file

@ -744,7 +744,6 @@ namespace sat {
literal lit = v == null_bool_var ? null_literal : literal(v, false);
card* c = new (memory::allocate(card::get_obj_size(lits.size()))) card(index, lit, lits, k);
m_cards.push_back(c);
std::cout << lit << "\n";
if (v == null_bool_var) {
// it is an axiom.
init_watch(*c, true);

33
src/sat/sat_local_search.cpp
View file

@ -173,14 +173,29 @@ namespace sat {
}
}
void local_search::verify_solution() {
void local_search::verify_solution() const {
for (unsigned i = 0; i < m_constraints.size(); ++i) {
verify_constraint(m_constraints[i]);
}
}
void local_search::verify_constraint(constraint const& c) const {
unsigned value = 0;
for (unsigned i = 0; i < c.size(); ++i) {
value += is_true(c[i]) ? 1 : 0;
}
if (c.m_k < value) {
display(std::cout << "violated constraint: ", c);
std::cout << "value: " << value << "\n";
UNREACHABLE();
}
}
void local_search::add_clause(unsigned sz, literal const* c) {
add_cardinality(sz, c, sz - 1);
}
// ~c <= k
void local_search::add_cardinality(unsigned sz, literal const* c, unsigned k) {
unsigned id = m_constraints.size();
m_constraints.push_back(constraint(k));
@ -195,6 +210,8 @@ namespace sat {
local_search::local_search(solver& s) :
m_par(0) {
m_vars.reserve(s.num_vars());
// copy units
unsigned trail_sz = s.init_trail_size();
for (unsigned i = 0; i < trail_sz; ++i) {
@ -205,7 +222,7 @@ namespace sat {
{
unsigned sz = s.m_watches.size();
for (unsigned l_idx = 0; l_idx < sz; ++l_idx) {
literal l = ~to_literal(l_idx);
literal l1 = ~to_literal(l_idx);
watch_list const & wlist = s.m_watches[l_idx];
watch_list::const_iterator it = wlist.begin();
watch_list::const_iterator end = wlist.end();
@ -213,9 +230,9 @@ namespace sat {
if (!it->is_binary_non_learned_clause())
continue;
literal l2 = it->get_literal();
if (l.index() > l2.index())
if (l1.index() > l2.index())
continue;
literal ls[2] = { l, l2 };
literal ls[2] = { l1, l2 };
add_clause(2, ls);
}
}
@ -239,18 +256,17 @@ namespace sat {
unsigned n = c.size();
unsigned k = c.k();
if (c.lit() == null_literal) {
// c.lits() >= k
// <=>
// ~c.lits() <= n - k
lits.reset();
for (unsigned j = 0; j < n; ++j) lits.push_back(~c[j]);
for (unsigned j = 0; j < n; ++j) lits.push_back(c[j]);
add_cardinality(lits.size(), lits.c_ptr(), n - k);
}
else {
// TBD: this doesn't really work
// TBD: this doesn't really work because scores are not properly updated for general PB constraints.
NOT_IMPLEMENTED_YET();
//
// c.lit() <=> c.lits() >= k
//
@ -337,6 +353,7 @@ namespace sat {
//print_solution();
IF_VERBOSE(1, verbose_stream() << timer.get_seconds() << " steps: " << (tries - 1) * max_steps + step << " unsat stack: " << m_unsat_stack.size() << '\n';);
if (m_unsat_stack.empty() && ob_constraint.empty()) { // or all variables in ob_constraint are true
verify_solution();
extract_model();
return l_true;
}

4
src/sat/sat_local_search.h
View file

@ -177,7 +177,9 @@ namespace sat {
void calculate_and_update_ob();
void verify_solution();
void verify_solution() const;
void verify_constraint(constraint const& c) const;
void print_info();

2
src/sat/sat_solver.cpp
View file

@ -866,6 +866,7 @@ namespace sat {
bool use_local_search = m_config.m_local_search;
if (use_local_search) {
m_local_search = alloc(local_search, *this);
m_local_search->config().set_seed(m_config.m_random_seed);
}
int num_threads = static_cast<int>(m_config.m_num_threads) + (use_local_search ? 1 : 0);
@ -942,6 +943,7 @@ namespace sat {
m_core.reset();
m_core.append(par.get_solver(finished_id).get_core());
}
std::cout << result << " id: " << finished_id << " is-local: " << (IS_LOCAL_SEARCH(finished_id)) << "\n";
if (result == l_true && finished_id != -1 && IS_LOCAL_SEARCH(finished_id)) {
set_model(m_local_search->get_model());
}