Queues: extend binary heap (#2145)

* Implement ranks * Move toward Queue interface (with ranks) * Cleanup bugs * Add peaks and pops * Fix bubble down * Use slightly more involved test * Tweak formatting * Remove `mem` reference * Remove tupleple from test/correctness suite * Autoformat * Peek and not peak * Tweak formatting, variable names, and docs --------- Co-authored-by: Anshuman Mohan <[email protected]>
calyxir · Jun 17, 2024 · 04add67 · 04add67
1 parent 85d0e91
commit 04add67
Show file tree

Hide file tree

Showing 6 changed files with 382 additions and 110 deletions.
diff --git a/calyx-py/test/correctness/tuple.py → calyx-py/calyx/tuple.py b/calyx-py/test/correctness/tuple.py → calyx-py/calyx/tuple.py
diff --git a/calyx-py/test/correctness/queues/binheap.data b/calyx-py/test/correctness/queues/binheap.data
@@ -1,5 +1,5 @@
 {
-  "mem": {
+  "out": {
     "data": [
       0,
       0,
@@ -20,7 +20,7 @@
     "format": {
       "is_signed": false,
       "numeric_type": "bitnum",
-      "width": 64
+      "width": 32
     }
   }
-}
+}
diff --git a/calyx-py/test/correctness/queues/binheap.expect b/calyx-py/test/correctness/queues/binheap.expect
@@ -1,14 +1,14 @@
 {
-  "mem": [
+  "out": [
     3,
     6,
+    6,
+    8,
+    9,
     9,
+    10,
     12,
-    0,
-    0,
-    0,
-    0,
-    0,
+    3,
     0,
     0,
     0,