mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-18 11:58:31 +00:00
Code Activity

use incremental vector

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-05-13 15:49:08 -07:00
parent 94e3078920
commit d78cc4975a
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/util/lp/incremental_vector.h
View file

@ -19,9 +19,6 @@ Revision History:
--*/ --*/
#pragma once #pragma once
#include <unordered_map>
#include <set>
#include <stack>
#include "util/vector.h" #include "util/vector.h"
namespace lp { namespace lp {
template <typename B> class incremental_vector { template <typename B> class incremental_vector {
@ -36,12 +33,12 @@ public:
return m_vector.size(); return m_vector.size();
} }
void push() { void push_scope() {
m_stack_of_vector_sizes.push_back(m_vector.size()); m_stack_of_vector_sizes.push_back(m_vector.size());
} }
void pop() { void pop_scope() {
pop(1); pop_scope(1);
} }
template <typename T> template <typename T>
@ -55,12 +52,12 @@ public:
v.resize(new_size); v.resize(new_size);
} }
void pop(unsigned k) { void pop_scope(unsigned k) {
lp_assert(m_stack_of_vector_sizes.size() >= k); lp_assert(m_stack_of_vector_sizes.size() >= k);
lp_assert(k > 0); lp_assert(k > 0);
m_vector.shrink(peek_size(k)); m_vector.shrink(peek_size(k));
unsigned new_st_size = m_stack_of_vector_sizes.size() - k; unsigned new_st_size = m_stack_of_vector_sizes.size() - k;
m_stack_of_vector_sizes.shrink(k); m_stack_of_vector_sizes.shrink(new_st_size);
} }
void push_back(const B & b) { void push_back(const B & b) {

29
src/util/lp/var_eqs.h
View file

@ -23,6 +23,8 @@
#include "util/lp/lp_types.h" #include "util/lp/lp_types.h"
#include "util/rational.h" #include "util/rational.h"
#include "util/lp/explanation.h" #include "util/lp/explanation.h"
#include "util/lp/incremental_vector.h"
namespace nla { namespace nla {
class eq_justification { class eq_justification {
@ -64,16 +66,16 @@ class var_eqs {
stats() { memset(this, 0, sizeof(*this)); } stats() { memset(this, 0, sizeof(*this)); }
}; };
T* m_merge_handler; T* m_merge_handler;
union_find<var_eqs> m_uf; union_find<var_eqs> m_uf;
svector<std::pair<signed_var, signed_var>> m_trail; lp::incremental_vector<std::pair<signed_var, signed_var>>
unsigned_vector m_trail_lim; m_trail;
vector<svector<eq_edge>> m_eqs; // signed_var.index() -> the edges adjacent to signed_var.index() vector<svector<eq_edge>> m_eqs; // signed_var.index() -> the edges adjacent to signed_var.index()
trail_stack<var_eqs> m_stack; trail_stack<var_eqs> m_stack;
mutable svector<var_frame> m_todo; mutable svector<var_frame> m_todo;
mutable svector<bool> m_marked; mutable svector<bool> m_marked;
mutable unsigned_vector m_marked_trail; mutable unsigned_vector m_marked_trail;
mutable svector<eq_justification> m_justtrail; mutable svector<eq_justification> m_justtrail;
mutable stats m_stats; mutable stats m_stats;
@ -82,7 +84,7 @@ public:
/** /**
\brief push a scope */ \brief push a scope */
void push() { void push() {
m_trail_lim.push_back(m_trail.size()); m_trail.push_scope();
m_stack.push_scope(); m_stack.push_scope();
} }
@ -90,7 +92,7 @@ public:
\brief pop n scopes \brief pop n scopes
*/ */
void pop(unsigned n) { void pop(unsigned n) {
unsigned old_sz = m_trail_lim[m_trail_lim.size() - n]; unsigned old_sz = m_trail.peek_size(n);
for (unsigned i = m_trail.size(); i-- > old_sz; ) { for (unsigned i = m_trail.size(); i-- > old_sz; ) {
auto const& sv = m_trail[i]; auto const& sv = m_trail[i];
m_eqs[sv.first.index()].pop_back(); m_eqs[sv.first.index()].pop_back();
@ -98,9 +100,8 @@ public:
m_eqs[(~sv.first).index()].pop_back(); m_eqs[(~sv.first).index()].pop_back();
m_eqs[(~sv.second).index()].pop_back(); m_eqs[(~sv.second).index()].pop_back();
} }
m_trail_lim.shrink(m_trail_lim.size() - n); m_trail.pop_scope(n);
m_trail.shrink(old_sz); m_stack.pop_scope(n); // this cass takes care of unmerging through union_find m_uf
m_stack.pop_scope(n);
} }
/** /**