mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 22:23:22 +00:00
Code Activity

fix

Browse source
This commit is contained in:
Jakob Rath 2023-06-28 13:20:07 +02:00
parent 54487f3294
commit a339cd1aff
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/math/polysat/slicing.cpp
View file

@ -168,9 +168,9 @@ namespace polysat {
} }
void slicing::undo_merge_base() { void slicing::undo_merge_base() {
slice r1 = m_merge_trail.back(); auto const [r1, s1] = m_merge_trail.back();
m_merge_trail.pop_back(); m_merge_trail.pop_back();
slice r2 = m_find[r1]; slice const r2 = m_find[r1];
SASSERT(find(r2) == r2); SASSERT(find(r2) == r2);
m_find[r1] = r1; m_find[r1] = r1;
m_size[r2] -= m_size[r1]; m_size[r2] -= m_size[r1];

5
src/math/polysat/types.h
View file

@ -36,7 +36,8 @@ namespace polysat {
typedef dd::bddv bddv; typedef dd::bddv bddv;
typedef dd::val_pp val_pp; typedef dd::val_pp val_pp;
typedef unsigned pvar; using pvar = unsigned;
using pvar_vector = unsigned_vector;
inline const pvar null_var = UINT_MAX; inline const pvar null_var = UINT_MAX;
class dependency { class dependency {
@ -49,7 +50,7 @@ namespace polysat {
}; };
inline const dependency null_dependency = dependency(UINT_MAX); inline const dependency null_dependency = dependency(UINT_MAX);
typedef svector<dependency> dependency_vector; using dependency_vector = svector<dependency>;
inline bool operator< (dependency const& d1, dependency const& d2) { return d1.val() < d2.val(); } inline bool operator< (dependency const& d1, dependency const& d2) { return d1.val() < d2.val(); }
inline bool operator<=(dependency const& d1, dependency const& d2) { return d1.val() <= d2.val(); } inline bool operator<=(dependency const& d1, dependency const& d2) { return d1.val() <= d2.val(); }