mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 13:58:45 +00:00
Code Activity

sls updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-12 22:14:57 -07:00
parent 1412c183d4
commit cafb31ff94
3 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/sat/sat_mus.cpp
View file

@ -20,6 +20,7 @@ Notes:
#include "sat_solver.h"
#include "sat_mus.h"
#include "sat_sls.h"
namespace sat {
@ -76,11 +77,11 @@ namespace sat {
if (core.empty()) {
break;
}
sz = core.size();
core.append(mus);
measure_mr();
// sz = core.size();
// measure_mr();
// core.append(mus);
// rmr();
core.resize(sz);
// core.resize(sz);
break;
}
case l_false:
@ -114,7 +115,26 @@ namespace sat {
std::cout << "model diff: " << n << " out of " << m_model.size() << "\n";
}
m_model.reset();
m_model.append(m2);
m_model.append(m2);
sls sls(s);
literal_vector tabu;
tabu.append(m_mus);
tabu.append(m_core);
for (unsigned i = m_mus.size(); i < tabu.size(); ++i) {
tabu[i] = ~tabu[i];
lbool is_sat = sls(tabu.size(), tabu.c_ptr());
tabu[i] = ~tabu[i];
switch (is_sat) {
case l_true:
//m_mus.push_back(tabu[i]);
//m_core.erase(tabu[i]);
std::cout << "in core " << tabu[i] << "\n";
break;
default:
break;
}
}
}
//

26
src/sat/sat_sls.cpp
View file

@ -64,12 +64,12 @@ namespace sat {
lbool sls::operator()(unsigned sz, literal const* tabu) {
init(sz, tabu);
for (unsigned i = 0; i < m_max_tries; ++i) {
for (unsigned i = 0; !m_false.empty() && i < m_max_tries; ++i) {
flip();
if (m_false.empty()) {
SASSERT(s.check_model(m_model));
return l_true;
}
}
if (m_false.empty()) {
SASSERT(s.check_model(m_model));
return l_true;
}
return l_undef;
}
@ -84,6 +84,7 @@ namespace sat {
for (unsigned i = 0; i < m_bin_clauses.size(); ++i) {
m_alloc.del_clause(m_bin_clauses[i]);
}
m_bin_clauses.reset();
m_clauses.reset();
clause * const * it = s.begin_clauses();
clause * const * end = s.end_clauses();
@ -108,6 +109,7 @@ namespace sat {
m_tabu.resize(s.num_vars(), false);
for (unsigned i = 0; i < sz; ++i) {
m_model[tabu[i].var()] = tabu[i].sign()?l_false:l_true;
SASSERT(value_at(tabu[i], m_model) == l_true);
}
sz = m_clauses.size();
@ -116,8 +118,18 @@ namespace sat {
unsigned n = 0;
unsigned csz = c.size();
for (unsigned j = 0; j < csz; ++j) {
if (value_at(c[j], m_model) == l_true) {
lbool val = value_at(c[j], m_model);
switch (val) {
case l_true:
++n;
break;
case l_undef:
++n;
m_model[c[j].var()] = c[j].sign()?l_false:l_true;
SASSERT(value_at(c[j], m_model) == l_true);
break;
default:
break;
}
}
m_num_true.push_back(n);
@ -196,7 +208,7 @@ namespace sat {
literal lit;
if (!pick_flip(lit)) return;
SASSERT(value_at(lit, m_model) == l_false);
m_model[lit.var()] = lit.sign()?l_true:l_false;
m_model[lit.var()] = lit.sign()?l_false:l_true;
SASSERT(value_at(lit, m_model) == l_true);
unsigned_vector const& use1 = get_use(lit);
unsigned sz = use1.size();

2
src/sat/sat_sls.h
View file

@ -38,7 +38,7 @@ namespace sat {
};
class sls {
solver& s;
solver& s;
random_gen m_rand;
unsigned m_max_tries;
unsigned m_prob_choose_min_var; // number between 0 and 99.