mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

fixed two interpolation bugs

Browse source
This commit is contained in:
Ken McMillan 2013-11-07 17:38:39 -08:00
parent b076c152b3
commit a898bad961
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/interp/iz3proof_itp.cpp
View file

@ -417,6 +417,10 @@ class iz3proof_itp_impl : public iz3proof_itp {
std::pair<hash_map<ast,ast>::iterator,bool> bar = subst_memo.insert(foo); std::pair<hash_map<ast,ast>::iterator,bool> bar = subst_memo.insert(foo);
ast &res = bar.first->second; ast &res = bar.first->second;
if(bar.second){ if(bar.second){
if(sym(e) == rotate_sum && var == get_placeholder(arg(e,0))){
res = e;
return res;
}
int nargs = num_args(e); int nargs = num_args(e);
std::vector<ast> args(nargs); std::vector<ast> args(nargs);
for(int i = 0; i < nargs; i++) for(int i = 0; i < nargs; i++)
@ -495,6 +499,8 @@ class iz3proof_itp_impl : public iz3proof_itp {
if(g == modpon) return simplify_rotate_modpon(pl,args[0],pf); if(g == modpon) return simplify_rotate_modpon(pl,args[0],pf);
// if(g == symm) return simplify_rotate_symm(pl,args[0],pf); // if(g == symm) return simplify_rotate_symm(pl,args[0],pf);
} }
if(op(pf) == Leq)
throw "foo!";
throw cannot_simplify(); throw cannot_simplify();
} }
@ -1355,17 +1361,18 @@ class iz3proof_itp_impl : public iz3proof_itp {
} }
void eq_from_ineq(const ast &ineq, ast &lhs, ast &rhs){ void eq_from_ineq(const ast &ineq, ast &lhs, ast &rhs){
ast s = ineq_to_lhs(ineq); // ast s = ineq_to_lhs(ineq);
ast srhs = arg(s,1); // ast srhs = arg(s,1);
ast srhs = arg(ineq,0);
if(op(srhs) == Plus && num_args(srhs) == 2){ if(op(srhs) == Plus && num_args(srhs) == 2){
lhs = arg(srhs,0); lhs = arg(srhs,0);
rhs = arg(srhs,1); rhs = arg(srhs,1);
if(op(lhs) == Times) // if(op(lhs) == Times)
std::swap(lhs,rhs); // std::swap(lhs,rhs);
if(op(rhs) == Times){ if(op(rhs) == Times){
rhs = arg(rhs,1); rhs = arg(rhs,1);
if(op(ineq) == Leq) // if(op(ineq) == Leq)
std::swap(lhs,rhs); // std::swap(lhs,rhs);
return; return;
} }
} }