mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

remove experimental option. Fix #4806

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-11-20 11:46:19 -08:00
parent ac1b3fc6f2
commit 1269776777
7 changed files with 2 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/sat/smt/arith_solver.cpp
View file

@ -1056,7 +1056,6 @@ namespace arith {
// SAT core assigns a value to
lia_check = l_false;
++m_stats.m_branch;
add_variable_bound(t, offset);
break;
}
case lp::lia_move::cut: {
@ -1167,27 +1166,6 @@ namespace arith {
}
}
void solver::add_variable_bound(expr* t, rational const& offset) {
if (!use_bounded_expansion())
return;
if (m_bounded_range_lit == sat::null_literal)
return;
// if term is not already bounded, add a range and assert max_bound => range
bound_info bi(offset, init_range());
if (m_term2bound_info.find(t, bi))
return;
expr_ref hi(a.mk_le(t, a.mk_int(offset + bi.m_range)), m);
expr_ref lo(a.mk_ge(t, a.mk_int(offset - bi.m_range)), m);
add_clause(~m_bounded_range_lit, mk_literal(hi));
add_clause(~m_bounded_range_lit, mk_literal(lo));
m_bound_terms.push_back(lo);
m_bound_terms.push_back(hi);
m_bound_terms.push_back(t);
m_predicate2term.insert(lo, t);
m_predicate2term.insert(hi, t);
m_term2bound_info.insert(t, bi);
}
void solver::reset_evidence() {
m_core.reset();
m_eqs.reset();
@ -1204,6 +1182,7 @@ namespace arith {
app_ref s(a.mk_numeral(offset, isint), m);
return eq_internalize(t, s);
}
// create a bound atom representing term >= k is lower_bound is true, and term <= k if it is false
app_ref solver::mk_bound(lp::lar_term const& term, rational const& k, bool lower_bound) {
rational offset;

2
src/sat/smt/arith_solver.h
View file

@ -346,7 +346,6 @@ namespace arith {
lbool make_feasible();
lbool check_lia();
lbool check_nla();
void add_variable_bound(expr* t, rational const& offset);
bool is_infeasible() const;
nlsat::anum const& nl_value(theory_var v, scoped_anum& r) const;
@ -375,7 +374,6 @@ namespace arith {
obj_map<expr, bound_info> m_term2bound_info;
bool m_model_is_initialized{ false };
bool use_bounded_expansion() const { return get_config().m_arith_bounded_expansion; }
unsigned small_lemma_size() const { return get_config().m_arith_small_lemma_size; }
bool propagate_eqs() const { return get_config().m_arith_propagate_eqs && m_num_conflicts < get_config().m_arith_propagation_threshold; }
bool should_propagate() const { return bound_prop_mode::BP_NONE != propagation_mode(); }