mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-14 09:56:15 +00:00
Code Activity

re-enable proofs for qe-lite #3153

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-06-15 12:03:15 -07:00
parent 395a304262
commit d09e6eccf0
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/qe/qe_lite.cpp
View file

@ -2331,11 +2331,12 @@ public:
} }
void operator()(expr_ref& fml, proof_ref& pr) { void operator()(expr_ref& fml, proof_ref& pr) {
if (!m.proofs_enabled()) { expr_ref tmp(m);
expr_ref tmp(m); m_elim_star(fml, tmp, pr);
m_elim_star(fml, tmp, pr); if (m.proofs_enabled()) {
fml = std::move(tmp); pr = m.mk_rewrite(fml, tmp);
} }
fml = std::move(tmp);
} }
void operator()(uint_set const& index_set, bool index_of_bound, expr_ref& fml) { void operator()(uint_set const& index_set, bool index_of_bound, expr_ref& fml) {

21
src/smt/theory_lra.cpp
View file

@ -3916,7 +3916,8 @@ public:
if (!use_bounded_expansion()) if (!use_bounded_expansion())
return; return;
ctx().push_trail(value_trail<context, literal>(m_bounded_range_lit)); ctx().push_trail(value_trail<context, literal>(m_bounded_range_lit));
m_bound_predicate = m.mk_fresh_const("arith.bound", m.mk_bool_sort()); if (!m_bound_predicate || !m_term2bound_info.empty())
m_bound_predicate = m.mk_fresh_const("arith.bound", m.mk_bool_sort());
m_bounded_range_lit = mk_literal(m_bound_predicate); m_bounded_range_lit = mk_literal(m_bound_predicate);
// add max-unfolding literal // add max-unfolding literal
// add variable bounds // add variable bounds
@ -3947,8 +3948,10 @@ public:
else if (m_predicate2term.find(e, t)) { else if (m_predicate2term.find(e, t)) {
found = true; found = true;
bound_info bi; bound_info bi;
VERIFY(m_term2bound_info.find(t, bi)); if (!m_term2bound_info.find(t, bi)) {
if (bi.m_range >= max_range()) { TRACE("arith", tout << "bound information for term " << mk_pp(t, m) << " not found\n";);
}
else if (bi.m_range >= max_range()) {
m_term2bound_info.erase(t); m_term2bound_info.erase(t);
} }
else { else {
@ -3981,6 +3984,15 @@ public:
m_term2bound_info.insert(t, bi); m_term2bound_info.insert(t, bi);
} }
void setup() {
m_bounded_range_lit = null_literal;
m_bound_predicates.reset();
m_bound_predicate = nullptr;
m_predicate2term.reset();
m_term2bound_info.reset();
}
}; };
theory_lra::theory_lra(context& ctx): theory_lra::theory_lra(context& ctx):
@ -4109,6 +4121,9 @@ void theory_lra::add_theory_assumptions(expr_ref_vector& assumptions) {
bool theory_lra::should_research(expr_ref_vector& unsat_core) { bool theory_lra::should_research(expr_ref_vector& unsat_core) {
return m_imp->should_research(unsat_core); return m_imp->should_research(unsat_core);
} }
void theory_lra::setup() {
m_imp->setup();
}
} }
template class lp::lp_bound_propagator<smt::theory_lra::imp>; template class lp::lp_bound_propagator<smt::theory_lra::imp>;

2
src/smt/theory_lra.h
View file

@ -95,6 +95,8 @@ namespace smt {
void collect_statistics(::statistics & st) const override; void collect_statistics(::statistics & st) const override;
void setup() override;
void add_theory_assumptions(expr_ref_vector& assumptions) override; void add_theory_assumptions(expr_ref_vector& assumptions) override;
bool should_research(expr_ref_vector& unsat_core) override; bool should_research(expr_ref_vector& unsat_core) override;