@@ -1940,7 +1940,8 @@ namespace lp {
1940
1940
SASSERT (is_eliminated_from_f (j));
1941
1941
}
1942
1942
// j is the variable to eliminate, or substitude, it appears in term t with
1943
- // a coefficient equal to j_sign which is +-1 , matrix m_l_matrix is not changed since it is a substitution of a fresh variable
1943
+ // a coefficient equal to j_sign which is +-1 ,
1944
+ // matrix m_l_matrix is not changed since it is a substitution of a fresh variable
1944
1945
void eliminate_var_in_f_with_term (const lar_term& t, unsigned j, int j_sign) {
1945
1946
SASSERT (abs (t.get_coeff (j)).is_one ());
1946
1947
TRACE (" dioph_eq" , tout << " eliminate var:" << j << " by using:" ;
@@ -1956,16 +1957,16 @@ namespace lp {
1956
1957
}
1957
1958
1958
1959
mpq coeff = m_e_matrix.get_val (c);
1959
- unsigned i = c.var ();
1960
- TRACE (" dioph_eq" , tout << " before pivot entry :" ; print_entry (i, tout) << std::endl;);
1960
+ TRACE (" dioph_eq" , tout << " before pivot entry :" ; print_entry (c.var (), tout) << std::endl;);
1961
1961
m_e_matrix.pivot_term_to_row_given_cell (t, c, j, j_sign);
1962
1962
TRACE (" dioph_eq" , tout << " after pivoting c_row:" ;
1963
- print_entry (i , tout););
1964
- SASSERT (entry_invariant (i ));
1963
+ print_entry (c. var () , tout););
1964
+ SASSERT (entry_invariant (c. var () ));
1965
1965
cell_to_process--;
1966
1966
}
1967
1967
SASSERT (is_eliminated_from_f (j));
1968
1968
}
1969
+
1969
1970
bool is_eliminated_from_f (unsigned j) const {
1970
1971
for (unsigned ei = 0 ; ei < m_e_matrix.row_count (); ei++) {
1971
1972
if (!belongs_to_f (ei)) continue ;
@@ -1978,6 +1979,7 @@ namespace lp {
1978
1979
}
1979
1980
return true ;
1980
1981
}
1982
+
1981
1983
term_o term_to_lar_solver (const term_o& eterm) const {
1982
1984
term_o ret;
1983
1985
for (const auto & p : eterm) {
0 commit comments