moving num_items to private

heap.cpp

@@ -95,7 +95,6 @@ void MinHeap::insert_optimized(MPCTIO tio, yield_t & yield, RegAS val) {
 
     for (size_t j = 0; j < height; ++j) {
         if(tio.player() !=2) {
-            //flag[j] = u[j];
             if(j > 0) u[j] = flag[j] ^ u[j-1];
         }
     }
@@ -172,7 +171,6 @@ int MinHeap::insert(MPCTIO tio, yield_t & yield, RegAS val) {
     
     auto HeapArray = oram.flat(tio, yield);
     num_items++;
-    
     size_t childindex = num_items;
     size_t parentindex = childindex / 2;
     
@@ -697,7 +695,8 @@ void Heap(MPCIO & mpcio,  const PRACOptions & opts, char ** args, int argc) {
         size_t size = size_t(1) << maxdepth;
         MinHeap tree(tio.player(), size);
         tree.init(tio, yield);
-        tree.num_items = (size_t(1) << heapdepth) - 1;
+        //tree.num_items = (size_t(1) << heapdepth) - 1;
+        tree.set_num_items((size_t(1) << heapdepth) - 1);
         tree.init(tio, yield, 1);
         std::cout << "\n===== Init Stats =====\n";
         tio.sync_lamport();

heap.hpp

@@ -11,14 +11,15 @@ class MinHeap {
     private: 
     Duoram < RegAS > oram;
     size_t MAX_SIZE;
+    size_t num_items;
 
     public: 
-    size_t num_items = 0;
+    
     MinHeap(int player_num, size_t size) : oram(player_num, size){
 
     };
 
-    
+    void set_num_items (size_t n) {num_items = n;}
     RegAS extract_min(MPCIO &mpcio, MPCTIO tio, yield_t & yield, int is_optimized);
     void init(MPCTIO tio, yield_t & yield);
     void init(MPCTIO tio, yield_t & yield, size_t which_init);