mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

added facility to persist model transformations

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-11-02 00:05:52 -05:00
commit fd49a0c89c
195 changed files with 3601 additions and 2139 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sat/sat_parallel.cpp
View file

@ -101,7 +101,7 @@ namespace sat {
void parallel::init_solvers(solver& s, unsigned num_extra_solvers) {
unsigned num_threads = num_extra_solvers + 1;
m_solvers.resize(num_extra_solvers, 0);
m_solvers.resize(num_extra_solvers);
symbol saved_phase = s.m_params.get_sym("phase", symbol("caching"));
for (unsigned i = 0; i < num_extra_solvers; ++i) {
m_limits.push_back(reslimit());

3
src/sat/sat_simplifier.cpp
View file

@ -1720,7 +1720,6 @@ namespace sat {
collect_clauses(pos_l, m_pos_cls, false);
collect_clauses(neg_l, m_neg_cls, false);
TRACE("resolution_detail", tout << "collecting number of after_clauses\n";);
unsigned before_clauses = num_pos + num_neg;
unsigned after_clauses = 0;
@ -1739,7 +1738,7 @@ namespace sat {
}
}
TRACE("resolution", tout << "found var to eliminate, before: " << before_clauses << " after: " << after_clauses << "\n";);
m_elim_counter -= num_pos * num_neg + before_lits;
m_elim_counter -= num_pos * num_neg + before_lits;

2
src/sat/sat_solver.cpp
View file

@ -863,7 +863,7 @@ namespace sat {
SASSERT(at_base_lvl());
if (m_config.m_dimacs_display) {
display_dimacs(std::cout);
for (unsigned i = 0; i < num_lits; ++lits) {
for (unsigned i = 0; i < num_lits; ++i) {
std::cout << dimacs_lit(lits[i]) << " 0\n";
}
return l_undef;

1
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -77,7 +77,6 @@ public:
inc_sat_solver(ast_manager& m, params_ref const& p, bool incremental_mode):
m(m),
m_solver(p, m.limit()),
m_params(p),
m_fmls(m),
m_asmsf(m),
m_fmls_head(0),

2
src/sat/tactic/goal2sat.cpp
View file

@ -1067,7 +1067,7 @@ struct sat2goal::imp {
sat::literal l(v, false);
if (m_lit2expr.get(l.index())) {
mc->insert(v, m_lit2expr.get(l.index()), false);
SASSERT(m_lit2expr[(~l).index()]);
SASSERT(m_lit2expr.get((~l).index()));
}
}
}