mirror of
https://github.com/Z3Prover/z3
synced 2025-10-09 09:21:56 +00:00
convert m_r_upper and m_r_lower bounds to plain vectors
manage backtracking state together with backtracking of column data.
This commit is contained in:
parent
fae60946bf
commit
e41acd7b50
6 changed files with 46 additions and 24 deletions
|
@ -75,7 +75,7 @@ int int_branch::find_inf_int_base_column() {
|
|||
if (!lia.column_is_int_inf(j))
|
||||
continue;
|
||||
usage = lra.usage_in_terms(j);
|
||||
if (lia.is_boxed(j) && (range = lcs.m_r_upper_bounds()[j].x - lcs.m_r_lower_bounds()[j].x - rational(2*usage)) <= small_value) {
|
||||
if (lia.is_boxed(j) && (range = lcs.m_r_upper_bounds[j].x - lcs.m_r_lower_bounds[j].x - rational(2*usage)) <= small_value) {
|
||||
result = j;
|
||||
k++;
|
||||
n = 1;
|
||||
|
@ -98,7 +98,7 @@ int int_branch::find_inf_int_base_column() {
|
|||
continue;
|
||||
SASSERT(!lia.is_fixed(j));
|
||||
usage = lra.usage_in_terms(j);
|
||||
new_range = lcs.m_r_upper_bounds()[j].x - lcs.m_r_lower_bounds()[j].x - rational(2*usage);
|
||||
new_range = lcs.m_r_upper_bounds[j].x - lcs.m_r_lower_bounds[j].x - rational(2*usage);
|
||||
if (new_range < range) {
|
||||
n = 1;
|
||||
result = j;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue