mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-25 01:55:32 +00:00
Code Activity

remove template dependency for trail objects

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-03-19 11:14:20 -07:00
parent c05c5caab5
commit 15a7621e27
28 changed files with 46 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/math/lp/emonics.h
View file

@ -82,7 +82,7 @@ class emonics {
};
union_find<emonics> m_u_f;
trail_stack<emonics> m_u_f_stack;
trail_stack m_u_f_stack;
mutable svector<lpvar> m_find_key; // the key used when looking for a monic with the specific variables
var_eqs<emonics>& m_ve;
mutable vector<monic> m_monics; // set of monics
@ -124,7 +124,7 @@ public:
*/
emonics(var_eqs<emonics>& ve):
m_u_f(*this),
m_u_f_stack(*this),
m_u_f_stack(),
m_ve(ve),
m_visited(0),
m_cg_hash(*this),
@ -141,7 +141,7 @@ public:
void after_merge_eh(unsigned r2, unsigned r1, unsigned v2, unsigned v1) {}
// this method is required by union_find
trail_stack<emonics> & get_trail_stack() { return m_u_f_stack; }
trail_stack & get_trail_stack() { return m_u_f_stack; }
/**
\brief push/pop scopes.

6
src/math/lp/var_eqs.h
View file

@ -72,7 +72,7 @@ class var_eqs {
m_trail;
vector<svector<eq_edge>> m_eqs; // signed_var.index() -> the edges adjacent to signed_var.index()
trail_stack<var_eqs> m_stack;
trail_stack m_stack;
mutable svector<var_frame> m_todo;
mutable bool_vector m_marked;
mutable unsigned_vector m_marked_trail;
@ -80,7 +80,7 @@ class var_eqs {
mutable stats m_stats;
public:
var_eqs(): m_merge_handler(nullptr), m_uf(*this), m_stack(*this) {}
var_eqs(): m_merge_handler(nullptr), m_uf(*this), m_stack() {}
/**
\brief push a scope */
void push() {
@ -328,7 +328,7 @@ public:
// union find event handlers
void set_merge_handler(T* mh) { m_merge_handler = mh; }
// this method is required by union_find
trail_stack<var_eqs> & get_trail_stack() { return m_stack; }
trail_stack & get_trail_stack() { return m_stack; }
void unmerge_eh(unsigned i, unsigned j) {
if (m_merge_handler) {