mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-23 14:23:40 +00:00
Code Activity

debug min_max

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-12-18 09:18:06 +02:00
parent 392b419367
commit cff0e0fc6c
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/theory_arith.h
View file

@ -855,7 +855,7 @@ namespace smt {
row m_tmp_row; row m_tmp_row;
void add_tmp_row(row & r1, numeral const & coeff, row const & r2); void add_tmp_row(row & r1, numeral const & coeff, row const & r2);
theory_var pick_var_to_leave(theory_var x_j, bool inc, numeral & a_ij, inf_numeral & gain); theory_var pick_var_to_leave(theory_var x_j, bool inc, numeral & a_ij, inf_numeral & gain, bool& skiped_row);
bool is_safe_to_leave(theory_var x); bool is_safe_to_leave(theory_var x);
void move_to_bound(theory_var x_i, bool inc); void move_to_bound(theory_var x_i, bool inc);
template<bool invert> template<bool invert>

12
src/smt/theory_arith_aux.h
View file

@ -952,7 +952,7 @@ namespace smt {
} }
template<typename Ext> template<typename Ext>
theory_var theory_arith<Ext>::pick_var_to_leave(theory_var x_j, bool inc, numeral & a_ij, inf_numeral & gain) { theory_var theory_arith<Ext>::pick_var_to_leave(theory_var x_j, bool inc, numeral & a_ij, inf_numeral & gain, bool& skipped_row) {
TRACE("opt", tout << "selecting variable to replace v" << x_j << ", inc: " << inc << "\n";); TRACE("opt", tout << "selecting variable to replace v" << x_j << ", inc: " << inc << "\n";);
theory_var x_i = null_theory_var; theory_var x_i = null_theory_var;
inf_numeral curr_gain; inf_numeral curr_gain;
@ -974,10 +974,14 @@ namespace smt {
if (curr_gain.is_neg()) if (curr_gain.is_neg())
curr_gain.neg(); curr_gain.neg();
if (x_i == null_theory_var || (curr_gain < gain) || (gain.is_zero() && curr_gain.is_zero() && s < x_i)) { if (x_i == null_theory_var || (curr_gain < gain) || (gain.is_zero() && curr_gain.is_zero() && s < x_i)) {
if (is_int(s) && !curr_gain.is_int()) if (is_int(s) && !curr_gain.is_int()) {
skipped_row = true;
continue; continue;
if (is_int(x_j) && !curr_gain.is_int()) }
if (is_int(x_j) && !curr_gain.is_int()) {
skipped_row = true;
continue; continue;
}
x_i = s; x_i = s;
a_ij = coeff; a_ij = coeff;
gain = curr_gain; gain = curr_gain;
@ -1309,7 +1313,7 @@ namespace smt {
skipped_row = true; skipped_row = true;
continue; continue;
} }
theory_var curr_x_i = pick_var_to_leave(curr_x_j, curr_inc, curr_a_ij, curr_gain); theory_var curr_x_i = pick_var_to_leave(curr_x_j, curr_inc, curr_a_ij, curr_gain, skipped_row);
if (curr_x_i == null_theory_var) { if (curr_x_i == null_theory_var) {
// we can increase/decrease curr_x_j as much as we want. // we can increase/decrease curr_x_j as much as we want.
x_i = null_theory_var; // unbounded x_i = null_theory_var; // unbounded