Hook up sum_bits.py. Not totally working yet.

demo.sh

@@ -87,6 +87,12 @@ rappor-sim() {
     #-s 0  # deterministic seed
 }
 
+sum-bits() {
+  local dist=$1
+  shift
+  tests/sum_bits.py < _tmp/${dist}_out.csv > _tmp/${dist}_counts.csv
+}
+
 # Like rappor-sim, but run it through the Python profiler.
 rappor-sim-profile() {
   local dist=$1
@@ -132,6 +138,9 @@ run-dist() {
   banner "Running RAPPOR ($dist)"
   rappor-sim $dist
 
+  banner "Summing bits ($dist)"
+  sum-bits $dist
+
   banner "Analyzing RAPPOR output ($dist)"
   analyze $dist "Distribution Comparison ($dist)"
 }

tests/analyze.R

@@ -57,7 +57,7 @@ Log <- function(...) {
 LoadInputs <- function(prefix, ctx) {
   # prefix: path prefix, e.g. '_tmp/exp'
   p <- paste0(prefix, '_params.csv')
-  c <- paste0(prefix, '_out.csv')
+  c <- paste0(prefix, '_counts.csv')
   m <- paste0(prefix, '_map.csv')
   h <- paste0(prefix, '_hist.csv')