3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-03 22:05:45 +00:00
* rename ul_pair to column

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* t

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* simple test passed

* remove an assert

* relax an assertion

* remove an obsolete function

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* access a term by the term column

* remove the column index from colunm.h

* remove an unused method

* remove debug code

* fix the build of lp_tst

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

---------

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
Co-authored-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Nikolaj Bjorner 2024-01-24 16:05:18 -08:00 committed by GitHub
parent 133546625c
commit bdb9106f99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 587 additions and 973 deletions

View file

@ -228,7 +228,7 @@ namespace lp {
bool int_solver::cut_indices_are_columns() const {
for (lar_term::ival p : m_t) {
if (p.column().index() >= lra.A_r().column_count())
if (p.j() >= lra.A_r().column_count())
return false;
}
return true;
@ -271,7 +271,7 @@ namespace lp {
return lra.settings();
}
bool int_solver::column_is_int(column_index const& j) const {
bool int_solver::column_is_int(lpvar j) const {
return lra.column_is_int(j);
}
@ -296,7 +296,7 @@ namespace lp {
}
bool int_solver::is_term(unsigned j) const {
return lra.column_corresponds_to_term(j);
return lra.column_has_term(j);
}
unsigned int_solver::column_count() const {