Browse Source

a bunch of cleanups, comments, name changes, and sanity checks. NO Change to the functionalities

avadapal 1 year ago
parent
commit
414e1fa57c
2 changed files with 307 additions and 543 deletions
  1. 304 540
      heap.cpp
  2. 3 3
      heap.hpp

File diff suppressed because it is too large
+ 304 - 540
heap.cpp


+ 3 - 3
heap.hpp

@@ -20,7 +20,7 @@ class MinHeap {
     
     RegAS extract_min(MPCIO &mpcio, MPCTIO tio, yield_t & yield, int is_optimized);
     void initialize(MPCTIO tio, yield_t & yield);
-    void initialize_random(MPCTIO tio, yield_t & yield);
+    void initialize_heap(MPCTIO tio, yield_t & yield);
     int insert(MPCTIO tio, yield_t & yield, RegAS val);
     int insert_optimized(MPCTIO tio, yield_t & yield, RegAS val);
     int verify_heap_property(MPCTIO tio, yield_t & yield);
@@ -28,8 +28,8 @@ class MinHeap {
     auto restore_heap_property_optimized(MPCTIO tio, yield_t & yield, RegXS index, size_t depth, size_t layer, typename Duoram<RegAS>::template OblivIndex<RegXS,3> oidx);
     auto restore_heap_property_at_root(MPCTIO tio, yield_t & yield,  size_t index);
     void print_heap(MPCTIO tio, yield_t & yield);
-    void heapify(MPCTIO tio, yield_t & yield);
-     void heapify2(MPCTIO tio, yield_t & yield, size_t index);
+    void heapify(MPCIO &mpcio, MPCTIO tio, yield_t & yield);
+    void heapify_at_level(MPCIO &mpcio, MPCTIO tio, yield_t & yield, size_t index);
 };
 
 void Heap(MPCIO &mpcio,

Some files were not shown because too many files changed in this diff