mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 21:03:39 +00:00
Code Activity

Fix arithmetic equality solver in qgen

Browse source
This commit is contained in:
Arie Gurfinkel 2018-06-28 15:35:02 -04:00
parent 41a05e9d58
commit 6422fa3739
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/muz/spacer/spacer_quant_generalizer.cpp
View file

@ -191,9 +191,15 @@ expr* times_minus_one(expr *e, arith_util &arith) {
Find sub-expression of the form (select A (+ sk!0 t)) and replaces Find sub-expression of the form (select A (+ sk!0 t)) and replaces
(+ sk!0 t) --> sk!0 and sk!0 --> (+ sk!0 (* (- 1) t)) (+ sk!0 t) --> sk!0 and sk!0 --> (+ sk!0 (* (- 1) t))
Current implementation is an ugly hack for one special case
rewrites bind to (+ bsk!0 t) where bsk!0 is the original binding for sk!0
Current implementation is an ugly hack for one special
case. Should be rewritten based on an equality solver from qe
*/ */
void lemma_quantifier_generalizer::cleanup(expr_ref_vector &cube, app_ref_vector const &zks, expr_ref &bind) { void lemma_quantifier_generalizer::cleanup(expr_ref_vector &cube,
app_ref_vector const &zks,
expr_ref &bind) {
if (zks.size() != 1) return; if (zks.size() != 1) return;
arith_util arith(m); arith_util arith(m);
@ -220,7 +226,7 @@ void lemma_quantifier_generalizer::cleanup(expr_ref_vector &cube, app_ref_vector
} }
else { else {
kids.push_back(times_minus_one(arg, arith)); kids.push_back(times_minus_one(arg, arith));
kids_bind.push_back (times_minus_one(arg, arith)); kids_bind.push_back(arg);
} }
} }
if (!found) continue; if (!found) continue;
@ -228,7 +234,8 @@ void lemma_quantifier_generalizer::cleanup(expr_ref_vector &cube, app_ref_vector
rep = arith.mk_add(kids.size(), kids.c_ptr()); rep = arith.mk_add(kids.size(), kids.c_ptr());
bind = arith.mk_add(kids_bind.size(), kids_bind.c_ptr()); bind = arith.mk_add(kids_bind.size(), kids_bind.c_ptr());
TRACE("spacer_qgen", TRACE("spacer_qgen",
tout << "replace " << mk_pp(idx, m) << " with " << mk_pp(rep, m) << "\n";); tout << "replace " << mk_pp(idx, m) << " with " << mk_pp(rep, m) << "\n"
<< "bind is: " << bind << "\n";);
break; break;
} }
} }