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 drat for lookahead, fixes for binary drat format

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-01-31 14:58:51 -08:00
parent cda78d8d0b
commit 1e90be62bc
4 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/sat/sat_drat.cpp
View file

@ -43,6 +43,8 @@ namespace sat {
}
drat::~drat() {
if (m_out) m_out->flush();
if (m_bout) m_bout->flush();
dealloc(m_out);
dealloc(m_bout);
for (unsigned i = 0; i < m_proof.size(); ++i) {
@ -83,8 +85,8 @@ namespace sat {
void drat::bdump(unsigned n, literal const* c, status st) {
unsigned char ch = 0;
switch (st) {
case status::asserted: UNREACHABLE(); return;
case status::external: UNREACHABLE(); return; // requires extension to drat format.
case status::asserted: return;
case status::external: return;
case status::learned: ch = 'a'; break;
case status::deleted: ch = 'd'; break;
default: UNREACHABLE(); break;
@ -104,7 +106,7 @@ namespace sat {
while (v);
}
ch = 0;
(*m_bout) << 0;
(*m_bout) << ch;
}
bool drat::is_cleaned(clause& c) const {
@ -615,8 +617,7 @@ namespace sat {
literal ls[2] = {l1, l2};
if (m_out) dump(2, ls, status::deleted);
if (m_bout) bdump(2, ls, status::deleted);
if (m_check)
append(l1, l2, status::deleted);
if (m_check) append(l1, l2, status::deleted);
}
void drat::del(clause& c) {

8
src/sat/sat_lookahead.cpp
View file

@ -113,7 +113,7 @@ namespace sat {
if (m_search_mode == lookahead_mode::searching) {
m_assumptions.push_back(l1);
m_assumptions.push_back(l2);
m_drat.add(m_assumptions);
m_s.m_drat.add(m_assumptions);
m_assumptions.pop_back();
m_assumptions.pop_back();
}
@ -1032,7 +1032,7 @@ namespace sat {
for (unsigned i = 0; i < trail_sz; ++i) {
literal l = m_s.m_trail[i];
if (!m_s.was_eliminated(l.var())) {
if (m_s.m_config.m_drat) m_drat.add(l, false);
if (m_s.m_config.m_drat) m_s.m_drat.add(l, false);
assign(l);
}
}
@ -1065,7 +1065,7 @@ namespace sat {
case 3: add_ternary(c[0],c[1],c[2]); break;
default: if (!learned) add_clause(c); break;
}
if (m_s.m_config.m_drat) m_drat.add(c, false);
// if (m_s.m_config.m_drat) m_s.m_drat.add(c, false);
}
}
@ -1927,7 +1927,7 @@ namespace sat {
void lookahead::validate_assign(literal l) {
if (m_s.m_config.m_drat && m_search_mode == lookahead_mode::searching) {
m_assumptions.push_back(l);
m_drat.add(m_assumptions);
m_s.m_drat.add(m_assumptions);
m_assumptions.pop_back();
}
}

2
src/sat/sat_lookahead.h
View file

@ -200,7 +200,6 @@ namespace sat {
double m_delta_decrease;
double m_delta_fraction;
drat m_drat;
literal_vector m_assumptions;
literal_vector m_trail; // trail of units
@ -565,7 +564,6 @@ namespace sat {
lookahead(solver& s) :
m_s(s),
m_num_vars(s.num_vars()),
m_drat(s),
m_num_tc1(0),
m_level(2),
m_last_prefix_length(0),

18
src/solver/parallel_tactic.cpp
View file

@ -330,6 +330,7 @@ private:
volatile bool m_has_undef;
bool m_allsat;
unsigned m_num_unsat;
unsigned m_last_depth;
int m_exn_code;
std::string m_exn_msg;
@ -340,7 +341,8 @@ private:
m_has_undef = false;
m_allsat = false;
m_branches = 0;
m_num_unsat = 0;
m_num_unsat = 0;
m_last_depth = 0;
m_backtrack_frequency = pp.conquer_backtrack_frequency();
m_conquer_delay = pp.conquer_delay();
m_exn_code = 0;
@ -350,9 +352,10 @@ private:
void log_branches(lbool status) {
IF_VERBOSE(0, verbose_stream() << "(tactic.parallel :progress " << m_progress << "% ";
if (status == l_true) verbose_stream() << ":status sat ";
if (status == l_undef) verbose_stream() << ":status unknown ";
verbose_stream() << ":closed " << m_num_unsat << " :open " << m_branches << ")\n";);
if (status == l_true) verbose_stream() << ":status sat";
if (status == l_undef) verbose_stream() << ":status unknown";
if (m_num_unsat > 0) verbose_stream() << " :closed " << m_num_unsat << "@" << m_last_depth;
verbose_stream() << " :open " << m_branches << ")\n";);
}
void add_branches(unsigned b) {
@ -405,13 +408,14 @@ private:
}
}
void inc_unsat() {
void inc_unsat(solver_state& s) {
std::lock_guard<std::mutex> lock(m_mutex);
++m_num_unsat;
m_last_depth = s.get_depth();
}
void report_unsat(solver_state& s) {
inc_unsat();
inc_unsat(s);
close_branch(s, l_false);
if (s.has_assumptions()) {
expr_ref_vector core(s.m());
@ -489,7 +493,7 @@ private:
IF_VERBOSE(0, verbose_stream() << "(tactic.parallel :backtrack " << cutoff << " -> " << c.size() << ")\n");
cutoff = c.size();
}
inc_unsat();
inc_unsat(s);
log_branches(l_false);
break;