mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

using iterators

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-02-21 19:20:49 -08:00
parent 17f239c2cb
commit c79967b2b6
2 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
genaisrc/myai.genai.mts
View file

@ -228,6 +228,8 @@ export async function invokeLLMClassInvariant(header : string, code : string) {
Create only code for the class invariant methods and optionally auxiliary helper functions. Create only code for the class invariant methods and optionally auxiliary helper functions.
In addition, for each method, provide pre and post conditions. In addition, for each method, provide pre and post conditions.
A precondition is an assertion that must be true before the method is called.
Similarly, a postcondition is an assertion that must be true after the method is called.
Include the well_formed() method in the pre and post conditions if it should be included. Include the well_formed() method in the pre and post conditions if it should be included.
` `
}, { }, {

49
src/muz/spacer/spacer_qe_project.cpp
View file

@ -129,9 +129,9 @@ void peq::mk_peq(app_ref &result) {
ptr_vector<expr> args; ptr_vector<expr> args;
args.push_back(m_lhs); args.push_back(m_lhs);
args.push_back(m_rhs); args.push_back(m_rhs);
for (unsigned i = 0; i < m_num_indices; i++) { for (auto idx : m_diff_indices)
args.push_back(m_diff_indices.get(i)); args.push_back(idx);
}
m_peq = m.mk_app(m_decl, args.size(), args.data()); m_peq = m.mk_app(m_decl, args.size(), args.data());
} }
result = m_peq; result = m_peq;
@ -144,13 +144,11 @@ void peq::mk_eq(app_ref_vector &aux_consts, app_ref &result,
if (!stores_on_rhs) { std::swap(lhs, rhs); } if (!stores_on_rhs) { std::swap(lhs, rhs); }
// lhs = (...(store (store rhs i0 v0) i1 v1)...) // lhs = (...(store (store rhs i0 v0) i1 v1)...)
sort *val_sort = get_array_range(lhs->get_sort()); sort *val_sort = get_array_range(lhs->get_sort());
expr_ref_vector::iterator end = m_diff_indices.end(); for (auto it : m_diff_indices) {
for (expr_ref_vector::iterator it = m_diff_indices.begin(); it != end;
it++) {
app *val = m.mk_fresh_const("diff", val_sort); app *val = m.mk_fresh_const("diff", val_sort);
ptr_vector<expr> store_args; ptr_vector<expr> store_args;
store_args.push_back(rhs); store_args.push_back(rhs);
store_args.push_back(*it); store_args.push_back(it);
store_args.push_back(val); store_args.push_back(val);
rhs = m_arr_u.mk_store(store_args); rhs = m_arr_u.mk_store(store_args);
aux_consts.push_back(val); aux_consts.push_back(val);
@ -333,19 +331,19 @@ class arith_project_util {
m_strict.reset(); m_strict.reset();
m_eq.reset(); m_eq.reset();
for (unsigned i = 0; i < lits.size(); ++i) { for (auto lit : lits) {
rational c(0), d(0); rational c(0), d(0);
expr_ref t(m); expr_ref t(m);
bool is_strict = false; bool is_strict = false;
bool is_eq = false; bool is_eq = false;
bool is_diseq = false; bool is_diseq = false;
if (!(*m_var)(lits.get(i))) { if (!(*m_var)(lit)) {
new_lits.push_back(lits.get(i)); new_lits.push_back(lit);
continue; continue;
} }
if (is_linear(lits.get(i), c, t, d, is_strict, is_eq, is_diseq)) { if (is_linear(lit, c, t, d, is_strict, is_eq, is_diseq)) {
if (c.is_zero()) { if (c.is_zero()) {
m_rw(lits.get(i), t); m_rw(lit, t);
new_lits.push_back(t); new_lits.push_back(t);
} }
else if (is_eq) { else if (is_eq) {
@ -354,12 +352,13 @@ class arith_project_util {
eq_term = mk_mul(-(rational::one() / c), t); eq_term = mk_mul(-(rational::one() / c), t);
use_eq = true; use_eq = true;
} }
m_lits.push_back(lits.get(i)); m_lits.push_back(lit);
m_coeffs.push_back(c); m_coeffs.push_back(c);
m_terms.push_back(t); m_terms.push_back(t);
m_strict.push_back(false); m_strict.push_back(false);
m_eq.push_back(true); m_eq.push_back(true);
} else { }
else {
if (is_diseq) { if (is_diseq) {
// c*x + t != 0 // c*x + t != 0
// find out whether c*x + t < 0, or c*x + t > 0 // find out whether c*x + t < 0, or c*x + t > 0
@ -376,7 +375,7 @@ class arith_project_util {
} }
is_strict = true; is_strict = true;
} }
m_lits.push_back(lits.get(i)); m_lits.push_back(lit);
m_coeffs.push_back(c); m_coeffs.push_back(c);
m_terms.push_back(t); m_terms.push_back(t);
m_strict.push_back(is_strict); m_strict.push_back(is_strict);
@ -488,7 +487,8 @@ class arith_project_util {
m_strict.push_back(false); m_strict.push_back(false);
m_eq.push_back(true); m_eq.push_back(true);
m_divs.push_back(d); m_divs.push_back(d);
} else { }
else {
TRACE("qe", tout << "not an equality term\n";); TRACE("qe", tout << "not an equality term\n";);
if (is_diseq) { if (is_diseq) {
// c*x + t != 0 // c*x + t != 0
@ -513,18 +513,18 @@ class arith_project_util {
(!is_strict && (!is_strict &&
r <= rational::zero())) { // literal true in the r <= rational::zero())) { // literal true in the
// model // model
if (c.is_pos()) { if (c.is_pos())
++num_pos; ++num_pos;
} else { else
++num_neg; ++num_neg;
}
} }
} }
} }
TRACE("qe", tout << "c: " << c << "\n"; TRACE("qe", tout << "c: " << c << "\n";
tout << "t: " << mk_pp(t, m) << "\n"; tout << "t: " << mk_pp(t, m) << "\n";
tout << "d: " << d << "\n";); tout << "d: " << d << "\n";);
} else }
else
return false; return false;
} }
@ -573,13 +573,14 @@ class arith_project_util {
map.insert(m_var->x(), eq_term, nullptr); map.insert(m_var->x(), eq_term, nullptr);
TRACE("qe", tout << "Using equality term: " << mk_pp(eq_term, m) TRACE("qe", tout << "Using equality term: " << mk_pp(eq_term, m)
<< "\n";); << "\n";);
} else { }
else {
// find substitution term for (lcm_coeffs * x) // find substitution term for (lcm_coeffs * x)
if (m_coeffs[eq_idx].is_pos()) { if (m_coeffs[eq_idx].is_pos())
x_term_val = a.mk_uminus(m_terms.get(eq_idx)); x_term_val = a.mk_uminus(m_terms.get(eq_idx));
} else { else
x_term_val = m_terms.get(eq_idx); x_term_val = m_terms.get(eq_idx);
}
m_rw(x_term_val); m_rw(x_term_val);
TRACE("qe", tout << "Using equality literal: " TRACE("qe", tout << "Using equality literal: "
<< mk_pp(m_lits.get(eq_idx), m) << "\n"; << mk_pp(m_lits.get(eq_idx), m) << "\n";