File tree 1 file changed +9
-15
lines changed
1 file changed +9
-15
lines changed Original file line number Diff line number Diff line change @@ -111,15 +111,13 @@ namespace lp {
111
111
}
112
112
// Only b0 exists
113
113
else if (has_b0) {
114
- unsigned a0 = m_rev_map.at (b0);
115
-
114
+ unsigned a0 = m_rev_map.at (b0);
116
115
erase_val (b0);
117
116
add (a0, b1);
118
117
}
119
118
// Only b1 exists
120
119
else if (has_b1) {
121
- unsigned a1 = m_rev_map.at (b1);
122
-
120
+ unsigned a1 = m_rev_map.at (b1);
123
121
erase_val (b1);
124
122
add (a1, b0);
125
123
}
@@ -2479,14 +2477,11 @@ namespace lp {
2479
2477
print_deps (out, explain_fixed_in_meta_term (l_term));
2480
2478
out << " }\n " ;
2481
2479
}
2482
- if (belongs_to_f (i)) {
2480
+ if (belongs_to_f (i))
2483
2481
out << " in F\n " ;
2484
- }
2485
- else {
2486
- if (print_in_S) {
2487
- out << " in S\n " ;
2488
- }
2489
- }
2482
+ else if (print_in_S)
2483
+ out << " in S\n " ;
2484
+
2490
2485
if (print_column_info) {
2491
2486
bool has_fresh = false ;
2492
2487
for (const auto & p : m_e_matrix[i] ) {
@@ -2500,7 +2495,8 @@ namespace lp {
2500
2495
auto j = local_to_lar_solver (p.var ());
2501
2496
out << " \t x" << p.var () << " := " << lra.get_column_value (j) << " " << lra.get_bounds_string (j) << " \n " ;
2502
2497
}
2503
- } else {
2498
+ }
2499
+ else {
2504
2500
out << " \t has fresh vars\n " ;
2505
2501
}
2506
2502
}
@@ -2585,9 +2581,7 @@ namespace lp {
2585
2581
TRACE (" dioph_eq" , tout << " push to S:\n " ; print_entry (h, tout););
2586
2582
move_entry_from_f_to_s (kh, h);
2587
2583
eliminate_var_in_f (h, kh, kh_sign);
2588
- if (ih != f_vector.size () - 1 ) {
2589
- f_vector[ih] = f_vector.back ();
2590
- }
2584
+ f_vector[ih] = f_vector.back ();
2591
2585
f_vector.pop_back ();
2592
2586
}
2593
2587
else {
You can’t perform that action at this time.
0 commit comments