mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-08 12:11:23 +00:00
Code Activity

add LP parser option to front-end and opt context

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-02-06 14:02:44 -08:00
parent 20fe08d80c
commit 43441d0fd5
8 changed files with 459 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tactic/arith/lia2card_tactic.cpp
View file

@ -160,11 +160,10 @@ public:
expr_ref_vector xs(m);
expr_ref last_v(m);
if (!m_mc) m_mc = alloc(generic_model_converter, m, "lia2card");
for (unsigned i = 0; i < hi; ++i) {
if (i < lo) {
xs.push_back(a.mk_int(1));
continue;
}
if (lo > 0) {
xs.push_back(a.mk_int(lo));
}
for (unsigned i = lo; i < hi; ++i) {
std::string name(x->get_decl()->get_name().str());
expr_ref v(m.mk_fresh_const(name.c_str(), m.mk_bool_sort()), m);
if (last_v) axioms.push_back(m.mk_implies(v, last_v));
@ -195,7 +194,7 @@ public:
if (a.is_int(x) &&
is_uninterp_const(x) &&
bounds.has_lower(x, lo, s1) && !s1 && lo.is_unsigned() &&
bounds.has_upper(x, hi, s2) && !s2 && hi.is_unsigned() && hi.get_unsigned() <= m_max_ub) {
bounds.has_upper(x, hi, s2) && !s2 && hi.is_unsigned() && hi.get_unsigned() - lo.get_unsigned() <= m_max_ub) {
expr_ref b = mk_bounded(axioms, to_app(x), lo.get_unsigned(), hi.get_unsigned());
rep.insert(x, b);
m_bounds.insert(x, bound(lo.get_unsigned(), hi.get_unsigned(), b));