3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00

restore some class names by replacing u_set to int_set

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-03-25 09:36:07 -07:00
parent ab34ef9daf
commit 09467ba677
5 changed files with 38 additions and 38 deletions

View file

@ -96,7 +96,7 @@ public:
};
class constrau_set {
class constraint_set {
region m_region;
column_namer& m_namer;
vector<lar_base_constraint*> m_constraints;
@ -139,10 +139,10 @@ class constrau_set {
}
public:
constrau_set(column_namer& cn):
constraint_set(column_namer& cn):
m_namer(cn) {}
~constrau_set() {
~constraint_set() {
for (auto* c : m_constraints)
c->~lar_base_constraint();
}
@ -198,15 +198,15 @@ public:
bool valid_index(constraint_index ci) const { return ci < m_constraints.size(); }
class active_constraints {
friend class constrau_set;
constrau_set const& cs;
friend class constraint_set;
constraint_set const& cs;
public:
active_constraints(constrau_set const& cs): cs(cs) {}
active_constraints(constraint_set const& cs): cs(cs) {}
class iterator {
friend class constrau_set;
constrau_set const& cs;
friend class constraint_set;
constraint_set const& cs;
unsigned m_index;
iterator(constrau_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); }
iterator(constraint_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); }
void next() { ++m_index; forward(); }
void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); m_index++) ; }
public:
@ -224,15 +224,15 @@ public:
active_constraints active() const { return active_constraints(*this); }
class active_indices {
friend class constrau_set;
constrau_set const& cs;
friend class constraint_set;
constraint_set const& cs;
public:
active_indices(constrau_set const& cs): cs(cs) {}
active_indices(constraint_set const& cs): cs(cs) {}
class iterator {
friend class constrau_set;
constrau_set const& cs;
friend class constraint_set;
constraint_set const& cs;
unsigned m_index;
iterator(constrau_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); }
iterator(constraint_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); }
void next() { ++m_index; forward(); }
void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); m_index++) ; }
public:
@ -288,7 +288,7 @@ public:
};
inline std::ostream& operator<<(std::ostream& out, constrau_set const& cs) {
inline std::ostream& operator<<(std::ostream& out, constraint_set const& cs) {
return cs.display(out);
}