Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new heap invariants #7298

Merged
merged 3 commits into from
Jul 19, 2024
Merged

new heap invariants #7298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99b2e48
new heap invariants
ChuyueSun Jul 19, 2024
dfac2b7
change ENSURE to SASSERT for unit test heap
ChuyueSun Jul 19, 2024
751ef05
change SASSERT to VERIFY
ChuyueSun Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/test/heap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,34 +38,34 @@ static void tst1() {
for (int i = 0; i < N * 3; i++) {
int val = heap_rand() % N;
if (!h.contains(val)) {
ENSURE(!t.contains(val));
VERIFY(!t.contains(val));
h.insert(val);
t.insert(val);
}
else {
if (!t.contains(val)) {
for (int v : t) std::cout << v << "\n";
}
ENSURE(t.contains(val));
VERIFY(t.contains(val));
}
}
ENSURE(h.check_invariant());
VERIFY(h.check_invariant());
for (int v : t) {
ENSURE(h.contains(v));
VERIFY(h.contains(v));
}
while (!h.empty()) {
int m1 = h.min_value();
int m2 = h.erase_min();
(void)m1;
(void)m2;
ENSURE(m1 == m2);
ENSURE(-1 < m2);
VERIFY(m1 == m2);
VERIFY(-1 < m2);
}
}

int g_value[N];

struct lt_proc2 { bool operator()(int v1, int v2) const { ENSURE(v1 < N && v2 < N); return g_value[v1] < g_value[v2]; } };
struct lt_proc2 { bool operator()(int v1, int v2) const { VERIFY(v1 < N && v2 < N); return g_value[v1] < g_value[v2]; } };
typedef heap<lt_proc2> int_heap2;

static void init_values() {
Expand Down Expand Up @@ -98,7 +98,7 @@ static void tst2() {
TRACE("heap", tout << "inserting: " << val << "\n";);
h.insert(val);
TRACE("heap", dump_heap(h, tout););
ENSURE(h.contains(val));
VERIFY(h.contains(val));
}
}
else if (cmd <= 6) {
Expand All @@ -107,7 +107,7 @@ static void tst2() {
TRACE("heap", tout << "removing: " << val << "\n";);
h.erase(val);
TRACE("heap", dump_heap(h, tout););
ENSURE(!h.contains(val));
VERIFY(!h.contains(val));
}
}
else if (cmd <= 8) {
Expand All @@ -128,10 +128,12 @@ static void tst2() {
}
}
else {
ENSURE(h.check_invariant());
VERIFY(h.check_invariant());
}
}
ENSURE(h.check_invariant());
VERIFY(h.check_invariant());
h.reset();
VERIFY(h.check_invariant());
}

void tst_heap() {
Expand Down
13 changes: 13 additions & 0 deletions src/util/heap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@ class heap : private LT {
}

bool check_invariant_core(int idx) const {

// Check that m_values starts with a dummy value at index 0.
if (m_values.empty() || m_values[0] != -1) {
return false;
}

// All indices in m_value2indices that are not used in m_values should be 0
for (int val = 0; val < static_cast<int>(m_value2indices.size()); ++val) {
if (std::find(m_values.begin(), m_values.end(), val) == m_values.end() && m_value2indices[val] != 0) {
return false; // Unused indices should have a 0 value
}
}

if (idx < static_cast<int>(m_values.size())) {
SASSERT(m_value2indices[m_values[idx]] == idx);
SASSERT(parent(idx) == 0 || !less_than(m_values[idx], m_values[parent(idx)]));
Expand Down
Loading