Kaynağa Gözat

starting with heaps

avadapal 2 yıl önce
ebeveyn
işleme
04bda15334
2 değiştirilmiş dosya ile 8 ekleme ve 5 silme
  1. 4 1
      Makefile
  2. 4 4
      online.cpp

+ 4 - 1
Makefile

@@ -9,7 +9,7 @@ LDLIBS=-lbsd -lboost_system -lboost_context -lboost_chrono -lboost_thread -lpthr
 
 BIN=prac
 SRCS=prac.cpp mpcio.cpp preproc.cpp online.cpp mpcops.cpp rdpf.cpp \
-    cdpf.cpp duoram.cpp cell.cpp
+    cdpf.cpp duoram.cpp cell.cpp heap.cpp
 OBJS=$(SRCS:.cpp=.o)
 ASMS=$(SRCS:.cpp=.s)
 
@@ -55,3 +55,6 @@ duoram.o: prg.hpp aes.hpp cdpf.tcc rdpf.hpp rdpf.tcc
 cell.o: types.hpp bitutils.hpp duoram.hpp mpcio.hpp corotypes.hpp mpcio.tcc
 cell.o: coroutine.hpp duoram.tcc mpcops.hpp mpcops.tcc cdpf.hpp dpf.hpp
 cell.o: prg.hpp aes.hpp cdpf.tcc rdpf.hpp rdpf.tcc cell.hpp options.hpp
+heap.o: heap.hpp types.hpp bitutils.hpp mpcio.hpp corotypes.hpp mpcio.tcc
+heap.o: coroutine.hpp   mpcops.hpp mpcops.tcc cdpf.hpp dpf.hpp
+heap.o: prg.hpp aes.hpp cdpf.tcc rdpf.hpp rdpf.tcc

+ 4 - 4
online.cpp

@@ -6,6 +6,7 @@
 #include "duoram.hpp"
 #include "cdpf.hpp"
 #include "cell.hpp"
+#include "heap.hpp"
 
 
 static void online_test(MPCIO &mpcio,
@@ -1247,11 +1248,10 @@ void online_main(MPCIO &mpcio, const PRACOptions &opts, char **args)
     } else if (!strcmp(*args, "cell")) {
         ++args;
         cell(mpcio, opts, args);
-    } else {
-        std::cerr << "Unknown mode " << *args << "\n";
-    } else if (!strcmp(*args, "heap")) {
+    } 
+     else if (!strcmp(*args, "heap")) {
         ++args;
-        heap(mpcio, opts, args);
+        Heap(mpcio, opts, args);
     } else {
         std::cerr << "Unknown mode " << *args << "\n";
     }