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

make var-queue a template

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-12-05 15:41:35 -08:00
parent 156426a0cf
commit 1d6616afac
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sat/sat_solver.h
View file

@ -164,7 +164,7 @@ namespace sat {
unsigned m_rephase_inc; unsigned m_rephase_inc;
backoff m_rephase; backoff m_rephase;
backoff m_reorder; backoff m_reorder;
var_queue m_case_split_queue; var_queue<unsigned_vector> m_case_split_queue;
unsigned m_qhead; unsigned m_qhead;
unsigned m_scope_lvl; unsigned m_scope_lvl;
unsigned m_search_lvl; unsigned m_search_lvl;

15
src/util/var_queue.h
View file

@ -21,20 +21,20 @@ Revision History:
#include "util/heap.h" #include "util/heap.h"
template <class ActivityVector>
class var_queue { class var_queue {
typedef unsigned var; typedef unsigned var;
struct lt { struct lt {
svector<unsigned> & m_activity; ActivityVector & m_activity;
lt(svector<unsigned> & act):m_activity(act) {} lt(ActivityVector & act):m_activity(act) {}
bool operator()(var v1, var v2) const { return m_activity[v1] > m_activity[v2]; } bool operator()(var v1, var v2) const { return m_activity[v1] > m_activity[v2]; }
}; };
heap<lt> m_queue; heap<lt> m_queue;
public:
public:
var_queue(svector<unsigned> & act):m_queue(128, lt(act)) {} var_queue(ActivityVector & act):m_queue(128, lt(act)) {}
void activity_increased_eh(var v) { void activity_increased_eh(var v) {
if (m_queue.contains(v)) if (m_queue.contains(v))
@ -90,11 +90,12 @@ public:
return out; return out;
} }
using const_iterator = decltype(m_queue)::const_iterator; using const_iterator = const int *;
const_iterator begin() const { return m_queue.begin(); } const_iterator begin() const { return m_queue.begin(); }
const_iterator end() const { return m_queue.end(); } const_iterator end() const { return m_queue.end(); }
}; };
inline std::ostream& operator<<(std::ostream& out, var_queue const& queue) { template <typename T>
inline std::ostream& operator<<(std::ostream& out, var_queue<T> const& queue) {
return queue.display(out); return queue.display(out);
} }