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

fix for github issue 83

Browse source
This commit is contained in:
Ken McMillan 2015-05-20 15:37:51 -07:00
parent cd8f82ebc2
commit caa616f11b
3 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/interp/iz3mgr.cpp
View file

@ -556,6 +556,20 @@ void iz3mgr::get_farkas_coeffs(const ast &proof, std::vector<rational>& rats){
extract_lcd(rats); extract_lcd(rats);
} }
void iz3mgr::get_broken_gcd_test_coeffs(const ast &proof, std::vector<rational>& rats){
symb s = sym(proof);
int numps = s->get_num_parameters();
rats.resize(numps-2);
for(int i = 2; i < numps; i++){
rational r;
bool ok = s->get_parameter(i).is_rational(r);
if(!ok)
throw "Bad Farkas coefficient";
rats[i-2] = r;
}
extract_lcd(rats);
}
void iz3mgr::get_assign_bounds_coeffs(const ast &proof, std::vector<ast>& coeffs){ void iz3mgr::get_assign_bounds_coeffs(const ast &proof, std::vector<ast>& coeffs){
std::vector<rational> rats; std::vector<rational> rats;
get_assign_bounds_coeffs(proof,rats); get_assign_bounds_coeffs(proof,rats);

2
src/interp/iz3mgr.h
View file

@ -424,6 +424,8 @@ class iz3mgr {
void get_farkas_coeffs(const ast &proof, std::vector<rational>& rats); void get_farkas_coeffs(const ast &proof, std::vector<rational>& rats);
void get_broken_gcd_test_coeffs(const ast &proof, std::vector<rational>& rats);
void get_assign_bounds_coeffs(const ast &proof, std::vector<rational>& rats); void get_assign_bounds_coeffs(const ast &proof, std::vector<rational>& rats);
void get_assign_bounds_coeffs(const ast &proof, std::vector<ast>& rats); void get_assign_bounds_coeffs(const ast &proof, std::vector<ast>& rats);

8
src/interp/iz3translate.cpp
View file

@ -1021,6 +1021,12 @@ public:
my_coeffs.push_back(make_int(c)); my_coeffs.push_back(make_int(c));
my_prem_cons.push_back(conc(prem(proof,i))); my_prem_cons.push_back(conc(prem(proof,i)));
} }
else if(c.is_neg()){
int j = (i % 2 == 0) ? i + 1 : i - 1;
my_prems.push_back(prems[j]);
my_coeffs.push_back(make_int(-coeffs[j]));
my_prem_cons.push_back(conc(prem(proof,j)));
}
} }
ast my_con = sum_inequalities(my_coeffs,my_prem_cons); ast my_con = sum_inequalities(my_coeffs,my_prem_cons);
@ -1884,7 +1890,7 @@ public:
} }
case GCDTestKind: { case GCDTestKind: {
std::vector<rational> farkas_coeffs; std::vector<rational> farkas_coeffs;
get_farkas_coeffs(proof,farkas_coeffs); get_broken_gcd_test_coeffs(proof,farkas_coeffs);
if(farkas_coeffs.size() != nprems){ if(farkas_coeffs.size() != nprems){
pfgoto(proof); pfgoto(proof);
throw unsupported(); throw unsupported();