mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-09-30 13:19:04 +00:00
Code Activity

Partial cleanup of util/lp/*

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2017-09-17 16:00:06 +01:00
parent 00651f8f21
commit d61b722b68
109 changed files with 3503 additions and 2023 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/util/lp/stacked_vector.h
View file

@ -7,7 +7,7 @@ Author: Lev Nachmanson
#include <set>
#include <stack>
#include "util/vector.h"
namespace lean {
namespace lp {
template < typename B> class stacked_vector {
vector<unsigned> m_stack_of_vector_sizes;
vector<unsigned> m_stack_of_change_sizes;
@ -19,7 +19,7 @@ public:
unsigned m_i;
public:
ref(stacked_vector<B> &m, unsigned key) :m_vec(m), m_i(key) {
lean_assert(key < m.size());
SASSERT(key < m.size());
}
ref & operator=(const B & b) {
m_vec.emplace_replace(m_i, b);
@ -40,7 +40,7 @@ public:
unsigned m_i;
public:
ref_const(const stacked_vector<B> &m, unsigned key) :m_vec(m), m_i(key) {
lean_assert(key < m.size());
SASSERT(key < m.size());
}
operator const B&() const {
@ -68,7 +68,7 @@ public:
/*
const B & operator[](unsigned a) const {
lean_assert(a < m_vector.size());
SASSERT(a < m_vector.size());
return m_vector[a];
}
*/
@ -88,7 +88,7 @@ public:
template <typename T>
void pop_tail(vector<T> & v, unsigned k) {
lean_assert(v.size() >= k);
SASSERT(v.size() >= k);
v.resize(v.size() - k);
}
@ -98,8 +98,8 @@ public:
}
void pop(unsigned k) {
lean_assert(m_stack_of_vector_sizes.size() >= k);
lean_assert(k > 0);
SASSERT(m_stack_of_vector_sizes.size() >= k);
SASSERT(k > 0);
resize(m_vector, m_stack_of_vector_sizes[m_stack_of_vector_sizes.size() - k]);
pop_tail(m_stack_of_vector_sizes, k);
unsigned first_change = m_stack_of_change_sizes[m_stack_of_change_sizes.size() - k];
@ -119,15 +119,15 @@ public:
return;
delta & d = m_stack.back();
lean_assert(m_vector.size() >= d.m_size);
SASSERT(m_vector.size() >= d.m_size);
while (m_vector.size() > d.m_size)
m_vector.pop_back();
for (auto & t : d.m_original_changed) {
lean_assert(t.first < m_vector.size());
SASSERT(t.first < m_vector.size());
m_vector[t.first] = t.second;
}
// lean_assert(d.m_deb_copy == m_vector);
// SASSERT(d.m_deb_copy == m_vector);
m_stack.pop_back();*/
}
@ -157,7 +157,7 @@ public:
}
unsigned peek_size(unsigned k) const {
lean_assert(k > 0 && k <= m_stack_of_vector_sizes.size());
SASSERT(k > 0 && k <= m_stack_of_vector_sizes.size());
return m_stack_of_vector_sizes[m_stack_of_vector_sizes.size() - k];
}