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

fix build

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-05-17 12:20:33 -07:00
parent 1bfc12d6e6
commit 951c769fc9
3 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/smt/seq_unicode.cpp
View file

@ -40,42 +40,43 @@ namespace smt {
dl.init_var(v2); dl.init_var(v2);
// dl.set_assignment(v1, 'a' + ctx().random(24)); // dl.set_assignment(v1, 'a' + ctx().random(24));
// dl.set_assignment(v2, 'a' + ctx().random(24)); // dl.set_assignment(v2, 'a' + ctx().random(24));
auto edge_id = dl.add_edge(v1, v2, s_integer(0), lit);
m_asserted_edges.push_back(edge_id);
ctx().push_trail(push_back_vector<context, svector<theory_var>>(m_asserted_edges)); ctx().push_trail(push_back_vector<context, svector<theory_var>>(m_asserted_edges));
m_asserted_edges.push_back(dl.add_edge(v1, v2, s_integer(0), lit));
} }
// < atomic constraint on characters // < atomic constraint on characters
void seq_unicode::assign_lt(theory_var v1, theory_var v2, literal lit) { void seq_unicode::assign_lt(theory_var v1, theory_var v2, literal lit) {
dl.init_var(v1); dl.init_var(v1);
dl.init_var(v2); dl.init_var(v2);
auto edge_id = dl.add_edge(v1, v2, s_integer(1), lit);
m_asserted_edges.push_back(edge_id);
ctx().push_trail(push_back_vector<context, svector<theory_var>>(m_asserted_edges)); ctx().push_trail(push_back_vector<context, svector<theory_var>>(m_asserted_edges));
m_asserted_edges.push_back(dl.add_edge(v1, v2, s_integer(1), lit));
}
literal seq_unicode::mk_literal(expr* e) {
expr_ref _e(e, m);
th.ensure_enode(e);
return ctx().get_literal(e);
}
void seq_unicode::adapt_eq(theory_var v1, theory_var v2) {
expr* e1 = th.get_expr(v1);
expr* e2 = th.get_expr(v2);
literal eq = th.mk_eq(e1, e2, false);
literal le = mk_literal(seq.mk_le(e1, e2));
literal ge = mk_literal(seq.mk_le(e2, e1));
add_axiom(~eq, le);
add_axiom(~eq, ge);
add_axiom(le, ge, eq);
} }
// = on characters // = on characters
void seq_unicode::new_eq_eh(theory_var v1, theory_var v2) { void seq_unicode::new_eq_eh(theory_var v1, theory_var v2) {
expr* e1 = th.get_expr(v1); adapt_eq(v1, v2);
expr* e2 = th.get_expr(v2);
literal eq = th.mk_eq(e1, e2, false);
literal le = mk_literal(seq.mk_le(e1, e2));
literal ge = mk_literal(seq.mk_le(e2, e1));
add_axiom(~eq, le);
add_axiom(~eq, ge);
add_axiom(le, ge, eq);
} }
// != on characters // != on characters
void seq_unicode::new_diseq_eh(theory_var v1, theory_var v2) { void seq_unicode::new_diseq_eh(theory_var v1, theory_var v2) {
expr* e1 = th.get_expr(v1); adapt_eq(v1, v2);
expr* e2 = th.get_expr(v2);
literal eq = th.mk_eq(e1, e2, false);
literal le = mk_literal(seq.mk_le(e1, e2));
literal ge = mk_literal(seq.mk_le(e2, e1));
add_axiom(~eq, le);
add_axiom(~eq, ge);
add_axiom(le, ge, eq);
} }
final_check_status seq_unicode::final_check() { final_check_status seq_unicode::final_check() {
@ -86,7 +87,7 @@ namespace smt {
arith_util a(m); arith_util a(m);
arith_value avalue(m); arith_value avalue(m);
avalue.init(&ctx()); avalue.init(&ctx());
for (unsigned v = 0; v < th.get_num_vars(); ++v) { for (unsigned v = 0; !ctx().inconsistent() && v < th.get_num_vars(); ++v) {
if (!seq.is_char(th.get_expr(v))) if (!seq.is_char(th.get_expr(v)))
continue; continue;
dl.init_var(v); dl.init_var(v);
@ -115,7 +116,7 @@ namespace smt {
// expr_ref ch2(seq.str.mk_string(zstring(val)), m); // expr_ref ch2(seq.str.mk_string(zstring(val)), m);
expr_ref code(seq.str.mk_to_code(ch1), m); expr_ref code(seq.str.mk_to_code(ch1), m);
rational val2; rational val2;
if (avalue.get_fixed(code, val2) && val2 == rational(val)) if (avalue.get_value(code, val2) && val2 == rational(val))
continue; continue;
add_axiom(th.mk_eq(code, a.mk_int(val), false)); add_axiom(th.mk_eq(code, a.mk_int(val), false));
added_constraint = true; added_constraint = true;

4
src/smt/seq_unicode.h
View file

@ -81,7 +81,9 @@ namespace smt {
m_add_axiom(a, b, c); m_add_axiom(a, b, c);
} }
literal mk_literal(expr* e) { return null_literal; } // TBD void adapt_eq(theory_var v1, theory_var v2);
literal mk_literal(expr* e);
public: public:

1
src/smt/smt_arith_value.h
View file

@ -42,7 +42,6 @@ namespace smt {
bool get_lo(expr* e, rational& lo, bool& strict) const; bool get_lo(expr* e, rational& lo, bool& strict) const;
bool get_up(expr* e, rational& up, bool& strict) const; bool get_up(expr* e, rational& up, bool& strict) const;
bool get_value(expr* e, rational& value) const; bool get_value(expr* e, rational& value) const;
bool get_fixed(expr* e, rational& value) const;
final_check_status final_check(); final_check_status final_check();
}; };
}; };