mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

simplify column

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2024-12-20 10:37:23 -10:00 committed by Lev Nachmanson
parent 8d747865ae
commit 7fe703e229
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/math/lp/column.h
View file

@ -40,7 +40,6 @@ class lar_term; // forward definition
class column { class column {
u_dependency* m_lower_bound_witness = nullptr; u_dependency* m_lower_bound_witness = nullptr;
u_dependency* m_upper_bound_witness = nullptr; u_dependency* m_upper_bound_witness = nullptr;
bool m_associated_with_row = false;
lar_term* m_term = nullptr; lar_term* m_term = nullptr;
public: public:
lar_term* term() const { return m_term; } lar_term* term() const { return m_term; }
@ -50,13 +49,11 @@ public:
u_dependency*& upper_bound_witness() { return m_upper_bound_witness; } u_dependency*& upper_bound_witness() { return m_upper_bound_witness; }
u_dependency* upper_bound_witness() const { return m_upper_bound_witness; } u_dependency* upper_bound_witness() const { return m_upper_bound_witness; }
column() = delete; column() {}
column(bool) = delete;
column(bool associated_with_row, lar_term* term) : column(lar_term* term) : m_term(term) {}
m_associated_with_row(associated_with_row), m_term(term) {}
bool associated_with_row() const { return m_associated_with_row; } bool associated_with_row() const { return m_term != nullptr; }
}; };
} }

4
src/math/lp/lar_solver.cpp
View file

@ -1577,7 +1577,7 @@ namespace lp {
return local_j; return local_j;
lp_assert(m_columns.size() == A_r().column_count()); lp_assert(m_columns.size() == A_r().column_count());
local_j = A_r().column_count(); local_j = A_r().column_count();
m_columns.push_back(column(false, nullptr)); // false - not associated with a row, nullptr for term m_columns.push_back(column());
m_trail.push(undo_add_column(*this)); m_trail.push(undo_add_column(*this));
while (m_usage_in_terms.size() <= local_j) while (m_usage_in_terms.size() <= local_j)
m_usage_in_terms.push_back(0); m_usage_in_terms.push_back(0);
@ -1704,7 +1704,7 @@ namespace lp {
// j will be a new variable // j will be a new variable
unsigned j = A_r().column_count(); unsigned j = A_r().column_count();
SASSERT(ext_index == null_lpvar || external_to_local(ext_index) == j); SASSERT(ext_index == null_lpvar || external_to_local(ext_index) == j);
column ul(true, term); // true - to mark this column as associated_with_row column ul(term);
term->j() = j; // point from the term to the column term->j() = j; // point from the term to the column
m_columns.push_back(ul); m_columns.push_back(ul);
m_trail.push(undo_add_column(*this)); m_trail.push(undo_add_column(*this));