Rename baltree to cell

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 baltree.cpp
+    cdpf.cpp duoram.cpp cell.cpp
 OBJS=$(SRCS:.cpp=.o)
 ASMS=$(SRCS:.cpp=.s)
 
@@ -39,7 +39,7 @@ preproc.o: options.hpp rdpf.hpp bitutils.hpp dpf.hpp prg.hpp aes.hpp rdpf.tcc
 preproc.o: cdpf.hpp cdpf.tcc
 online.o: online.hpp mpcio.hpp types.hpp corotypes.hpp options.hpp mpcops.hpp
 online.o: coroutine.hpp rdpf.hpp bitutils.hpp dpf.hpp prg.hpp aes.hpp
-online.o: rdpf.tcc duoram.hpp duoram.tcc cdpf.hpp cdpf.tcc baltree.hpp
+online.o: rdpf.tcc duoram.hpp duoram.tcc cdpf.hpp cdpf.tcc cell.hpp
 mpcops.o: mpcops.hpp types.hpp mpcio.hpp corotypes.hpp coroutine.hpp
 mpcops.o: bitutils.hpp
 rdpf.o: rdpf.hpp mpcio.hpp types.hpp corotypes.hpp coroutine.hpp bitutils.hpp
@@ -49,6 +49,6 @@ cdpf.o: dpf.hpp prg.hpp aes.hpp cdpf.tcc
 duoram.o: duoram.hpp types.hpp mpcio.hpp corotypes.hpp coroutine.hpp
 duoram.o: duoram.tcc mpcops.hpp cdpf.hpp dpf.hpp prg.hpp bitutils.hpp aes.hpp
 duoram.o: cdpf.tcc rdpf.hpp rdpf.tcc
-baltree.o: types.hpp duoram.hpp mpcio.hpp corotypes.hpp coroutine.hpp
-baltree.o: duoram.tcc mpcops.hpp cdpf.hpp dpf.hpp prg.hpp bitutils.hpp
-baltree.o: aes.hpp cdpf.tcc rdpf.hpp rdpf.tcc baltree.hpp options.hpp
+cell.o: types.hpp duoram.hpp mpcio.hpp corotypes.hpp coroutine.hpp duoram.tcc
+cell.o: mpcops.hpp cdpf.hpp dpf.hpp prg.hpp bitutils.hpp aes.hpp cdpf.tcc
+cell.o: rdpf.hpp rdpf.tcc cell.hpp options.hpp

baltree.cpp → cell.cpp

@@ -2,7 +2,7 @@
 
 #include "types.hpp"
 #include "duoram.hpp"
-#include "baltree.hpp"
+#include "cell.hpp"
 
 struct Cell {
     RegAS key;
@@ -120,7 +120,7 @@ T& operator<<(T& os, const Cell &x)
 
 DEFAULT_TUPLE_IO(Cell)
 
-void baltree (MPCIO &mpcio,
+void cell(MPCIO &mpcio,
     const PRACOptions &opts, char **args)
 {
     nbits_t depth=4;

baltree.hpp → cell.hpp

@@ -1,10 +1,10 @@
-#ifndef __BALTREE_HPP__
-#define __BALTREE_HPP__
+#ifndef __CELL_HPP__
+#define __CELL_HPP__
 
 #include "mpcio.hpp"
 #include "options.hpp"
 
-void baltree (MPCIO &mpcio,
+void cell(MPCIO &mpcio,
     const PRACOptions &opts, char **args);
 
 #endif

online.cpp

@@ -5,7 +5,7 @@
 #include "rdpf.hpp"
 #include "duoram.hpp"
 #include "cdpf.hpp"
-#include "baltree.hpp"
+#include "cell.hpp"
 
 
 static void online_test(MPCIO &mpcio,
@@ -1165,9 +1165,9 @@ void online_main(MPCIO &mpcio, const PRACOptions &opts, char **args)
         } else {
             duoram<RegAS>(mpcio, opts, args);
         }
-    } else if (!strcmp(*args, "baltree")) {
+    } else if (!strcmp(*args, "cell")) {
         ++args;
-        baltree(mpcio, opts, args);
+        cell(mpcio, opts, args);
     } else {
         std::cerr << "Unknown mode " << *args << "\n";
     }