mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 19:02:02 +00:00
Code Activity

Buggy version, a full model is found but evaluation finds it to be invalid.

Browse source
This commit is contained in:
Aleksandar Zeljic 2015-06-09 21:16:53 +02:00
parent 444dc0ed0a
commit a37ec41370
1 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/tactic/fpa/fpa2bv_approx_tactic.cpp
View file

@ -102,7 +102,7 @@ class fpa2bv_approx_tactic: public tactic {
obj_map<func_decl, app*> & const2term_map) { obj_map<func_decl, app*> & const2term_map) {
for (unsigned i = 0; i < cnsts.size(); i++) for (unsigned i = 0; i < cnsts.size(); i++)
{ {
if (const2term_map.contains(cnsts[i]) || m_mode == FPAA_SMALL_FLOATS) if (const2term_map.contains(cnsts.get(i)) || m_mode == FPAA_SMALL_FLOATS)
map.insert_if_not_there(cnsts.get(i), 0); map.insert_if_not_there(cnsts.get(i), 0);
else else
map.insert_if_not_there(cnsts.get(i), MAX_PRECISION); map.insert_if_not_there(cnsts.get(i), MAX_PRECISION);
@ -516,19 +516,25 @@ class fpa2bv_approx_tactic: public tactic {
else else
full_semantics_eval(rhs,mpf_mngr,rm,arg_val,est_arg_val, rhs_value, est_rhs_value); full_semantics_eval(rhs,mpf_mngr,rm,arg_val,est_arg_val, rhs_value, est_rhs_value);
full_mdl->register_decl((to_app(lhs))->get_decl(), m_float_util.mk_value(est_rhs_value)); if (mpf_mngr.eq(rhs_value, est_rhs_value)) {
full_mdl->register_decl((to_app(lhs))->get_decl(), m_float_util.mk_value(est_rhs_value));
precise_op.insert(lhs, true);
}
else {
full_mdl->register_decl((to_app(lhs))->get_decl(), m_float_util.mk_value(est_rhs_value));
#ifdef Z3DEBUG #ifdef Z3DEBUG
std::cout << "Assigning " << mk_ismt2_pp(lhs, m) << std::cout << "Assigning " << mk_ismt2_pp(lhs, m) <<
" value " << mpf_mngr.to_string(est_rhs_value) << std::endl " value " << mpf_mngr.to_string(est_rhs_value) << std::endl
<< "Values of " << mk_ismt2_pp(lhs, m) << std::endl << "Values of " << mk_ismt2_pp(lhs, m) << std::endl
<< "Precise children: " << ((precise_children) ? "True" : "False") << std::endl << "Precise children: " << ((precise_children) ? "True" : "False") << std::endl
<< "Lhs: " << mk_ismt2_pp(lhs_eval, m) << std::endl << "Lhs: " << mk_ismt2_pp(lhs_eval, m) << std::endl
<< "Model: " << mpf_mngr.to_string(rhs_value) << std::endl << "Model: " << mpf_mngr.to_string(rhs_value) << std::endl
<< "Estimate: " << mpf_mngr.to_string(est_rhs_value) << std::endl; << "Estimate: " << mpf_mngr.to_string(est_rhs_value) << std::endl;
#endif #endif
calculate_error(lhs,mpf_mngr,precise_op,err_est,lhs_value,est_rhs_value,children_have_finite_err); calculate_error(lhs,mpf_mngr,precise_op,err_est,lhs_value,est_rhs_value,children_have_finite_err);
}
if (!actual_value.contains(lhs)) { if (!actual_value.contains(lhs)) {
mpf * tmp = alloc(mpf); mpf * tmp = alloc(mpf);
mpf_mngr.set(*tmp, est_rhs_value); mpf_mngr.set(*tmp, est_rhs_value);
@ -695,6 +701,7 @@ class fpa2bv_approx_tactic: public tactic {
} }
} }
} }
} }
void increase_precision( void increase_precision(
@ -784,8 +791,13 @@ class fpa2bv_approx_tactic: public tactic {
boolean_comparison_of_models(g, mdl, full_mdl, cnst2term_map, expr_count); boolean_comparison_of_models(g, mdl, full_mdl, cnst2term_map, expr_count);
calculate_relative_error(err_est, expr_count, err_ratio_map); calculate_relative_error(err_est, expr_count, err_ratio_map);
rank_terms (err_ratio_map,ranked_terms); if (err_ratio_map.empty()) {
increase_precision(ranked_terms,cnsts,cnst2prec_map,cnst2term_map,new_map); proof_guided_refinement(g,cnsts,cnst2prec_map,new_map);
}
else {
rank_terms (err_ratio_map,ranked_terms);
increase_precision(ranked_terms,cnsts,cnst2prec_map,cnst2term_map,new_map);
}
} }
void simplify(goal_ref mg) { void simplify(goal_ref mg) {
@ -1108,6 +1120,8 @@ class fpa2bv_approx_tactic: public tactic {
m_num_steps = 0; m_num_steps = 0;
} }
void print_constants(func_decl_ref_vector & constants, obj_map<func_decl, unsigned> & const2prec_map){ void print_constants(func_decl_ref_vector & constants, obj_map<func_decl, unsigned> & const2prec_map){
#ifdef Z3DEBUG #ifdef Z3DEBUG
for(unsigned i=0;i<constants.size();i++) for(unsigned i=0;i<constants.size();i++)
@ -1173,11 +1187,18 @@ class fpa2bv_approx_tactic: public tactic {
model_ref full_mdl = alloc(model, m); model_ref full_mdl = alloc(model, m);
obj_map<expr, double> err_est; obj_map<expr, double> err_est;
solved = precise_model_reconstruction(m_fpa_model, full_mdl, mg, err_est, constants, const2term_map); if (fully_encoded(const2prec_map)) {
full_mdl = m_fpa_model;
std::cout<<"Patching of the model "<<((solved)?"succeeded":"failed")<<std::endl; solved = true;
std::cout.flush(); std::cout<<"Model is at full precision, no patching needed!"<<std::endl;
std::cout.flush();
}
else {
solved = precise_model_reconstruction(m_fpa_model, full_mdl, mg, err_est, constants, const2term_map);
std::cout<<"Patching of the model "<<((solved)?"succeeded":"failed")<<std::endl;
std::cout.flush();
}
if (!solved) if (!solved)
model_guided_approximation_refinement(m_fpa_model, full_mdl, mg, constants, const2prec_map, const2term_map, err_est, next_const2prec_map); model_guided_approximation_refinement(m_fpa_model, full_mdl, mg, constants, const2prec_map, const2term_map, err_est, next_const2prec_map);
else else