From 387283b0b36ee030d09f28796de2ec0eba65414f Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 16 Apr 2018 23:14:31 +0200
Subject: [PATCH 001/231] Arithmetic AND and XOR

---
 .../fresco/lib/compare/gt/CarryBits.java      | 27 +++++++++
 .../binary/ArithmeticAndKnownRight.java       | 51 +++++++++++++++++
 .../binary/ArithmeticXorKnownRight.java       | 55 +++++++++++++++++++
 3 files changed, 133 insertions(+)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
new file mode 100644
index 000000000..1df89d76d
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
@@ -0,0 +1,27 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.List;
+
+public class CarryBits implements Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
+
+  private final List<DRes<SInt>> valuesA;
+  private final List<DRes<BigInteger>> valuesB;
+  private final int k;
+
+  public CarryBits(List<DRes<SInt>> valuesA, List<DRes<BigInteger>> valuesB) {
+    this.valuesA = valuesA;
+    this.valuesB = valuesB;
+    this.k = valuesA.size();
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
+    return null;
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
new file mode 100644
index 000000000..7c97be1ed
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
@@ -0,0 +1,51 @@
+package dk.alexandra.fresco.lib.math.integer.binary;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Computes logical AND for each bit in the two lists. <p>Bits are represented as arithmetic
+ * elements. The AND operation is expressed via an arithmetic gate.</p>
+ */
+public class ArithmeticAndKnownRight implements
+    Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
+
+  private final DRes<List<DRes<SInt>>> leftBits;
+  private final DRes<List<DRes<BigInteger>>> rightBits;
+
+  /**
+   * Constructs new {@link ArithmeticXorKnownRight}.
+   *
+   * @param leftBits secret bits represented as arithmetic elements
+   * @param rightBits open bits represented as arithmetic elements
+   */
+  public ArithmeticAndKnownRight(
+      DRes<List<DRes<SInt>>> leftBits,
+      DRes<List<DRes<BigInteger>>> rightBits) {
+    this.leftBits = leftBits;
+    this.rightBits = rightBits;
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
+    List<DRes<SInt>> leftOut = leftBits.out();
+    List<DRes<BigInteger>> rightOut = rightBits.out();
+    List<DRes<SInt>> andedBits = new ArrayList<>(leftOut.size());
+    Numeric nb = builder.numeric();
+    for (int i = 0; i < leftOut.size(); i++) {
+      DRes<SInt> leftBit = leftOut.get(i);
+      BigInteger rightBit = rightOut.get(i).out();
+      // logical and of two bits can be computed as product
+      DRes<SInt> andedBit = nb.mult(rightBit, leftBit);
+      andedBits.add(andedBit);
+    }
+    return () -> andedBits;
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
new file mode 100644
index 000000000..4d14822b3
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
@@ -0,0 +1,55 @@
+package dk.alexandra.fresco.lib.math.integer.binary;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Computes logical XOR for each bit in the two lists. <p>Bits are represented as represented as
+ * arithmetic elements. The XOR operation is expressed via an arithmetic gate.</p>
+ */
+public class ArithmeticXorKnownRight implements
+    Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
+
+  private static final BigInteger TWO = BigInteger.valueOf(2);
+  private final DRes<List<DRes<SInt>>> leftBits;
+  private final DRes<List<DRes<BigInteger>>> rightBits;
+
+  /**
+   * Constructs new {@link ArithmeticXorKnownRight}.
+   *
+   * @param leftBits secret bits represented as arithmetic elements
+   * @param rightBits open bits represented as arithmetic elements
+   */
+  public ArithmeticXorKnownRight(
+      DRes<List<DRes<SInt>>> leftBits,
+      DRes<List<DRes<BigInteger>>> rightBits) {
+    this.leftBits = leftBits;
+    this.rightBits = rightBits;
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
+    List<DRes<SInt>> leftOut = leftBits.out();
+    List<DRes<BigInteger>> rightOut = rightBits.out();
+    List<DRes<SInt>> xoredBits = new ArrayList<>(leftOut.size());
+    Numeric nb = builder.numeric();
+    for (int i = 0; i < leftOut.size(); i++) {
+      DRes<SInt> leftBit = leftOut.get(i);
+      BigInteger rightBit = rightOut.get(i).out();
+      // logical xor of two bits can be computed as leftBit + rightBit - 2 * leftBit * rightBit
+      DRes<SInt> xoredBit = nb.sub(
+          nb.add(rightBit, leftBit),
+          nb.mult(TWO, nb.mult(rightBit, leftBit))
+      );
+      xoredBits.add(xoredBit);
+    }
+    return () -> xoredBits;
+  }
+
+}

From 9831b4162e93a9b4831bae1d8d79fb9d25a2edf6 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 09:24:51 +0200
Subject: [PATCH 002/231] Make comps parallel

---
 .../integer/binary/ArithmeticAndKnownRight.java  |  8 +++-----
 .../integer/binary/ArithmeticXorKnownRight.java  | 16 +++++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
index 7c97be1ed..9ebebea8a 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
@@ -1,8 +1,7 @@
 package dk.alexandra.fresco.lib.math.integer.binary;
 
 import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.ComputationParallel;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
@@ -14,7 +13,7 @@
  * elements. The AND operation is expressed via an arithmetic gate.</p>
  */
 public class ArithmeticAndKnownRight implements
-    Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
+    ComputationParallel<List<DRes<SInt>>, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<SInt>>> leftBits;
   private final DRes<List<DRes<BigInteger>>> rightBits;
@@ -37,12 +36,11 @@ public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> leftOut = leftBits.out();
     List<DRes<BigInteger>> rightOut = rightBits.out();
     List<DRes<SInt>> andedBits = new ArrayList<>(leftOut.size());
-    Numeric nb = builder.numeric();
     for (int i = 0; i < leftOut.size(); i++) {
       DRes<SInt> leftBit = leftOut.get(i);
       BigInteger rightBit = rightOut.get(i).out();
       // logical and of two bits can be computed as product
-      DRes<SInt> andedBit = nb.mult(rightBit, leftBit);
+      DRes<SInt> andedBit = builder.seq(seq -> builder.numeric().mult(rightBit, leftBit));
       andedBits.add(andedBit);
     }
     return () -> andedBits;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
index 4d14822b3..f0c7e38c3 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
@@ -1,7 +1,7 @@
 package dk.alexandra.fresco.lib.math.integer.binary;
 
 import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.ComputationParallel;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -14,7 +14,7 @@
  * arithmetic elements. The XOR operation is expressed via an arithmetic gate.</p>
  */
 public class ArithmeticXorKnownRight implements
-    Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
+    ComputationParallel<List<DRes<SInt>>, ProtocolBuilderNumeric> {
 
   private static final BigInteger TWO = BigInteger.valueOf(2);
   private final DRes<List<DRes<SInt>>> leftBits;
@@ -38,15 +38,17 @@ public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> leftOut = leftBits.out();
     List<DRes<BigInteger>> rightOut = rightBits.out();
     List<DRes<SInt>> xoredBits = new ArrayList<>(leftOut.size());
-    Numeric nb = builder.numeric();
     for (int i = 0; i < leftOut.size(); i++) {
       DRes<SInt> leftBit = leftOut.get(i);
       BigInteger rightBit = rightOut.get(i).out();
       // logical xor of two bits can be computed as leftBit + rightBit - 2 * leftBit * rightBit
-      DRes<SInt> xoredBit = nb.sub(
-          nb.add(rightBit, leftBit),
-          nb.mult(TWO, nb.mult(rightBit, leftBit))
-      );
+      DRes<SInt> xoredBit = builder.seq(seq -> {
+        Numeric nb = builder.numeric();
+        return nb.sub(
+            nb.add(rightBit, leftBit),
+            nb.mult(TWO, nb.mult(rightBit, leftBit))
+        );
+      });
       xoredBits.add(xoredBit);
     }
     return () -> xoredBits;

From 724aa64dadab0b9f5fd4e2c1ba898d98180cc6ee Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 09:53:38 +0200
Subject: [PATCH 003/231] Logical and and xor tests

---
 .../builder/numeric/Collections.java          |  30 ++---
 .../binary/ArithmeticAndKnownRight.java       |   2 +-
 .../binary/ArithmeticXorKnownRight.java       |   2 +-
 .../integer/binary/BinaryOperationsTests.java | 105 ++++++++++++++++--
 .../TestDummyArithmeticProtocolSuite.java     |  12 ++
 5 files changed, 125 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java
index 171abb4b9..9a58dbdbe 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java
@@ -22,7 +22,7 @@ public interface Collections extends ComputationDirectory {
    * @param closedPair secret values
    * @return opened values
    */
-  public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
+  DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
       DRes<Pair<DRes<SInt>, DRes<SInt>>> closedPair);
 
   /**
@@ -31,7 +31,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param closedPair secret values
    * @return openened rows
    */
-  public DRes<RowPairD<BigInteger, BigInteger>> openRowPair(DRes<RowPairD<SInt, SInt>> closedPair);
+  DRes<RowPairD<BigInteger, BigInteger>> openRowPair(DRes<RowPairD<SInt, SInt>> closedPair);
 
   /**
    * Closes list of input values. <br>
@@ -41,7 +41,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param inputParty party providing input
    * @return closed list
    */
-  public DRes<List<DRes<SInt>>> closeList(List<BigInteger> openList, int inputParty);
+  DRes<List<DRes<SInt>>> closeList(List<BigInteger> openList, int inputParty);
 
   /**
    * Closes list of input values. <br>
@@ -51,7 +51,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param inputParty party providing input
    * @return closed list
    */
-  public DRes<List<DRes<SInt>>> closeList(int numberOfInputs, int inputParty);
+  DRes<List<DRes<SInt>>> closeList(int numberOfInputs, int inputParty);
 
   /**
    * Opens list of secret values. <br>
@@ -59,7 +59,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param closedList secret values
    * @return closed values
    */
-  public DRes<List<DRes<BigInteger>>> openList(DRes<List<DRes<SInt>>> closedList);
+  DRes<List<DRes<BigInteger>>> openList(DRes<List<DRes<SInt>>> closedList);
 
   /**
    * Closes matrix of input values. <br>
@@ -69,7 +69,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param inputParty party providing input
    * @return closed matrix
    */
-  public DRes<Matrix<DRes<SInt>>> closeMatrix(Matrix<BigInteger> openMatrix, int inputParty);
+  DRes<Matrix<DRes<SInt>>> closeMatrix(Matrix<BigInteger> openMatrix, int inputParty);
 
   /**
    * Closes matrix of input values. <br>
@@ -80,7 +80,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param inputParty party providing input
    * @return closed matrix
    */
-  public DRes<Matrix<DRes<SInt>>> closeMatrix(int h, int w, int inputParty);
+  DRes<Matrix<DRes<SInt>>> closeMatrix(int h, int w, int inputParty);
 
   /**
    * Opens matrix of secret values.
@@ -88,7 +88,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param closedMatrix input matrix
    * @return open matrix
    */
-  public DRes<Matrix<DRes<BigInteger>>> openMatrix(DRes<Matrix<DRes<SInt>>> closedMatrix);
+  DRes<Matrix<DRes<BigInteger>>> openMatrix(DRes<Matrix<DRes<SInt>>> closedMatrix);
 
   // Conditional
 
@@ -100,7 +100,7 @@ public DRes<Pair<DRes<BigInteger>, DRes<BigInteger>>> openPair(
    * @param right right row
    * @return left if condition right otherwise
    */
-  public DRes<List<DRes<SInt>>> condSelect(DRes<SInt> condition, DRes<List<DRes<SInt>>> left,
+  DRes<List<DRes<SInt>>> condSelect(DRes<SInt> condition, DRes<List<DRes<SInt>>> left,
       DRes<List<DRes<SInt>>> right);
 
   /**
@@ -112,7 +112,7 @@ public DRes<List<DRes<SInt>>> condSelect(DRes<SInt> condition, DRes<List<DRes<SI
    * @param right right row
    * @return swapped rows if condition, same order rows otherwise
    */
-  public DRes<RowPairD<SInt, SInt>> swapIf(DRes<SInt> condition, DRes<List<DRes<SInt>>> left,
+  DRes<RowPairD<SInt, SInt>> swapIf(DRes<SInt> condition, DRes<List<DRes<SInt>>> left,
       DRes<List<DRes<SInt>>> right);
 
   /**
@@ -122,7 +122,7 @@ public DRes<RowPairD<SInt, SInt>> swapIf(DRes<SInt> condition, DRes<List<DRes<SI
    * @param mat matrix to be row-swapped
    * @return matrix with rows swapped according to conditions
    */
-  public DRes<Matrix<DRes<SInt>>> swapNeighborsIf(DRes<List<DRes<SInt>>> conditions,
+  DRes<Matrix<DRes<SInt>>> swapNeighborsIf(DRes<List<DRes<SInt>>> conditions,
       DRes<Matrix<DRes<SInt>>> mat);
 
   // Permutations
@@ -135,7 +135,7 @@ public DRes<Matrix<DRes<SInt>>> swapNeighborsIf(DRes<List<DRes<SInt>>> condition
    * @param idxPerm encodes the desired permutation by supplying for each index a new index
    * @return permuted rows
    */
-  public DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int[] idxPerm);
+  DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int[] idxPerm);
 
   /**
    * Permutes the rows of <code>values</code> according to <code>idxPerm</code>. <br>
@@ -145,7 +145,7 @@ public DRes<Matrix<DRes<SInt>>> swapNeighborsIf(DRes<List<DRes<SInt>>> condition
    * @param permProviderPid the ID of the party choosing permutation
    * @return permuted rows
    */
-  public DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int permProviderPid);
+  DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int permProviderPid);
 
   /**
    * Randomly permutes (shuffles) rows of <code>values</code>. Uses secure source of randomness.
@@ -153,7 +153,7 @@ public DRes<Matrix<DRes<SInt>>> swapNeighborsIf(DRes<List<DRes<SInt>>> condition
    * @param values rows to shuffle
    * @return shuffled rows
    */
-  public DRes<Matrix<DRes<SInt>>> shuffle(DRes<Matrix<DRes<SInt>>> values);
+  DRes<Matrix<DRes<SInt>>> shuffle(DRes<Matrix<DRes<SInt>>> values);
 
   // Relational (SQL-like) operators
 
@@ -168,7 +168,7 @@ public DRes<Matrix<DRes<SInt>>> swapNeighborsIf(DRes<List<DRes<SInt>>> condition
    * @param aggColIdx column to aggregate
    * @return aggregated result
    */
-  public DRes<Matrix<DRes<SInt>>> leakyAggregateSum(DRes<Matrix<DRes<SInt>>> values,
+  DRes<Matrix<DRes<SInt>>> leakyAggregateSum(DRes<Matrix<DRes<SInt>>> values,
       int groupColIdx, int aggColIdx);
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
index 9ebebea8a..3ce36918c 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
@@ -40,7 +40,7 @@ public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
       DRes<SInt> leftBit = leftOut.get(i);
       BigInteger rightBit = rightOut.get(i).out();
       // logical and of two bits can be computed as product
-      DRes<SInt> andedBit = builder.seq(seq -> builder.numeric().mult(rightBit, leftBit));
+      DRes<SInt> andedBit = builder.seq(seq -> seq.numeric().mult(rightBit, leftBit));
       andedBits.add(andedBit);
     }
     return () -> andedBits;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
index f0c7e38c3..148188bd9 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
@@ -43,7 +43,7 @@ public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
       BigInteger rightBit = rightOut.get(i).out();
       // logical xor of two bits can be computed as leftBit + rightBit - 2 * leftBit * rightBit
       DRes<SInt> xoredBit = builder.seq(seq -> {
-        Numeric nb = builder.numeric();
+        Numeric nb = seq.numeric();
         return nb.sub(
             nb.add(rightBit, leftBit),
             nb.mult(TWO, nb.mult(rightBit, leftBit))
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
index 2fc9e1e80..5eecad1c9 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
@@ -17,11 +17,8 @@
 
 
 /**
- * Generic test cases for basic finite field operations.
- * <p>
- * Can be reused by a test case for any protocol suite that implements the basic field protocol
- * factory.
- * </p>
+ * Generic test cases for basic finite field operations. <p> Can be reused by a test case for any
+ * protocol suite that implements the basic field protocol factory. </p>
  */
 public class BinaryOperationsTests {
 
@@ -39,7 +36,7 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         private final int shifts = 3;
 
         @Override
-        public void test() throws Exception {
+        public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app =
               (ProtocolBuilderNumeric builder) -> {
                 AdvancedNumeric rightShift = builder.advancedNumeric();
@@ -52,7 +49,7 @@ public void test() throws Exception {
                     builder.numeric().open(() -> shiftedRight.out().getRemainder());
                 return () -> Arrays.asList(openResult.out(), openRemainder.out());
               };
-              List<BigInteger> output = runApplication(app);
+          List<BigInteger> output = runApplication(app);
 
           Assert.assertEquals(input.shiftRight(shifts), output.get(0));
           Assert.assertEquals(input.mod(BigInteger.ONE.shiftLeft(shifts)), output.get(1));
@@ -75,7 +72,7 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         private final BigInteger input = BigInteger.valueOf(5);
 
         @Override
-        public void test() throws Exception {
+        public void test() {
           Application<BigInteger, ProtocolBuilderNumeric> app = builder -> {
             DRes<SInt> sharedInput = builder.numeric().known(input);
             AdvancedNumeric bitLengthBuilder = builder.advancedNumeric();
@@ -104,7 +101,7 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         private final int max = 16;
 
         @Override
-        public void test() throws Exception {
+        public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app =
               producer -> producer.seq(builder -> {
                 DRes<SInt> sharedInput = builder.numeric().known(input);
@@ -123,4 +120,94 @@ public void test() throws Exception {
       };
     }
   }
+
+  public static class TestArithmeticAndKnownRight<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<DRes<BigInteger>> right = Arrays.asList(
+            () -> BigInteger.ONE,
+            () -> BigInteger.ONE,
+            () -> BigInteger.ZERO,
+            () -> BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                int myId = root.getBasicNumericContext().getMyId();
+                DRes<List<DRes<SInt>>> leftClosed =
+                    (myId == 1) ?
+                        root.collections().closeList(left, 1)
+                        : root.collections().closeList(left.size(), 1);
+                DRes<List<DRes<SInt>>> anded = root
+                    .par(new ArithmeticAndKnownRight(leftClosed, () -> right));
+                return root.collections().openList(anded);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.ZERO,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestArithmeticXorKnownRight<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<DRes<BigInteger>> right = Arrays.asList(
+            () -> BigInteger.ONE,
+            () -> BigInteger.ONE,
+            () -> BigInteger.ZERO,
+            () -> BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                int myId = root.getBasicNumericContext().getMyId();
+                DRes<List<DRes<SInt>>> leftClosed =
+                    (myId == 1) ?
+                        root.collections().closeList(left, 1)
+                        : root.collections().closeList(left.size(), 1);
+                DRes<List<DRes<SInt>>> anded = root
+                    .par(new ArithmeticXorKnownRight(leftClosed, () -> right));
+                return root.collections().openList(anded);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ZERO,
+              BigInteger.ONE,
+              BigInteger.ONE,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 7973e9688..a7780fbff 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -31,6 +31,8 @@
 import dk.alexandra.fresco.lib.lp.LPSolver;
 import dk.alexandra.fresco.lib.lp.LpBuildingBlockTests;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests;
+import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestArithmeticAndKnownRight;
+import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestArithmeticXorKnownRight;
 import dk.alexandra.fresco.lib.math.integer.division.DivisionTests;
 import dk.alexandra.fresco.lib.math.integer.exp.ExponentiationTests;
 import dk.alexandra.fresco.lib.math.integer.linalg.LinAlgTests;
@@ -769,4 +771,14 @@ public void test_trunctation() throws Exception {
     runTest(new TruncationTests.TestTruncation<>(), new TestParameters().numParties(2));
   }
 
+  @Test
+  public void testArithmeticAndKnownRight() {
+    runTest(new TestArithmeticAndKnownRight<>(), new TestParameters());
+  }
+
+  @Test
+  public void testArithmeticXorKnownRight() {
+    runTest(new TestArithmeticXorKnownRight<>(), new TestParameters());
+  }
+
 }

From 80b8b5ffa0c83252f3d731ef637ca1cd9e62a0a5 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 14:15:22 +0200
Subject: [PATCH 004/231] Stub for mod2m

---
 .../fresco/lib/math/integer/mod/Mod2m.java    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
new file mode 100644
index 000000000..49d7a133f
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -0,0 +1,33 @@
+package dk.alexandra.fresco.lib.math.integer.mod;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+
+/**
+ * Computes modular reduction of value mod 2^m.
+ */
+public class Mod2m implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<SInt> value;
+  private final int m;
+
+  /**
+   * Constructs new {@link Mod2m}.
+   *
+   * @param value value to reduce
+   * @param m exponent (2^{m})
+   */
+  public Mod2m(DRes<SInt> value, int m) {
+    this.value = value;
+    this.m = m;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    // TODO implement
+    return null;
+  }
+
+}

From a9976e319da3fbf0262df2a3d27ca82ac9bee46c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 14:36:29 +0200
Subject: [PATCH 005/231] Mod2m test skeleton

---
 .../lib/math/integer/mod/Mod2mTests.java      | 36 +++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     |  5 +++
 2 files changed, 41 insertions(+)
 create mode 100644 core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
new file mode 100644
index 000000000..f03a926f5
--- /dev/null
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
@@ -0,0 +1,36 @@
+package dk.alexandra.fresco.lib.math.integer.mod;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+
+public class Mod2mTests {
+
+  public static class TestMod2mBaseCase<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<SInt, ProtocolBuilderNumeric> app = builder -> {
+            // TODO implement
+            DRes<SInt> value = builder.numeric().known(BigInteger.ONE);
+            int m = 64;
+            return builder.seq(new Mod2m(value, m));
+          };
+          DRes<SInt> result = runApplication(app);
+        }
+      };
+    }
+  }
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index a7780fbff..b4dd5b171 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -38,6 +38,7 @@
 import dk.alexandra.fresco.lib.math.integer.linalg.LinAlgTests;
 import dk.alexandra.fresco.lib.math.integer.log.LogTests;
 import dk.alexandra.fresco.lib.math.integer.min.MinTests;
+import dk.alexandra.fresco.lib.math.integer.mod.Mod2mTests.TestMod2mBaseCase;
 import dk.alexandra.fresco.lib.math.integer.sqrt.SqrtTests;
 import dk.alexandra.fresco.lib.math.integer.stat.StatisticsTests;
 import dk.alexandra.fresco.lib.math.polynomial.PolynomialTests;
@@ -781,4 +782,8 @@ public void testArithmeticXorKnownRight() {
     runTest(new TestArithmeticXorKnownRight<>(), new TestParameters());
   }
 
+  @Test
+  public void testMod2mBaseCase() {
+    runTest(new TestMod2mBaseCase<>(), new TestParameters());
+  }
 }

From ae2f8558595d67e137fca2c04083207195a22a14 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 17:12:07 +0200
Subject: [PATCH 006/231] WIP precarry

---
 .../fresco/framework/util/SIntPair.java       | 13 +++
 .../fresco/lib/compare/gt/CarryBits.java      | 27 ++++--
 .../fresco/lib/compare/gt/CarryHelper.java    | 43 +++++++++
 .../fresco/lib/compare/gt/PreCarryBits.java   | 44 ++++++++++
 .../fresco/lib/compare/gt/TestPreCarry.java   | 88 +++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     | 13 +++
 6 files changed, 221 insertions(+), 7 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
 create mode 100644 core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TestPreCarry.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java b/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
new file mode 100644
index 000000000..d09f56161
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
@@ -0,0 +1,13 @@
+package dk.alexandra.fresco.framework.util;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.value.SInt;
+
+public class SIntPair extends Pair<DRes<SInt>, DRes<SInt>> {
+
+  public SIntPair(DRes<SInt> first,
+      DRes<SInt> second) {
+    super(first, second);
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
index 1df89d76d..640590b6b 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
@@ -3,24 +3,37 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticXorKnownRight;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 
 public class CarryBits implements Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
 
-  private final List<DRes<SInt>> valuesA;
-  private final List<DRes<BigInteger>> valuesB;
-  private final int k;
+  private final DRes<List<DRes<SInt>>> bitsA;
+  private final DRes<List<DRes<BigInteger>>> bitsB;
 
-  public CarryBits(List<DRes<SInt>> valuesA, List<DRes<BigInteger>> valuesB) {
-    this.valuesA = valuesA;
-    this.valuesB = valuesB;
-    this.k = valuesA.size();
+  public CarryBits(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB) {
+    this.bitsA = bitsA;
+    this.bitsB = bitsB;
   }
 
   @Override
   public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
+    // these could also be done in parallel
+    DRes<List<DRes<SInt>>> xoredDef = builder.par(new ArithmeticXorKnownRight(bitsA, bitsB));
+    DRes<List<DRes<SInt>>> andedDef = builder.par(new ArithmeticXorKnownRight(bitsA, bitsB));
+    DRes<List<SIntPair>> pairs = () -> {
+      List<DRes<SInt>> xored = xoredDef.out();
+      List<DRes<SInt>> anded = andedDef.out();
+      List<SIntPair> innerPairs = new ArrayList<>(xored.size());
+      for (int i = 0; i < xored.size(); i++) {
+        innerPairs.add(new SIntPair(xored.get(i), anded.get(i)));
+      }
+      return innerPairs;
+    };
     return null;
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
new file mode 100644
index 000000000..c3f7a47db
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
@@ -0,0 +1,43 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.framework.value.SInt;
+
+/**
+ * Corresponds to circle operator in paper. <p>Given (p_{2}, g_{2}) and (p_{1}, g_{1}) computes (p,
+ * g) where p = p_{2} * p_{1} and g = g_{2} + (p_{1} * g_{1}).</p>
+ */
+public class CarryHelper implements Computation<SIntPair, ProtocolBuilderNumeric> {
+
+  private final DRes<SIntPair> leftBitPair;
+  private final DRes<SIntPair> rightBitPair;
+
+  public CarryHelper(DRes<SIntPair> leftBitPair, DRes<SIntPair> rightBitPair) {
+    this.leftBitPair = leftBitPair;
+    this.rightBitPair = rightBitPair;
+  }
+
+  @Override
+  public DRes<SIntPair> buildComputation(ProtocolBuilderNumeric builder) {
+    SIntPair left = leftBitPair.out();
+    SIntPair right = rightBitPair.out();
+    DRes<SInt> p1 = left.getFirst();
+    DRes<SInt> g1 = left.getSecond();
+    DRes<SInt> p2 = right.getFirst();
+    DRes<SInt> g2 = right.getSecond();
+    return builder.par(par -> {
+      Numeric numeric = par.numeric();
+      DRes<SInt> p = numeric.mult(p1, p2);
+      DRes<SInt> q = par.seq(seq -> {
+        DRes<SInt> temp = seq.numeric().mult(p2, g1);
+        return seq.numeric().add(temp, g2);
+      });
+      return () -> new SIntPair(p, q);
+    });
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
new file mode 100644
index 000000000..9af54ee7d
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
@@ -0,0 +1,44 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<List<DRes<SIntPair>>> pairsDef;
+
+  public PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
+    this.pairsDef = pairs;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    List<DRes<SIntPair>> pairs = pairsDef.out();
+    Collections.reverse(pairs);
+    int k = pairs.size();
+    if (k == 1) {
+      return pairs.get(0).out().getSecond();
+    } else {
+      DRes<List<DRes<SIntPair>>> bitsU = builder.par(par -> {
+        List<DRes<SIntPair>> bitsUInner = new ArrayList<>(k / 2);
+        for (int i = 0; i < k / 2; i++) {
+          DRes<SIntPair> left = pairs.get(2 * i + 1);
+          DRes<SIntPair> right = pairs.get(2 * i);
+          bitsUInner.add(par.seq(new CarryHelper(left, right)));
+        }
+        List<DRes<SIntPair>> nextRound = bitsUInner.subList(0, k / 2);
+        Collections.reverse(nextRound);
+        return () -> nextRound;
+      });
+      return builder.seq(new PreCarryBits(bitsU));
+    }
+  }
+
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TestPreCarry.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TestPreCarry.java
new file mode 100644
index 000000000..6fd71d593
--- /dev/null
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TestPreCarry.java
@@ -0,0 +1,88 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Assert;
+
+public class TestPreCarry {
+
+  public static class TestCarryHelper<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<Pair<BigInteger, BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+            Numeric numeric = builder.numeric();
+            DRes<SInt> p1 = numeric.known(BigInteger.ONE);
+            DRes<SInt> g1 = numeric.known(BigInteger.ZERO);
+            DRes<SInt> p2 = numeric.known(BigInteger.ONE);
+            DRes<SInt> g2 = numeric.known(BigInteger.ONE);
+            SIntPair pairOne = new SIntPair(p1, g1);
+            SIntPair pairTwo = new SIntPair(p2, g2);
+            DRes<SIntPair> carried = builder
+                .seq(new CarryHelper(() -> pairTwo, () -> pairOne));
+            return builder.seq(seq -> {
+              SIntPair carriedOut = carried.out();
+              DRes<BigInteger> p = seq.numeric().open(carriedOut.getFirst());
+              DRes<BigInteger> q = seq.numeric().open(carriedOut.getSecond());
+              return () -> new Pair<>(p.out(), q.out());
+            });
+          };
+          Pair<BigInteger, BigInteger> expected = new Pair<>(
+              BigInteger.ONE, // p1 & p2
+              BigInteger.ONE  // g2 | (p1 & g1)
+          );
+          Pair<BigInteger, BigInteger> actual = runApplication(app);
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestPreCarryBits<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<BigInteger, ProtocolBuilderNumeric> app = builder -> {
+            Numeric numeric = builder.numeric();
+            DRes<SInt> p1 = numeric.known(BigInteger.ONE);
+            DRes<SInt> g1 = numeric.known(BigInteger.ZERO);
+            DRes<SInt> p2 = numeric.known(BigInteger.ONE);
+            DRes<SInt> g2 = numeric.known(BigInteger.ONE);
+            SIntPair pairOne = new SIntPair(p1, g1);
+            SIntPair pairTwo = new SIntPair(p2, g2);
+            List<DRes<SIntPair>> pairs = Arrays.asList(
+                () -> pairOne,
+                () -> pairTwo
+            );
+            DRes<SInt> carried = builder.seq(new PreCarryBits(() -> pairs));
+            return builder.numeric().open(carried);
+          };
+          BigInteger actual = runApplication(app);
+          Assert.assertEquals(BigInteger.ZERO, actual);
+        }
+      };
+    }
+  }
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index b4dd5b171..1eb0f44c5 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -22,6 +22,8 @@
 import dk.alexandra.fresco.lib.collections.relational.LeakyAggregationTests;
 import dk.alexandra.fresco.lib.collections.shuffle.ShuffleRowsTests;
 import dk.alexandra.fresco.lib.compare.CompareTests;
+import dk.alexandra.fresco.lib.compare.gt.TestPreCarry.TestCarryHelper;
+import dk.alexandra.fresco.lib.compare.gt.TestPreCarry.TestPreCarryBits;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelectTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapNeighborsTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapRowsTests;
@@ -786,4 +788,15 @@ public void testArithmeticXorKnownRight() {
   public void testMod2mBaseCase() {
     runTest(new TestMod2mBaseCase<>(), new TestParameters());
   }
+
+  @Test
+  public void testCarryHelper() {
+    runTest(new TestCarryHelper<>(), new TestParameters());
+  }
+
+  @Test
+  public void testPreCarryBits() {
+    runTest(new TestPreCarryBits<>(), new TestParameters());
+  }
+
 }

From c2205c7c208298165500e8ec9944f21df7be1261 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 18:05:52 +0200
Subject: [PATCH 007/231] Carry out tests

---
 .../gt/{CarryBits.java => CarryOut.java}      |  20 +-
 .../fresco/lib/compare/gt/PreCarryBits.java   |   1 +
 .../fresco/lib/compare/gt/CarryOutTests.java  |  61 ++++
 .../{TestPreCarry.java => PreCarryTests.java} |   9 +-
 .../TestDummyArithmeticProtocolSuite.java     | 267 +++++++++---------
 5 files changed, 218 insertions(+), 140 deletions(-)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/gt/{CarryBits.java => CarryOut.java} (60%)
 create mode 100644 core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
 rename core/src/test/java/dk/alexandra/fresco/lib/compare/gt/{TestPreCarry.java => PreCarryTests.java} (94%)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
similarity index 60%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
index 640590b6b..750ab6468 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
@@ -5,36 +5,38 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticAndKnownRight;
 import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticXorKnownRight;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CarryBits implements Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
+public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<SInt>>> bitsA;
   private final DRes<List<DRes<BigInteger>>> bitsB;
 
-  public CarryBits(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB) {
+  public CarryOut(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB) {
     this.bitsA = bitsA;
     this.bitsB = bitsB;
   }
 
   @Override
-  public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
-    // these could also be done in parallel
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    // TODO both calls should be in parallel
     DRes<List<DRes<SInt>>> xoredDef = builder.par(new ArithmeticXorKnownRight(bitsA, bitsB));
-    DRes<List<DRes<SInt>>> andedDef = builder.par(new ArithmeticXorKnownRight(bitsA, bitsB));
-    DRes<List<SIntPair>> pairs = () -> {
+    DRes<List<DRes<SInt>>> andedDef = builder.par(new ArithmeticAndKnownRight(bitsA, bitsB));
+    DRes<List<DRes<SIntPair>>> pairs = () -> {
       List<DRes<SInt>> xored = xoredDef.out();
       List<DRes<SInt>> anded = andedDef.out();
-      List<SIntPair> innerPairs = new ArrayList<>(xored.size());
+      List<DRes<SIntPair>> innerPairs = new ArrayList<>(xored.size());
       for (int i = 0; i < xored.size(); i++) {
-        innerPairs.add(new SIntPair(xored.get(i), anded.get(i)));
+        int finalI = i;
+        innerPairs.add(() -> new SIntPair(xored.get(finalI), anded.get(finalI)));
       }
       return innerPairs;
     };
-    return null;
+    return builder.seq(new PreCarryBits(pairs));
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
index 9af54ee7d..2d5e02ccf 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
@@ -20,6 +20,7 @@ public PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SIntPair>> pairs = pairsDef.out();
+    // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
     Collections.reverse(pairs);
     int k = pairs.size();
     if (k == 1) {
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
new file mode 100644
index 000000000..9f0f79f31
--- /dev/null
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
@@ -0,0 +1,61 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+
+public class CarryOutTests {
+
+  public static class TestCarryOut<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    private final List<BigInteger> left;
+    private final List<DRes<BigInteger>> right;
+    private final BigInteger expected;
+
+    public TestCarryOut(int[] leftBits, int[] rightClearBits, int expected) {
+      this.expected = BigInteger.valueOf(expected);
+      int numBits = leftBits.length;
+      left = new ArrayList<>(numBits);
+      right = new ArrayList<>(numBits);
+      for (int i = 0; i < numBits; i++) {
+        left.add(BigInteger.valueOf(leftBits[i]));
+        int finalI = i;
+        right.add(() -> BigInteger.valueOf(rightClearBits[finalI]));
+      }
+    }
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<BigInteger, ProtocolBuilderNumeric> app =
+              root -> {
+                int myId = root.getBasicNumericContext().getMyId();
+                DRes<List<DRes<SInt>>> leftClosed =
+                    (myId == 1) ?
+                        root.collections().closeList(left, 1)
+                        : root.collections().closeList(left.size(), 1);
+                DRes<SInt> carry = root.seq(new CarryOut(leftClosed, () -> right));
+                return root.numeric().open(carry);
+              };
+          BigInteger actual = runApplication(app);
+          BigInteger expected = BigInteger.ZERO;
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TestPreCarry.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
similarity index 94%
rename from core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TestPreCarry.java
rename to core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
index 6fd71d593..c9186f312 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TestPreCarry.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import org.junit.Assert;
 
-public class TestPreCarry {
+public class PreCarryTests {
 
   public static class TestCarryHelper<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
@@ -30,7 +30,7 @@ public void test() {
             Numeric numeric = builder.numeric();
             DRes<SInt> p1 = numeric.known(BigInteger.ONE);
             DRes<SInt> g1 = numeric.known(BigInteger.ZERO);
-            DRes<SInt> p2 = numeric.known(BigInteger.ONE);
+            DRes<SInt> p2 = numeric.known(BigInteger.ZERO);
             DRes<SInt> g2 = numeric.known(BigInteger.ONE);
             SIntPair pairOne = new SIntPair(p1, g1);
             SIntPair pairTwo = new SIntPair(p2, g2);
@@ -44,8 +44,8 @@ public void test() {
             });
           };
           Pair<BigInteger, BigInteger> expected = new Pair<>(
-              BigInteger.ONE, // p1 & p2
-              BigInteger.ONE  // g2 | (p1 & g1)
+              BigInteger.ONE, // p1 * p2
+              BigInteger.ONE  // g2 + (p1 * g1)
           );
           Pair<BigInteger, BigInteger> actual = runApplication(app);
           Assert.assertEquals(expected, actual);
@@ -78,6 +78,7 @@ public void test() {
             DRes<SInt> carried = builder.seq(new PreCarryBits(() -> pairs));
             return builder.numeric().open(carried);
           };
+          // TODO implement real test
           BigInteger actual = runApplication(app);
           Assert.assertEquals(BigInteger.ZERO, actual);
         }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 1eb0f44c5..2b763bd0d 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -22,8 +22,9 @@
 import dk.alexandra.fresco.lib.collections.relational.LeakyAggregationTests;
 import dk.alexandra.fresco.lib.collections.shuffle.ShuffleRowsTests;
 import dk.alexandra.fresco.lib.compare.CompareTests;
-import dk.alexandra.fresco.lib.compare.gt.TestPreCarry.TestCarryHelper;
-import dk.alexandra.fresco.lib.compare.gt.TestPreCarry.TestPreCarryBits;
+import dk.alexandra.fresco.lib.compare.gt.CarryOutTests.TestCarryOut;
+import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestCarryHelper;
+import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestPreCarryBits;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelectTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapNeighborsTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapRowsTests;
@@ -61,17 +62,17 @@
 public class TestDummyArithmeticProtocolSuite extends AbstractDummyArithmeticTest {
 
   @Test
-  public void test_Input_Sequential() throws Exception {
+  public void test_Input_Sequential() {
     runTest(new BasicArithmeticTests.TestInput<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void testInputFromAll() throws Exception {
+  public void testInputFromAll() {
     runTest(new BasicArithmeticTests.TestInputFromAll<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_OutputToTarget_Sequential() throws Exception {
+  public void test_OutputToTarget_Sequential() {
     runTest(new BasicArithmeticTests.TestOutputToSingleParty<>(), new TestParameters()
         .numParties(2)
         .performanceLogging(true));
@@ -80,77 +81,77 @@ public void test_OutputToTarget_Sequential() throws Exception {
   }
 
   @Test
-  public void test_AddPublicValue_Sequential() throws Exception {
+  public void test_AddPublicValue_Sequential() {
     runTest(new BasicArithmeticTests.TestAddPublicValue<>(), new TestParameters());
   }
 
   @Test
-  public void test_KnownSInt_Sequential() throws Exception {
+  public void test_KnownSInt_Sequential() {
     runTest(new BasicArithmeticTests.TestKnownSInt<>(), new TestParameters());
   }
 
   @Test
-  public void test_MultAndAdd_Sequential() throws Exception {
+  public void test_MultAndAdd_Sequential() {
     runTest(new BasicArithmeticTests.TestSimpleMultAndAdd<>(), new TestParameters());
   }
 
   @Test
-  public void testSumAndOutputSequential() throws Exception {
+  public void testSumAndOutputSequential() {
     runTest(new BasicArithmeticTests.TestSumAndMult<>(), new TestParameters());
   }
 
   @Test
-  public void testSumAndProduct() throws Exception {
+  public void testSumAndProduct() {
     runTest(new TestSumAndProduct<>(), new TestParameters());
   }
 
   @Test
-  public void test_MinInfFrac_Sequential() throws Exception {
+  public void test_MinInfFrac_Sequential() {
     runTest(new TestMinInfFrac<>(), new TestParameters());
   }
 
   @Test
-  public void test_MinInfFrac_SequentialBatched() throws Exception {
+  public void test_MinInfFrac_SequentialBatched() {
     runTest(new TestMinInfFrac<>(), new TestParameters());
   }
 
   @Test
-  public void test_compareLt_Sequential() throws Exception {
+  public void test_compareLt_Sequential() {
     runTest(new CompareTests.TestCompareLT<>(), new TestParameters());
   }
 
   @Test
-  public void testCompareLtEdgeCasesSequential() throws Exception {
+  public void testCompareLtEdgeCasesSequential() {
     runTest(new CompareTests.TestCompareLTEdgeCases<>(), new TestParameters());
   }
 
   @Test
-  public void test_compareEQ_Sequential() throws Exception {
+  public void test_compareEQ_Sequential() {
     runTest(new CompareTests.TestCompareEQ<>(), new TestParameters());
   }
 
   @Test
-  public void testCompareEqEdgeCasesSequential() throws Exception {
+  public void testCompareEqEdgeCasesSequential() {
     runTest(new CompareTests.TestCompareEQEdgeCases<>(), new TestParameters());
   }
 
   @Test
-  public void test_isSorted() throws Exception {
+  public void test_isSorted() {
     runTest(new SortingTests.TestIsSorted<>(), new TestParameters());
   }
 
   @Test
-  public void test_compareAndSwap() throws Exception {
+  public void test_compareAndSwap() {
     runTest(new SortingTests.TestCompareAndSwap<>(), new TestParameters());
   }
 
   @Test
-  public void test_Sort() throws Exception {
+  public void test_Sort() {
     runTest(new SortingTests.TestSort<>(), new TestParameters());
   }
 
   @Test
-  public void test_Big_Sort() throws Exception {
+  public void test_Big_Sort() {
     runTest(new SortingTests.TestBigSort<>(), new TestParameters());
   }
 
@@ -159,7 +160,7 @@ public void test_Big_Sort() throws Exception {
 
   // Creditrater
   @Test
-  public void test_CreditRater_Single_Value_2_parties() throws Exception {
+  public void test_CreditRater_Single_Value_2_parties() {
     int[] values = {2};
     int[][] intervals = {{1, 3}};
     int[][] scores = {{10, 100, 1000}};
@@ -168,7 +169,7 @@ public void test_CreditRater_Single_Value_2_parties() throws Exception {
   }
 
   @Test
-  public void test_CreditRater_Single_Value_3_parties() throws Exception {
+  public void test_CreditRater_Single_Value_3_parties() {
     int[] values = {2};
     int[][] intervals = {{1, 3}};
     int[][] scores = {{10, 100, 1000}};
@@ -177,7 +178,7 @@ public void test_CreditRater_Single_Value_3_parties() throws Exception {
   }
 
   @Test
-  public void test_CreditRater_multi_Value_2_parties() throws Exception {
+  public void test_CreditRater_multi_Value_2_parties() {
     int[] values = {2, 2, 2};
     int[][] intervals = {{1, 3}, {0, 5}, {0, 1}};
     int[][] scores = {{10, 100, 1000}, {10, 100, 1000}, {10, 100, 1000}};
@@ -187,49 +188,49 @@ public void test_CreditRater_multi_Value_2_parties() throws Exception {
 
   // DEASolver
   @Test
-  public void test_DeaSolver_2_parties() throws Exception {
+  public void test_DeaSolver_2_parties() {
     runTest(new RandomDataDeaTest<>(5, 2, 10, 1, AnalysisType.INPUT_EFFICIENCY),
         new TestParameters());
   }
 
   @Test
-  public void test_DeaSolver_3_parties() throws Exception {
+  public void test_DeaSolver_3_parties() {
     runTest(new RandomDataDeaTest<>(2, 2, 10, 1, AnalysisType.INPUT_EFFICIENCY),
         new TestParameters().numParties(3));
   }
 
   @Test
-  public void test_DeaSolver_multiple_queries_2_parties() throws Exception {
+  public void test_DeaSolver_multiple_queries_2_parties() {
     runTest(new RandomDataDeaTest<>(5, 2, 10, 2, AnalysisType.INPUT_EFFICIENCY),
         new TestParameters());
   }
 
   @Test
-  public void test_DeaSolver_single_input_2_parties() throws Exception {
+  public void test_DeaSolver_single_input_2_parties() {
     runTest(new RandomDataDeaTest<>(1, 2, 10, 1, AnalysisType.INPUT_EFFICIENCY),
         new TestParameters());
   }
 
   @Test
-  public void test_DeaSolver_single_input_and_output_2_parties() throws Exception {
+  public void test_DeaSolver_single_input_and_output_2_parties() {
     runTest(new RandomDataDeaTest<>(1, 1, 10, 1, AnalysisType.INPUT_EFFICIENCY),
         new TestParameters());
   }
 
   @Test
-  public void test_DEASolver_output_efficiency_2_parties() throws Exception {
+  public void test_DEASolver_output_efficiency_2_parties() {
     runTest(new RandomDataDeaTest<>(5, 1, 10, 1, AnalysisType.OUTPUT_EFFICIENCY),
         new TestParameters());
   }
 
   @Test
-  public void test_DEASolver_multiple_queries__output_2_parties() throws Exception {
+  public void test_DEASolver_multiple_queries__output_2_parties() {
     runTest(new RandomDataDeaTest<>(5, 2, 10, 2, AnalysisType.OUTPUT_EFFICIENCY),
         new TestParameters());
   }
 
   @Test
-  public void test_DEASolver_fixedData1() throws Exception {
+  public void test_DEASolver_fixedData1() {
     runTest(new TestDeaFixed1<>(AnalysisType.OUTPUT_EFFICIENCY),
         new TestParameters());
   }
@@ -237,186 +238,186 @@ public void test_DEASolver_fixedData1() throws Exception {
   // lib.conditional
 
   @Test
-  public void test_conditional_select_left() throws Exception {
+  public void test_conditional_select_left() {
     runTest(ConditionalSelectTests.testSelectLeft(), new TestParameters());
   }
 
   @Test
-  public void test_conditional_select_right() throws Exception {
+  public void test_conditional_select_right() {
     runTest(ConditionalSelectTests.testSelectRight(), new TestParameters());
   }
 
   @Test
-  public void test_swap_yes() throws Exception {
+  public void test_swap_yes() {
     runTest(SwapIfTests.testSwapYes(), new TestParameters());
   }
 
   @Test
-  public void test_swap_no() throws Exception {
+  public void test_swap_no() {
     runTest(SwapIfTests.testSwapNo(), new TestParameters());
   }
 
   @Test
-  public void test_swap_rows_yes() throws Exception {
+  public void test_swap_rows_yes() {
     runTest(ConditionalSwapRowsTests.testSwapYes(), new TestParameters());
   }
 
   @Test
-  public void test_swap_rows_no() throws Exception {
+  public void test_swap_rows_no() {
     runTest(ConditionalSwapRowsTests.testSwapNo(), new TestParameters());
   }
 
   @Test
-  public void test_swap_neighbors_yes() throws Exception {
+  public void test_swap_neighbors_yes() {
     runTest(ConditionalSwapNeighborsTests.testSwapYes(), new TestParameters());
   }
 
   @Test
-  public void test_swap_neighbors_no() throws Exception {
+  public void test_swap_neighbors_no() {
     runTest(ConditionalSwapNeighborsTests.testSwapNo(), new TestParameters());
   }
 
   // lib.collections
 
   @Test
-  public void test_close_empty_list() throws Exception {
+  public void test_close_empty_list() {
     runTest(new CloseListTests.TestCloseEmptyList<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_close_list() throws Exception {
+  public void test_close_list() {
     runTest(new CloseListTests.TestCloseEmptyList<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_close_empty_matrix() throws Exception {
+  public void test_close_empty_matrix() {
     runTest(new CloseMatrixTests.TestCloseEmptyMatrix<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_close_matrix() throws Exception {
+  public void test_close_matrix() {
     runTest(new CloseMatrixTests.TestCloseAndOpenMatrix<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Test_Is_Sorted() throws Exception {
+  public void test_Test_Is_Sorted() {
     runTest(new SearchingTests.TestIsSorted<>(), new TestParameters());
   }
 
   @Test
-  public void test_permute_empty_rows() throws Exception {
+  public void test_permute_empty_rows() {
     runTest(PermuteRowsTests.permuteEmptyRows(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_permute_rows() throws Exception {
+  public void test_permute_rows() {
     runTest(PermuteRowsTests.permuteRows(), new TestParameters().numParties(2));
   }
 
   @Test(expected = UnsupportedOperationException.class)
-  public void test_permute_rows_non_power_of_two() throws Throwable {
+  public void test_permute_rows_non_power_of_two() {
     ArrayList<ArrayList<DRes<SInt>>> fakeRows = new ArrayList<>();
     Matrix<DRes<SInt>> fakeMatrix = new Matrix<>(3, 2, fakeRows);
     new PermuteRows(() -> fakeMatrix, new int[]{}, 1, true).buildComputation(null);
   }
 
   @Test
-  public void test_shuffle_rows_two_parties() throws Exception {
+  public void test_shuffle_rows_two_parties() {
     runTest(ShuffleRowsTests.shuffleRowsTwoParties(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_shuffle_rows_three_parties() throws Exception {
+  public void test_shuffle_rows_three_parties() {
     runTest(ShuffleRowsTests.shuffleRowsThreeParties(), new TestParameters().numParties(3));
   }
 
   @Test
-  public void test_shuffle_rows_empty() throws Exception {
+  public void test_shuffle_rows_empty() {
     runTest(ShuffleRowsTests.shuffleRowsEmpty(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_leaky_aggregate_two() throws Exception {
+  public void test_leaky_aggregate_two() {
     runTest(LeakyAggregationTests.aggregate(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_leaky_aggregate_unique_keys_two() throws Exception {
+  public void test_leaky_aggregate_unique_keys_two() {
     runTest(LeakyAggregationTests.aggregateUniqueKeys(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_leaky_aggregate_three() throws Exception {
+  public void test_leaky_aggregate_three() {
     runTest(LeakyAggregationTests.aggregate(), new TestParameters().numParties(3));
   }
 
   @Test
-  public void test_leaky_aggregate_empty() throws Exception {
+  public void test_leaky_aggregate_empty() {
     runTest(LeakyAggregationTests.aggregateEmpty(), new TestParameters().numParties(2));
   }
 
   //
 
   @Test
-  public void test_MiMC_DifferentPlainTexts() throws Exception {
+  public void test_MiMC_DifferentPlainTexts() {
     runTest(new MiMCTests.TestMiMCDifferentPlainTexts<>(), new TestParameters());
   }
 
   @Test
-  public void test_MiMC_EncSameEnc() throws Exception {
+  public void test_MiMC_EncSameEnc() {
     runTest(new MiMCTests.TestMiMCEncSameEnc<>(), new TestParameters());
   }
 
   @Test
-  public void test_MiMC_EncDec() throws Exception {
+  public void test_MiMC_EncDec() {
     runTest(new MiMCTests.TestMiMCEncDec<>(), new TestParameters()
         .modulus(ModulusFinder.findSuitableModulus(512)));
   }
 
   @Test
-  public void test_MiMC_EncDecFixedRounds() throws Exception {
+  public void test_MiMC_EncDecFixedRounds() {
     runTest(new MiMCTests.TestMiMCEncDecFixedRounds<>(), new TestParameters()
         .modulus(ModulusFinder.findSuitableModulus(512)));
   }
 
   @Test
-  public void test_MiMC_Deterministically() throws Exception {
+  public void test_MiMC_Deterministically() {
     runTest(new MiMCTests.TestMiMCEncryptsDeterministically<>(), new TestParameters()
         .modulus(ModulusFinder.findSuitableModulus(512)));
   }
 
   // lib.list
   @Test
-  public void test_findDuplicatesOne() throws Exception {
+  public void test_findDuplicatesOne() {
     runTest(new EliminateDuplicatesTests.TestFindDuplicatesOne<>(),
         new TestParameters().numParties(2));
   }
 
   // lib.lp
   @Test
-  public void test_LpSolverEntering() throws Exception {
+  public void test_LpSolverEntering() {
     runTest(new LpBuildingBlockTests.TestEnteringVariable<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_LpSolverBlandEntering() throws Exception {
+  public void test_LpSolverBlandEntering() {
     runTest(new LpBuildingBlockTests.TestBlandEnteringVariable<>(),
         new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_LpTableauDebug() throws Exception {
+  public void test_LpTableauDebug() {
     runTest(new LpBuildingBlockTests.TestLpTableuDebug<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_LpSolverDanzig() throws Exception {
+  public void test_LpSolverDanzig() {
     runTest(new LpBuildingBlockTests.TestLpSolver<>(LPSolver.PivotRule.DANZIG),
         new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_LpSolverDanzigSmallerMod() throws Exception {
+  public void test_LpSolverDanzigSmallerMod() {
     runTest(new LpBuildingBlockTests.TestLpSolver<>(LPSolver.PivotRule.DANZIG),
         new TestParameters()
             .numParties(2)
@@ -427,7 +428,7 @@ public void test_LpSolverDanzigSmallerMod() throws Exception {
   }
 
   @Test
-  public void test_LpSolverBland() throws Exception {
+  public void test_LpSolverBland() {
     runTest(new LpBuildingBlockTests.TestLpSolver<>(LPSolver.PivotRule.BLAND),
         new TestParameters().numParties(2).performanceLogging(true));
     assertThat(performanceLoggers.get(1).getLoggedValues()
@@ -435,60 +436,60 @@ public void test_LpSolverBland() throws Exception {
   }
 
   @Test
-  public void test_LpSolverDebug() throws Exception {
+  public void test_LpSolverDebug() {
     runTest(new LpBuildingBlockTests.TestLpSolverDebug<>(), new TestParameters().numParties(2));
   }
 
 
   // lib.math.integer.binary
   @Test
-  public void test_Right_Shift() throws Exception {
+  public void test_Right_Shift() {
     runTest(new BinaryOperationsTests.TestRightShift<>(), new TestParameters());
   }
 
   @Test
-  public void test_Bit_Length() throws Exception {
+  public void test_Bit_Length() {
     runTest(new BinaryOperationsTests.TestBitLength<>(), new TestParameters());
   }
 
   @Test
-  public void test_Bits() throws Exception {
+  public void test_Bits() {
     runTest(new BinaryOperationsTests.TestBits<>(), new TestParameters());
   }
 
   // Math tests
 
   @Test
-  public void test_euclidian_division() throws Exception {
+  public void test_euclidian_division() {
     runTest(new DivisionTests.TestKnownDivisorDivision<>(), new TestParameters());
   }
 
   @Test
-  public void test_euclidian_division_large_divisor() throws Exception {
+  public void test_euclidian_division_large_divisor() {
     runTest(new DivisionTests.TestKnownDivisorLargeDivisor<>(),
         new TestParameters());
   }
 
   @Test(expected = RuntimeException.class)
-  public void test_euclidian_division_too_large_divisor() throws Exception {
+  public void test_euclidian_division_too_large_divisor() {
     runTest(new DivisionTests.TestKnowndivisorTooLargeDivisor<>(),
         new TestParameters());
   }
 
   @Test
-  public void test_ss_division() throws Exception {
+  public void test_ss_division() {
     runTest(new DivisionTests.TestDivision<>(), new TestParameters().performanceLogging(true));
     assertThat(performanceLoggers.get(1).getLoggedValues()
         .get(ComparisonLoggerDecorator.ARITHMETIC_COMPARISON_COMP0), is((long) 80));
   }
 
   @Test
-  public void test_Modulus() throws Exception {
+  public void test_Modulus() {
     runTest(new AdvancedNumericTests.TestModulus<>(), new TestParameters());
   }
 
   @Test
-  public void test_Exponentiation() throws Exception {
+  public void test_Exponentiation() {
     runTest(new ExponentiationTests.TestExponentiation<>(),
         new TestParameters().numParties(2).performanceLogging(true));
     assertThat(performanceLoggers.get(1).getLoggedValues()
@@ -497,40 +498,40 @@ public void test_Exponentiation() throws Exception {
 
 
   @Test
-  public void test_ExponentiationOpenExponent() throws Exception {
+  public void test_ExponentiationOpenExponent() {
     runTest(new ExponentiationTests.TestExponentiationOpenExponent<>(),
         new TestParameters());
   }
 
   @Test
-  public void test_ExponentiationOpenBase() throws Exception {
+  public void test_ExponentiationOpenBase() {
     runTest(new ExponentiationTests.TestExponentiationOpenBase<>(),
         new TestParameters());
   }
 
   @Test()
-  public void test_ExponentiationZeroExponent() throws Exception {
+  public void test_ExponentiationZeroExponent() {
     runTest(new ExponentiationTests.TestExponentiationZeroExponent<>(),
         new TestParameters());
   }
 
   @Test
-  public void test_InnerProductClosed() throws Exception {
+  public void test_InnerProductClosed() {
     runTest(new LinAlgTests.TestInnerProductClosed<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_InnerProductOpen() throws Exception {
+  public void test_InnerProductOpen() {
     runTest(new LinAlgTests.TestInnerProductOpen<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Logarithm() throws Exception {
+  public void test_Logarithm() {
     runTest(new LogTests.TestLogarithm<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Minimum_Protocol_2_parties() throws Exception {
+  public void test_Minimum_Protocol_2_parties() {
     runTest(new MinTests.TestMinimumProtocol<>(),
         new TestParameters()
             .numParties(2)
@@ -540,7 +541,7 @@ public void test_Minimum_Protocol_2_parties() throws Exception {
   }
 
   @Test
-  public void test_Min_Inf_Frac_2_parties() throws Exception {
+  public void test_Min_Inf_Frac_2_parties() {
     runTest(new MinTests.TestMinInfFraction<>(),
         new TestParameters()
             .numParties(2)
@@ -550,227 +551,227 @@ public void test_Min_Inf_Frac_2_parties() throws Exception {
   }
 
   @Test
-  public void test_Min_Inf_Frac_Trivial_2_parties() throws Exception {
+  public void test_Min_Inf_Frac_Trivial_2_parties() {
     runTest(new MinTests.TestMinInfFractionTrivial<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_sqrt() throws Exception {
+  public void test_sqrt() {
     runTest(new SqrtTests.TestSquareRoot<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Exiting_Variable_2_parties() throws Exception {
+  public void test_Exiting_Variable_2_parties() {
     runTest(new StatisticsTests.TestStatistics<>(), new TestParameters().numParties(3));
   }
 
   @Test
-  public void test_Exiting_Variable_3_parties() throws Exception {
+  public void test_Exiting_Variable_3_parties() {
     runTest(new StatisticsTests.TestStatistics<>(), new TestParameters().numParties(3));
   }
 
   @Test
-  public void test_Exiting_Variable_No_Mean_2_parties() throws Exception {
+  public void test_Exiting_Variable_No_Mean_2_parties() {
     runTest(new StatisticsTests.TestStatisticsNoMean<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Polynomial_Evaluator_2_parties() throws Exception {
+  public void test_Polynomial_Evaluator_2_parties() {
     runTest(new PolynomialTests.TestPolynomialEvaluator<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_debug_tools() throws Exception {
+  public void test_debug_tools() {
     runTest(new ArithmeticDebugTests.TestArithmeticOpenAndPrint<>(),
         new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_exponentiation_pipe_preprocessed() throws Exception {
+  public void test_exponentiation_pipe_preprocessed() {
     runTest(new ExponentiationPipeTests.TestPreprocessedValues<>(), new TestParameters());
   }
 
   @Test
-  public void test_Real_Input_Sequential() throws Exception {
+  public void test_Real_Input_Sequential() {
     runTest(new BasicFixedPointTests.TestInput<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Open_to_party_Sequential() throws Exception {
+  public void test_Real_Open_to_party_Sequential() {
     runTest(new BasicFixedPointTests.TestOpenToParty<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Known() throws Exception {
+  public void test_Real_Known() {
     runTest(new BasicFixedPointTests.TestKnown<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Use_SInt() throws Exception {
+  public void test_Real_Use_SInt() {
     runTest(new BasicFixedPointTests.TestUseSInt<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Add_Known() throws Exception {
+  public void test_Real_Add_Known() {
     runTest(new BasicFixedPointTests.TestAddKnown<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Add_Secret() throws Exception {
+  public void test_Real_Add_Secret() {
     runTest(new BasicFixedPointTests.TestAdd<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Subtract_Secret() throws Exception {
+  public void test_Real_Subtract_Secret() {
     runTest(new BasicFixedPointTests.TestSubtractSecret<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Sub_Known() throws Exception {
+  public void test_Real_Sub_Known() {
     runTest(new BasicFixedPointTests.TestSubKnown<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Mult_Known() throws Exception {
+  public void test_Real_Mult_Known() {
     runTest(new BasicFixedPointTests.TestMultKnown<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Mults() throws Exception {
+  public void test_Real_Mults() {
     runTest(new BasicFixedPointTests.TestMult<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Repeated_Multiplication() throws Exception {
+  public void test_Real_Repeated_Multiplication() {
     runTest(new BasicFixedPointTests.TestRepeatedMultiplication<>(),
         new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Division_Secret_Divisor() throws Exception {
+  public void test_Real_Division_Secret_Divisor() {
     runTest(new BasicFixedPointTests.TestDiv<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Division_Known_Divisor() throws Exception {
+  public void test_Real_Division_Known_Divisor() {
     runTest(new BasicFixedPointTests.TestDivisionKnownDivisor<>(),
         new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Division_Known_Negative_Divisor() throws Exception {
+  public void test_Real_Division_Known_Negative_Divisor() {
     runTest(new BasicFixedPointTests.TestDivisionKnownNegativeDivisor<>(),
         new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Close_Real_Matrix() throws Exception {
+  public void test_Close_Real_Matrix() {
     runTest(new LinearAlgebraTests.TestCloseFixedMatrix<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Close_And_Open_Real_Matrix() throws Exception {
+  public void test_Close_And_Open_Real_Matrix() {
     runTest(new LinearAlgebraTests.TestCloseAndOpenMatrix<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Matrix_Addition() throws Exception {
+  public void test_Real_Matrix_Addition() {
     runTest(new LinearAlgebraTests.TestMatrixAddition<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Matrix_Multiplication() throws Exception {
+  public void test_Real_Matrix_Multiplication() {
     runTest(new LinearAlgebraTests.TestMatrixMultiplication<>(),
         new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Matrix_Scale() throws Exception {
+  public void test_Real_Matrix_Scale() {
     runTest(new LinearAlgebraTests.TestMatrixScale<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Matrix_Operate() throws Exception {
+  public void test_Real_Matrix_Operate() {
     runTest(new LinearAlgebraTests.TestMatrixOperate<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Vector_Multiplication_Unmatched() throws Exception {
+  public void test_Real_Vector_Multiplication_Unmatched() {
     runTest(new LinearAlgebraTests.TestVectorMultUnmatchedDimensions<>(),
         new TestParameters());
   }
 
   @Test
-  public void test_Real_Matrix_Multiplication_Unmatched() throws Exception {
+  public void test_Real_Matrix_Multiplication_Unmatched() {
     runTest(new LinearAlgebraTests.TestMatrixMultUnmatchedDimensions<>(),
         new TestParameters());
   }
 
   @Test
-  public void test_Real_Matrix_Addition_Unmatched() throws Exception {
+  public void test_Real_Matrix_Addition_Unmatched() {
     runTest(new LinearAlgebraTests.TestAdditionUnmatchedDimensions<>(),
         new TestParameters());
   }
 
   @Test
-  public void test_Real_Exp() throws Exception {
+  public void test_Real_Exp() {
     runTest(new MathTests.TestExp<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Random_Element() throws Exception {
+  public void test_Real_Random_Element() {
     runTest(new MathTests.TestRandom<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Leq() throws Exception {
+  public void test_Real_Leq() {
     runTest(new BasicFixedPointTests.TestLeq<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Log() throws Exception {
+  public void test_Real_Log() {
     runTest(new MathTests.TestLog<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Real_Sqrt() throws Exception {
+  public void test_Real_Sqrt() {
     runTest(new MathTests.TestSqrt<>(), new TestParameters().numParties(2));
   }
 
   @Test
-  public void test_Sum() throws Exception {
+  public void test_Sum() {
     runTest(new MathTests.TestSum<>(), new TestParameters());
   }
 
   @Test
-  public void test_inner_product() throws Exception {
+  public void test_inner_product() {
     runTest(new MathTests.TestInnerProduct<>(), new TestParameters());
   }
 
   @Test
-  public void test_inner_product_known_part() throws Exception {
+  public void test_inner_product_known_part() {
     runTest(new MathTests.TestInnerProductPublicPart<>(), new TestParameters());
   }
 
   @Test
-  public void test_inner_product_unmatched_dimensions() throws Exception {
+  public void test_inner_product_unmatched_dimensions() {
     runTest(new MathTests.TestInnerProductUnmatchedDimensions<>(), new TestParameters());
   }
 
   @Test
-  public void test_inner_product_known_part_unmatched() throws Exception {
+  public void test_inner_product_known_part_unmatched() {
     runTest(new MathTests.TestInnerProductPublicPartUnmatched<>(), new TestParameters());
   }
 
   @Test
-  public void test_Real_Sqrt_Uneven_Precision() throws Exception {
+  public void test_Real_Sqrt_Uneven_Precision() {
     runTest(new MathTests.TestSqrt<>(),
         new TestParameters()
             .fixedPointPrecesion(BasicFixedPointTests.DEFAULT_PRECISION + 1));
   }
 
   @Test
-  public void test_trunctation() throws Exception {
+  public void test_trunctation() {
     runTest(new TruncationTests.TestTruncation<>(), new TestParameters().numParties(2));
   }
 
@@ -799,4 +800,16 @@ public void testPreCarryBits() {
     runTest(new TestPreCarryBits<>(), new TestParameters());
   }
 
+  @Test
+  public void testCarryOutZero() {
+    runTest(new TestCarryOut<>(new int[]{0, 0, 0, 0}, new int[]{0, 0, 0, 0}, 0),
+        new TestParameters());
+  }
+
+  @Test
+  public void testCarryOutOne() {
+    runTest(new TestCarryOut<>(new int[]{1, 0, 0, 0}, new int[]{1, 0, 0, 0}, 1),
+        new TestParameters());
+  }
+
 }

From 710dab2ea0f0fe8955c437250859e9757e522ef5 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 18:14:50 +0200
Subject: [PATCH 008/231] Carry out cleanup

---
 .../fresco/lib/compare/gt/PreCarryBits.java      | 16 +++++++---------
 .../TestDummyArithmeticProtocolSuite.java        |  6 ++++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
index 2d5e02ccf..7d150178a 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
@@ -13,7 +13,7 @@ public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<SIntPair>>> pairsDef;
 
-  public PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
+  PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
     this.pairsDef = pairs;
   }
 
@@ -26,20 +26,18 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     if (k == 1) {
       return pairs.get(0).out().getSecond();
     } else {
-      DRes<List<DRes<SIntPair>>> bitsU = builder.par(par -> {
-        List<DRes<SIntPair>> bitsUInner = new ArrayList<>(k / 2);
+      DRes<List<DRes<SIntPair>>> nextRound = builder.par(par -> {
+        List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(k / 2);
         for (int i = 0; i < k / 2; i++) {
           DRes<SIntPair> left = pairs.get(2 * i + 1);
           DRes<SIntPair> right = pairs.get(2 * i);
-          bitsUInner.add(par.seq(new CarryHelper(left, right)));
+          nextRoundInner.add(par.seq(new CarryHelper(left, right)));
         }
-        List<DRes<SIntPair>> nextRound = bitsUInner.subList(0, k / 2);
-        Collections.reverse(nextRound);
-        return () -> nextRound;
+        Collections.reverse(nextRoundInner);
+        return () -> nextRoundInner;
       });
-      return builder.seq(new PreCarryBits(bitsU));
+      return builder.seq(new PreCarryBits(nextRound));
     }
   }
 
-
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 2b763bd0d..c7d93eb00 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -812,4 +812,10 @@ public void testCarryOutOne() {
         new TestParameters());
   }
 
+  @Test
+  public void testCarryOutOneFromCarry() {
+    runTest(new TestCarryOut<>(new int[]{1, 1, 0, 0}, new int[]{0, 1, 0, 0}, 1),
+        new TestParameters());
+  }
+
 }

From 224be212b159d45e5107bcd6d99436ab88b933fd Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 18:25:07 +0200
Subject: [PATCH 009/231] Actually use expected results

---
 .../dk/alexandra/fresco/lib/compare/gt/CarryOut.java |  2 ++
 .../fresco/lib/compare/gt/PreCarryBits.java          |  1 +
 .../fresco/lib/compare/gt/CarryOutTests.java         |  1 -
 .../arithmetic/TestDummyArithmeticProtocolSuite.java | 12 +++++++++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
index 750ab6468..71372fbb7 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
@@ -9,6 +9,7 @@
 import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticXorKnownRight;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
@@ -34,6 +35,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
         int finalI = i;
         innerPairs.add(() -> new SIntPair(xored.get(finalI), anded.get(finalI)));
       }
+      Collections.reverse(innerPairs);
       return innerPairs;
     };
     return builder.seq(new PreCarryBits(pairs));
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
index 7d150178a..03381547f 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
@@ -19,6 +19,7 @@ public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    // TODO enforce that input size is power of 2?
     List<DRes<SIntPair>> pairs = pairsDef.out();
     // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
     Collections.reverse(pairs);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
index 9f0f79f31..d5c25237f 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
@@ -51,7 +51,6 @@ public void test() {
                 return root.numeric().open(carry);
               };
           BigInteger actual = runApplication(app);
-          BigInteger expected = BigInteger.ZERO;
           Assert.assertEquals(expected, actual);
         }
       };
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index c7d93eb00..84be9e661 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -803,19 +803,25 @@ public void testPreCarryBits() {
   @Test
   public void testCarryOutZero() {
     runTest(new TestCarryOut<>(new int[]{0, 0, 0, 0}, new int[]{0, 0, 0, 0}, 0),
-        new TestParameters());
+        new TestParameters().numParties(2));
   }
 
   @Test
   public void testCarryOutOne() {
     runTest(new TestCarryOut<>(new int[]{1, 0, 0, 0}, new int[]{1, 0, 0, 0}, 1),
-        new TestParameters());
+        new TestParameters().numParties(2));
   }
 
   @Test
   public void testCarryOutOneFromCarry() {
     runTest(new TestCarryOut<>(new int[]{1, 1, 0, 0}, new int[]{0, 1, 0, 0}, 1),
-        new TestParameters());
+        new TestParameters().numParties(2));
+  }
+
+  @Test
+  public void testCarryOutAllOnes() {
+    runTest(new TestCarryOut<>(new int[]{1, 1, 1, 1}, new int[]{1, 1, 1, 1}, 1),
+        new TestParameters().numParties(2));
   }
 
 }

From 999cba1aae936391f730aefeba5153a2ed74e389 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 22:06:30 +0200
Subject: [PATCH 010/231] More rigorous tests

---
 .../fresco/lib/compare/gt/CarryOutTests.java  | 33 ++++++++++++++-----
 .../TestDummyArithmeticProtocolSuite.java     | 19 ++++++-----
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
index d5c25237f..476b727fc 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
@@ -9,6 +9,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.junit.Assert;
 
@@ -21,15 +22,12 @@ public static class TestCarryOut<ResourcePoolT extends ResourcePool>
     private final List<DRes<BigInteger>> right;
     private final BigInteger expected;
 
-    public TestCarryOut(int[] leftBits, int[] rightClearBits, int expected) {
-      this.expected = BigInteger.valueOf(expected);
-      int numBits = leftBits.length;
-      left = new ArrayList<>(numBits);
-      right = new ArrayList<>(numBits);
-      for (int i = 0; i < numBits; i++) {
-        left.add(BigInteger.valueOf(leftBits[i]));
-        int finalI = i;
-        right.add(() -> BigInteger.valueOf(rightClearBits[finalI]));
+    public TestCarryOut(int l, int r) {
+      expected = carry(l, r);
+      left = intToBits(l);
+      right = new ArrayList<>(left.size());
+      for (BigInteger bit : intToBits(r)) {
+        right.add(() -> bit);
       }
     }
 
@@ -57,4 +55,21 @@ public void test() {
     }
   }
 
+  private static BigInteger carry(int a, int b) {
+    long res = Integer.toUnsignedLong(a) + Integer.toUnsignedLong(b);
+    int carry = (int) ((res & (1L << 32)) >> 32);
+    return BigInteger.valueOf(carry);
+  }
+
+  private static List<BigInteger> intToBits(int value) {
+    int numBits = Integer.SIZE;
+    List<BigInteger> bits = new ArrayList<>(numBits);
+    for (int i = 0; i < numBits; i++) {
+      int bit = (value & (1 << i)) >>> i;
+      bits.add(BigInteger.valueOf(bit));
+    }
+    Collections.reverse(bits);
+    return bits;
+  }
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 84be9e661..68ca018d0 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -57,6 +57,7 @@
 import dk.alexandra.fresco.logging.arithmetic.ComparisonLoggerDecorator;
 import dk.alexandra.fresco.logging.arithmetic.NumericLoggingDecorator;
 import java.util.ArrayList;
+import java.util.Random;
 import org.junit.Test;
 
 public class TestDummyArithmeticProtocolSuite extends AbstractDummyArithmeticTest {
@@ -802,25 +803,27 @@ public void testPreCarryBits() {
 
   @Test
   public void testCarryOutZero() {
-    runTest(new TestCarryOut<>(new int[]{0, 0, 0, 0}, new int[]{0, 0, 0, 0}, 0),
-        new TestParameters().numParties(2));
+    runTest(new TestCarryOut<>(0x00000000, 0x00000000), new TestParameters().numParties(2));
   }
 
   @Test
   public void testCarryOutOne() {
-    runTest(new TestCarryOut<>(new int[]{1, 0, 0, 0}, new int[]{1, 0, 0, 0}, 1),
-        new TestParameters().numParties(2));
+    runTest(new TestCarryOut<>(0x80000000, 0x80000000), new TestParameters().numParties(2));
+  }
+
+  @Test
+  public void testCarryOutAllOnes() {
+    runTest(new TestCarryOut<>(0xffffffff, 0xffffffff), new TestParameters().numParties(2));
   }
 
   @Test
   public void testCarryOutOneFromCarry() {
-    runTest(new TestCarryOut<>(new int[]{1, 1, 0, 0}, new int[]{0, 1, 0, 0}, 1),
-        new TestParameters().numParties(2));
+    runTest(new TestCarryOut<>(0x40000000, 0xc0000000), new TestParameters().numParties(2));
   }
 
   @Test
-  public void testCarryOutAllOnes() {
-    runTest(new TestCarryOut<>(new int[]{1, 1, 1, 1}, new int[]{1, 1, 1, 1}, 1),
+  public void testCarryOutRandom() {
+    runTest(new TestCarryOut<>(new Random().nextInt(), new Random().nextInt()),
         new TestParameters().numParties(2));
   }
 

From 0e78bc0db0049595c7825c483d2fdf3d6b8c0aa7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 18 Apr 2018 09:33:00 +0200
Subject: [PATCH 011/231] Methods don't need to be static

---
 .../dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
index 476b727fc..03c8af059 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
@@ -55,13 +55,13 @@ public void test() {
     }
   }
 
-  private static BigInteger carry(int a, int b) {
+  private BigInteger carry(int a, int b) {
     long res = Integer.toUnsignedLong(a) + Integer.toUnsignedLong(b);
     int carry = (int) ((res & (1L << 32)) >> 32);
     return BigInteger.valueOf(carry);
   }
 
-  private static List<BigInteger> intToBits(int value) {
+  private List<BigInteger> intToBits(int value) {
     int numBits = Integer.SIZE;
     List<BigInteger> bits = new ArrayList<>(numBits);
     for (int i = 0; i < numBits; i++) {

From 6fd3a8b8ab2f792bafc6df7dc411e030be8b6b17 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 18 Apr 2018 09:43:06 +0200
Subject: [PATCH 012/231] But they do..

---
 .../dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
index 03c8af059..476b727fc 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
@@ -55,13 +55,13 @@ public void test() {
     }
   }
 
-  private BigInteger carry(int a, int b) {
+  private static BigInteger carry(int a, int b) {
     long res = Integer.toUnsignedLong(a) + Integer.toUnsignedLong(b);
     int carry = (int) ((res & (1L << 32)) >> 32);
     return BigInteger.valueOf(carry);
   }
 
-  private List<BigInteger> intToBits(int value) {
+  private static List<BigInteger> intToBits(int value) {
     int numBits = Integer.SIZE;
     List<BigInteger> bits = new ArrayList<>(numBits);
     for (int i = 0; i < numBits; i++) {

From 3e61592a2bb044f937a951c864ca4d5e34f5b475 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 18 Apr 2018 14:58:41 +0200
Subject: [PATCH 013/231] WIP BitLessThan

---
 .../fresco/lib/compare/gt/BitLessThan.java    | 56 +++++++++++++++++++
 .../fresco/lib/compare/gt/CarryOut.java       |  9 ++-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThan.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThan.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThan.java
new file mode 100644
index 000000000..350979e5d
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThan.java
@@ -0,0 +1,56 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Given known value a and secret value b represented as bits, computes a <? b.
+ */
+public class BitLessThan implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<BigInteger> openValueDef;
+  private final DRes<List<DRes<SInt>>> secretBitsDef;
+
+  public BitLessThan(DRes<BigInteger> openValue, DRes<List<DRes<SInt>>> secretBits) {
+    this.openValueDef = openValue;
+    this.secretBitsDef = secretBits;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    List<DRes<SInt>> secretBits = secretBitsDef.out();
+    BigInteger openValueA = openValueDef.out();
+    int numBits = secretBits.size();
+    List<DRes<BigInteger>> openBits = toBits(openValueA, numBits);
+    DRes<List<DRes<SInt>>> secretBitsNegated = builder.par(par -> {
+      List<DRes<SInt>> negatedBits = new ArrayList<>(numBits);
+      for (DRes<SInt> secretBit : secretBits) {
+        negatedBits.add(par.numeric().sub(BigInteger.ONE, secretBit));
+      }
+      Collections.reverse(negatedBits);
+      return () -> negatedBits;
+    });
+    DRes<SInt> gt = builder.seq(new CarryOut(secretBitsNegated, () -> openBits));
+    return builder.numeric().sub(BigInteger.ONE, gt);
+  }
+
+  /**
+   * Turns input value into bits in big-endian order.
+   */
+  private List<DRes<BigInteger>> toBits(BigInteger value, int numBits) {
+    List<DRes<BigInteger>> bits = new ArrayList<>(numBits);
+    for (int b = 0; b < numBits; b++) {
+      boolean boolBit = value.testBit(b);
+      bits.add(boolBit ? () -> BigInteger.ONE : () -> BigInteger.ZERO);
+    }
+    Collections.reverse(bits);
+    return bits;
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
index 71372fbb7..9dcacb3be 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
@@ -16,10 +16,17 @@ public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<SInt>>> bitsA;
   private final DRes<List<DRes<BigInteger>>> bitsB;
+  private final BigInteger carryIn;
 
-  public CarryOut(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB) {
+  public CarryOut(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB,
+      BigInteger carryIn) {
     this.bitsA = bitsA;
     this.bitsB = bitsB;
+    this.carryIn = carryIn;
+  }
+
+  public CarryOut(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB) {
+    this(bitsA, bitsB, BigInteger.ZERO);
   }
 
   @Override

From e8d3caa802ac4edd4627b7ec7d8c3fac20bc6ac6 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 18 Apr 2018 16:54:12 +0200
Subject: [PATCH 014/231] Bit less than tests

---
 .../fresco/framework/util/MathUtils.java      | 31 ++++++++
 ...{BitLessThan.java => BitLessThanOpen.java} | 22 ++----
 .../fresco/lib/compare/gt/CarryOut.java       | 24 +++---
 .../lib/compare/gt/BitLessThanOpenTests.java  | 79 +++++++++++++++++++
 .../fresco/lib/compare/gt/CarryOutTests.java  |  2 +-
 .../TestDummyArithmeticProtocolSuite.java     | 10 ++-
 6 files changed, 140 insertions(+), 28 deletions(-)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/gt/{BitLessThan.java => BitLessThanOpen.java} (63%)
 create mode 100644 core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/MathUtils.java b/core/src/main/java/dk/alexandra/fresco/framework/util/MathUtils.java
index 35682ff17..c88487196 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/MathUtils.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/MathUtils.java
@@ -1,6 +1,9 @@
 package dk.alexandra.fresco.framework.util;
 
+import dk.alexandra.fresco.framework.DRes;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class MathUtils {
@@ -82,6 +85,34 @@ public static BigInteger sum(List<BigInteger> summands, BigInteger modulus) {
         .mod(modulus);
   }
 
+  /**
+   * Turns input value into bits in big-endian order. <p>If the actual bit length of the value is
+   * smaller than numBits, the result is padded with 0s. If the bit length is larger only the first
+   * numBits bits are used.</p>
+   */
+  public static List<BigInteger> toBits(BigInteger value, int numBits) {
+    List<BigInteger> bits = new ArrayList<>(numBits);
+    for (int b = 0; b < numBits; b++) {
+      boolean boolBit = value.testBit(b);
+      bits.add(boolBit ? BigInteger.ONE : BigInteger.ZERO);
+    }
+    Collections.reverse(bits);
+    return bits;
+  }
+
+  /**
+   * Same as {@link #toBits(BigInteger, int)}, but wraps result bits in DRes.
+   */
+  public static List<DRes<BigInteger>> toBitsAsDRes(BigInteger value, int numBits) {
+    List<DRes<BigInteger>> bits = new ArrayList<>(numBits);
+    for (int b = 0; b < numBits; b++) {
+      boolean boolBit = value.testBit(b);
+      bits.add(boolBit ? () -> BigInteger.ONE : () -> BigInteger.ZERO);
+    }
+    Collections.reverse(bits);
+    return bits;
+  }
+
   /**
    * Find non-quadratic residue for field.
    *
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThan.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
similarity index 63%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThan.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
index 350979e5d..43aa173cb 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThan.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.MathUtils;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -12,12 +13,12 @@
 /**
  * Given known value a and secret value b represented as bits, computes a <? b.
  */
-public class BitLessThan implements Computation<SInt, ProtocolBuilderNumeric> {
+public class BitLessThanOpen implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<BigInteger> openValueDef;
   private final DRes<List<DRes<SInt>>> secretBitsDef;
 
-  public BitLessThan(DRes<BigInteger> openValue, DRes<List<DRes<SInt>>> secretBits) {
+  public BitLessThanOpen(DRes<BigInteger> openValue, DRes<List<DRes<SInt>>> secretBits) {
     this.openValueDef = openValue;
     this.secretBitsDef = secretBits;
   }
@@ -27,7 +28,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
     BigInteger openValueA = openValueDef.out();
     int numBits = secretBits.size();
-    List<DRes<BigInteger>> openBits = toBits(openValueA, numBits);
+    List<DRes<BigInteger>> openBits = MathUtils.toBitsAsDRes(openValueA, numBits);
     DRes<List<DRes<SInt>>> secretBitsNegated = builder.par(par -> {
       List<DRes<SInt>> negatedBits = new ArrayList<>(numBits);
       for (DRes<SInt> secretBit : secretBits) {
@@ -36,21 +37,8 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       Collections.reverse(negatedBits);
       return () -> negatedBits;
     });
-    DRes<SInt> gt = builder.seq(new CarryOut(secretBitsNegated, () -> openBits));
+    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, BigInteger.ONE));
     return builder.numeric().sub(BigInteger.ONE, gt);
   }
 
-  /**
-   * Turns input value into bits in big-endian order.
-   */
-  private List<DRes<BigInteger>> toBits(BigInteger value, int numBits) {
-    List<DRes<BigInteger>> bits = new ArrayList<>(numBits);
-    for (int b = 0; b < numBits; b++) {
-      boolean boolBit = value.testBit(b);
-      bits.add(boolBit ? () -> BigInteger.ONE : () -> BigInteger.ZERO);
-    }
-    Collections.reverse(bits);
-    return bits;
-  }
-
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
index 9dcacb3be..3c90eedf4 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
@@ -12,28 +12,34 @@
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * Given values a and b represented as bits, computes if a + b overflows, i.e., if there is a
+ * carry.
+ */
 public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<List<DRes<SInt>>> bitsA;
-  private final DRes<List<DRes<BigInteger>>> bitsB;
+  private final DRes<List<DRes<BigInteger>>> clearBits;
+  private final DRes<List<DRes<SInt>>> secretBits;
   private final BigInteger carryIn;
 
-  public CarryOut(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB,
+  public CarryOut(DRes<List<DRes<BigInteger>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
       BigInteger carryIn) {
-    this.bitsA = bitsA;
-    this.bitsB = bitsB;
+    this.secretBits = secretBits;
+    this.clearBits = clearBits;
     this.carryIn = carryIn;
   }
 
-  public CarryOut(DRes<List<DRes<SInt>>> bitsA, DRes<List<DRes<BigInteger>>> bitsB) {
-    this(bitsA, bitsB, BigInteger.ZERO);
+  public CarryOut(DRes<List<DRes<BigInteger>>> clearBits, DRes<List<DRes<SInt>>> secretBits) {
+    this(clearBits, secretBits, BigInteger.ZERO);
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     // TODO both calls should be in parallel
-    DRes<List<DRes<SInt>>> xoredDef = builder.par(new ArithmeticXorKnownRight(bitsA, bitsB));
-    DRes<List<DRes<SInt>>> andedDef = builder.par(new ArithmeticAndKnownRight(bitsA, bitsB));
+    DRes<List<DRes<SInt>>> xoredDef = builder
+        .par(new ArithmeticXorKnownRight(secretBits, clearBits));
+    DRes<List<DRes<SInt>>> andedDef = builder
+        .par(new ArithmeticAndKnownRight(secretBits, clearBits));
     DRes<List<DRes<SIntPair>>> pairs = () -> {
       List<DRes<SInt>> xored = xoredDef.out();
       List<DRes<SInt>> anded = andedDef.out();
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
new file mode 100644
index 000000000..33a214481
--- /dev/null
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
@@ -0,0 +1,79 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.MathUtils;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.Assert;
+
+public class BitLessThanOpenTests {
+
+  public static class TestBitLessThanOpenBaseCases<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    private final int numBits;
+    private final List<BigInteger> left;
+    private final List<BigInteger> right;
+
+    public TestBitLessThanOpenBaseCases(int numBits) {
+      this.numBits = numBits;
+      left = Arrays.asList(
+          BigInteger.ZERO,
+          BigInteger.ONE
+      );
+      right = Arrays.asList(
+          BigInteger.ONE,
+          BigInteger.ZERO
+      );
+    }
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                int myId = root.getBasicNumericContext().getMyId();
+                List<DRes<BigInteger>> results = new ArrayList<>(left.size());
+                for (int i = 0; i < left.size(); i++) {
+                  int finalI = i;
+                  DRes<BigInteger> leftValue = () -> left.get(finalI);
+                  DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(finalI), myId);
+                  results.add(
+                      root.numeric().open(root.seq(new BitLessThanOpen(leftValue, rightValue)))
+                  );
+                }
+                return () -> results.stream().map(DRes::out).collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = new ArrayList<>(left.size());
+          for (int i = 0; i < left.size(); i++) {
+            boolean leq = left.get(i).compareTo(right.get(i)) <= 0;
+            expected.add(leq ? BigInteger.ONE : BigInteger.ZERO);
+          }
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+
+    private DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root, BigInteger value,
+        int myId) {
+      return (myId == 1) ?
+          root.collections().closeList(MathUtils.toBits(value, numBits), 1)
+          : root.collections().closeList(numBits, 1);
+    }
+
+  }
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
index 476b727fc..63610ef3b 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
@@ -45,7 +45,7 @@ public void test() {
                     (myId == 1) ?
                         root.collections().closeList(left, 1)
                         : root.collections().closeList(left.size(), 1);
-                DRes<SInt> carry = root.seq(new CarryOut(leftClosed, () -> right));
+                DRes<SInt> carry = root.seq(new CarryOut(() -> right, leftClosed));
                 return root.numeric().open(carry);
               };
           BigInteger actual = runApplication(app);
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 68ca018d0..cb255213d 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -22,6 +22,7 @@
 import dk.alexandra.fresco.lib.collections.relational.LeakyAggregationTests;
 import dk.alexandra.fresco.lib.collections.shuffle.ShuffleRowsTests;
 import dk.alexandra.fresco.lib.compare.CompareTests;
+import dk.alexandra.fresco.lib.compare.gt.BitLessThanOpenTests.TestBitLessThanOpenBaseCases;
 import dk.alexandra.fresco.lib.compare.gt.CarryOutTests.TestCarryOut;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestCarryHelper;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestPreCarryBits;
@@ -823,8 +824,15 @@ public void testCarryOutOneFromCarry() {
 
   @Test
   public void testCarryOutRandom() {
-    runTest(new TestCarryOut<>(new Random().nextInt(), new Random().nextInt()),
+    runTest(new TestCarryOut<>(new Random(42).nextInt(), new Random(1).nextInt()),
         new TestParameters().numParties(2));
   }
 
+  @Test
+  public void testBitLessThanOpenBaseCases() {
+    TestParameters parameters = new TestParameters().numParties(2)
+        .modulus(ModulusFinder.findSuitableModulus(128));
+    runTest(new TestBitLessThanOpenBaseCases<>(128), parameters);
+  }
+
 }

From 8cf0b6881560cf127ed64c44050635ad1f8609a8 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 18 Apr 2018 17:29:51 +0200
Subject: [PATCH 015/231] Updated sum to take DRes

---
 .../framework/builder/numeric/AdvancedNumeric.java       | 5 +++++
 .../builder/numeric/DefaultAdvancedNumeric.java          | 5 +++++
 .../alexandra/fresco/lib/compare/gt/BitLessThanOpen.java | 4 ++++
 .../alexandra/fresco/lib/math/integer/SumSIntList.java   | 9 +++++++--
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
index b5f4c3cbc..15ac29601 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
@@ -18,14 +18,19 @@ public interface AdvancedNumeric extends ComputationDirectory {
    * @param elements the elements to sum
    * @return A deferred result computing the sum of the elements
    */
+  @Deprecated
   DRes<SInt> sum(List<DRes<SInt>> elements);
 
+
+  DRes<SInt> sum(DRes<List<DRes<SInt>>> elements);
+
   /**
    * Calculates the product of all elements in the list.
    *
    * @param elements the elements to sum
    * @return A deferred result computing the product of the elements
    */
+  @Deprecated
   DRes<SInt> product(List<DRes<SInt>> elements);
 
   /**
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
index 8cd82454b..45c1c1c2e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
@@ -45,6 +45,11 @@ public DRes<SInt> sum(List<DRes<SInt>> inputs) {
     return builder.seq(new SumSIntList(inputs));
   }
 
+  @Override
+  public DRes<SInt> sum(DRes<List<DRes<SInt>>> elements) {
+    return builder.seq(new SumSIntList(elements));
+  }
+
   @Override
   public DRes<SInt> product(List<DRes<SInt>> elements) {
     return builder.seq(new ProductSIntList(elements));
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
index 43aa173cb..a86874a0f 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
@@ -23,6 +23,10 @@ public BitLessThanOpen(DRes<BigInteger> openValue, DRes<List<DRes<SInt>>> secret
     this.secretBitsDef = secretBits;
   }
 
+  public BitLessThanOpen(BigInteger openValue, List<DRes<SInt>> secretBits) {
+    this(() -> openValue, () -> secretBits);
+  }
+
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/SumSIntList.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/SumSIntList.java
index 9a4f71235..3e0213bbb 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/SumSIntList.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/SumSIntList.java
@@ -13,7 +13,7 @@
  */
 public class SumSIntList implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final List<DRes<SInt>> input;
+  private final DRes<List<DRes<SInt>>> inputDef;
 
   /**
    * Creates a new SumSIntList.
@@ -21,11 +21,16 @@ public class SumSIntList implements Computation<SInt, ProtocolBuilderNumeric> {
    * @param list the list to sum
    */
   public SumSIntList(List<DRes<SInt>> list) {
-    input = list;
+    this(() -> list);
+  }
+
+  public SumSIntList(DRes<List<DRes<SInt>>> list) {
+    inputDef = list;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric iterationBuilder) {
+    List<DRes<SInt>> input = inputDef.out();
     return iterationBuilder.seq(seq ->
         () -> input
     ).whileLoop(

From 4b6e15ab6a86957c9c04cf0e2c559c9b45b073c0 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 18 Apr 2018 21:34:26 +0200
Subject: [PATCH 016/231] Use carry in in carry out and tests

---
 .../fresco/lib/compare/gt/CarryOut.java       | 20 +++++++++++++------
 .../lib/compare/gt/BitLessThanOpenTests.java  | 19 ++++++++++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
index 3c90eedf4..869dbe8e3 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
@@ -36,21 +36,29 @@ public CarryOut(DRes<List<DRes<BigInteger>>> clearBits, DRes<List<DRes<SInt>>> s
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     // TODO both calls should be in parallel
+    // TODO don't re-use generic protocols to cut number of mults in half
     DRes<List<DRes<SInt>>> xoredDef = builder
         .par(new ArithmeticXorKnownRight(secretBits, clearBits));
     DRes<List<DRes<SInt>>> andedDef = builder
         .par(new ArithmeticAndKnownRight(secretBits, clearBits));
-    DRes<List<DRes<SIntPair>>> pairs = () -> {
+    DRes<List<DRes<SIntPair>>> pairs = builder.seq(seq -> {
       List<DRes<SInt>> xored = xoredDef.out();
       List<DRes<SInt>> anded = andedDef.out();
       List<DRes<SIntPair>> innerPairs = new ArrayList<>(xored.size());
-      for (int i = 0; i < xored.size(); i++) {
-        int finalI = i;
-        innerPairs.add(() -> new SIntPair(xored.get(finalI), anded.get(finalI)));
+      for (int i = 0; i < xored.size() - 1; i++) {
+        SIntPair pair = new SIntPair(xored.get(i), anded.get(i));
+        innerPairs.add(() -> pair);
       }
+      // need to account for carry-in bit
+      int lastIdx = xored.size() - 1;
+      DRes<SInt> lastCarryPropagator = seq.numeric().add(
+          anded.get(lastIdx),
+          seq.numeric().mult(carryIn, xored.get(lastIdx)));
+      SIntPair pair = new SIntPair(xored.get(lastIdx), lastCarryPropagator);
+      innerPairs.add(() -> pair);
       Collections.reverse(innerPairs);
-      return innerPairs;
-    };
+      return () -> innerPairs;
+    });
     return builder.seq(new PreCarryBits(pairs));
   }
 
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
index 33a214481..810078dbc 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
@@ -11,6 +11,7 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.junit.Assert;
@@ -28,11 +29,19 @@ public TestBitLessThanOpenBaseCases(int numBits) {
       this.numBits = numBits;
       left = Arrays.asList(
           BigInteger.ZERO,
-          BigInteger.ONE
+          BigInteger.ONE,
+          BigInteger.ZERO,
+          BigInteger.valueOf(5),
+          BigInteger.valueOf(111),
+          BigInteger.valueOf(111)
       );
       right = Arrays.asList(
           BigInteger.ONE,
-          BigInteger.ZERO
+          BigInteger.ZERO,
+          BigInteger.ZERO,
+          BigInteger.valueOf(4),
+          BigInteger.valueOf(111),
+          BigInteger.valueOf(112)
       );
     }
 
@@ -60,7 +69,7 @@ public void test() {
           List<BigInteger> actual = runApplication(app);
           List<BigInteger> expected = new ArrayList<>(left.size());
           for (int i = 0; i < left.size(); i++) {
-            boolean leq = left.get(i).compareTo(right.get(i)) <= 0;
+            boolean leq = left.get(i).compareTo(right.get(i)) < 0;
             expected.add(leq ? BigInteger.ONE : BigInteger.ZERO);
           }
           Assert.assertEquals(expected, actual);
@@ -70,8 +79,10 @@ public void test() {
 
     private DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root, BigInteger value,
         int myId) {
+      List<BigInteger> openList = MathUtils.toBits(value, numBits);
+      Collections.reverse(openList);
       return (myId == 1) ?
-          root.collections().closeList(MathUtils.toBits(value, numBits), 1)
+          root.collections().closeList(openList, 1)
           : root.collections().closeList(numBits, 1);
     }
 

From 2d5e87840fc8473d1eea2638204fb29d7c22f5d4 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 10:18:01 +0200
Subject: [PATCH 017/231] More bit less than tests

---
 .../lib/compare/gt/BitLessThanOpenTests.java  | 43 ++++++++++++-------
 .../TestDummyArithmeticProtocolSuite.java     | 10 +++--
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
index 810078dbc..8481bac11 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
@@ -13,35 +13,43 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Random;
 import java.util.stream.Collectors;
 import org.junit.Assert;
 
 public class BitLessThanOpenTests {
 
-  public static class TestBitLessThanOpenBaseCases<ResourcePoolT extends ResourcePool>
+  public static class TestBitLessThanOpen<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
     private final int numBits;
     private final List<BigInteger> left;
     private final List<BigInteger> right;
 
-    public TestBitLessThanOpenBaseCases(int numBits) {
+    public TestBitLessThanOpen(BigInteger modulus, int numBits) {
       this.numBits = numBits;
-      left = Arrays.asList(
+      Random random = new Random(42);
+      this.left = Arrays.asList(
           BigInteger.ZERO,
           BigInteger.ONE,
           BigInteger.ZERO,
           BigInteger.valueOf(5),
           BigInteger.valueOf(111),
-          BigInteger.valueOf(111)
+          BigInteger.valueOf(111),
+          modulus.subtract(BigInteger.ONE),
+          modulus.subtract(BigInteger.ONE),
+          new BigInteger(numBits, random).mod(modulus)
       );
-      right = Arrays.asList(
+      this.right = Arrays.asList(
           BigInteger.ONE,
           BigInteger.ZERO,
           BigInteger.ZERO,
           BigInteger.valueOf(4),
           BigInteger.valueOf(111),
-          BigInteger.valueOf(112)
+          BigInteger.valueOf(112),
+          modulus.subtract(BigInteger.ONE),
+          modulus.subtract(BigInteger.valueOf(2)),
+          new BigInteger(numBits, random).mod(modulus)
       );
     }
 
@@ -59,7 +67,8 @@ public void test() {
                 for (int i = 0; i < left.size(); i++) {
                   int finalI = i;
                   DRes<BigInteger> leftValue = () -> left.get(finalI);
-                  DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(finalI), myId);
+                  DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(finalI), myId,
+                      numBits);
                   results.add(
                       root.numeric().open(root.seq(new BitLessThanOpen(leftValue, rightValue)))
                   );
@@ -76,15 +85,17 @@ public void test() {
         }
       };
     }
+    
+  }
 
-    private DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root, BigInteger value,
-        int myId) {
-      List<BigInteger> openList = MathUtils.toBits(value, numBits);
-      Collections.reverse(openList);
-      return (myId == 1) ?
-          root.collections().closeList(openList, 1)
-          : root.collections().closeList(numBits, 1);
-    }
-
+  private static DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root,
+      BigInteger value,
+      int myId, int numBits) {
+    List<BigInteger> openList = MathUtils.toBits(value, numBits);
+    Collections.reverse(openList);
+    return (myId == 1) ?
+        root.collections().closeList(openList, 1)
+        : root.collections().closeList(numBits, 1);
   }
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index cb255213d..bc2d2b42b 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -22,7 +22,7 @@
 import dk.alexandra.fresco.lib.collections.relational.LeakyAggregationTests;
 import dk.alexandra.fresco.lib.collections.shuffle.ShuffleRowsTests;
 import dk.alexandra.fresco.lib.compare.CompareTests;
-import dk.alexandra.fresco.lib.compare.gt.BitLessThanOpenTests.TestBitLessThanOpenBaseCases;
+import dk.alexandra.fresco.lib.compare.gt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.lib.compare.gt.CarryOutTests.TestCarryOut;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestCarryHelper;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestPreCarryBits;
@@ -57,6 +57,7 @@
 import dk.alexandra.fresco.logging.NetworkLoggingDecorator;
 import dk.alexandra.fresco.logging.arithmetic.ComparisonLoggerDecorator;
 import dk.alexandra.fresco.logging.arithmetic.NumericLoggingDecorator;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Random;
 import org.junit.Test;
@@ -829,10 +830,11 @@ public void testCarryOutRandom() {
   }
 
   @Test
-  public void testBitLessThanOpenBaseCases() {
+  public void testBitLessThanOpen() {
+    BigInteger modulus = ModulusFinder.findSuitableModulus(128);
     TestParameters parameters = new TestParameters().numParties(2)
-        .modulus(ModulusFinder.findSuitableModulus(128));
-    runTest(new TestBitLessThanOpenBaseCases<>(128), parameters);
+        .modulus(modulus);
+    runTest(new TestBitLessThanOpen<>(modulus, 128), parameters);
   }
 
 }

From 16e73a0a31c285879ae4d4a18deba3fec2dd677b Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 19 Apr 2018 10:36:25 +0200
Subject: [PATCH 018/231] Draft of mod2m

---
 .../fresco/lib/math/integer/mod/Mod2m.java    | 69 +++++++++++++++++--
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index 49d7a133f..e8f0f72a3 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -1,33 +1,88 @@
 package dk.alexandra.fresco.lib.math.integer.mod;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.compare.gt.BitLessThanOpen;
 
 /**
  * Computes modular reduction of value mod 2^m.
  */
 public class Mod2m implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<SInt> value;
+  private final DRes<SInt> input;
   private final int m;
+  private final int k;
+  private final int kappa;
 
   /**
    * Constructs new {@link Mod2m}.
    *
-   * @param value value to reduce
-   * @param m exponent (2^{m})
+   * @param input
+   *          value to reduce
+   * @param m
+   *          exponent (2^{m})
+   * @param k
+   *          bitlength of the input
+   * @param kappa
+   *          Computational security parameter
    */
-  public Mod2m(DRes<SInt> value, int m) {
-    this.value = value;
+  public Mod2m(DRes<SInt> input, int m, int k, int kappa) {
+    this.input = input;
     this.m = m;
+    this.k = k;
+    this.kappa = kappa;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    // TODO implement
-    return null;
+    if (m >= k) {
+      return input; // TODO is that ok?
+    }
+    List<DRes<SInt>> randomBits = new ArrayList<DRes<SInt>>(k + kappa);
+    IntStream.range(0, k + kappa).forEach(i -> randomBits.add(builder.numeric()
+        .randomBit()));
+    BigInteger two = new BigInteger("2");
+    DRes<List<DRes<SInt>>> rList = builder.par(par -> {
+      List<DRes<SInt>> list = new ArrayList<>(k + kappa);
+      for (int i = 0; i < k + kappa; i++) {
+        list.add(par.numeric().mult(two.pow(i), randomBits.get(i)));
+      }
+      return () -> list;
+    });
+    DRes<SInt> r = builder.advancedNumeric().sum(rList);
+
+    DRes<List<DRes<SInt>>> rPrimeList = builder.par(par -> {
+      List<DRes<SInt>> list = new ArrayList<>(m);
+      for (int i = 0; i < m; i++) {
+        list.add(par.numeric().mult(two.pow(i), randomBits.get(i)));
+      }
+      return () -> list;
+    });
+    DRes<SInt> rPrime = builder.advancedNumeric().sum(rPrimeList);
+
+    DRes<SInt> temp1 = builder.numeric().add(input, r);
+    DRes<BigInteger> c = builder.numeric().open(builder.numeric().add(two.pow(k
+        - 1), temp1));
+    return builder.seq( seq -> {
+      BigInteger cPrime = c.out().mod(two.pow(m));
+      DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrime, rPrimeList));
+      DRes<SInt> temp2 = seq.numeric().mult(two.pow(m), u);
+      DRes<SInt> temp3 = seq.numeric().sub(cPrime, rPrime);
+      DRes<SInt> aPrime = seq.numeric().add(temp2, temp3);
+      // builder.numeric().known(randomBits.get(i).two.pow(i))
+      // randomBits.forEach(r -> {
+      // System.out.println(builder.numeric().open(r).out());
+      // });
+      return aPrime;
+    });
+
   }
 
 }

From c68ed816fe25615923e5ada1212b06709406d76b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 11:06:48 +0200
Subject: [PATCH 019/231] Truncate

---
 .../fresco/lib/compare/gt/Truncate.java       | 47 +++++++++++++++++++
 .../lib/math/integer/mod/Mod2mTests.java      |  3 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
new file mode 100644
index 000000000..b960d8397
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
@@ -0,0 +1,47 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.math.integer.mod.Mod2m;
+import java.math.BigInteger;
+
+/**
+ * Given k-bit secret input a and value m < k computes a >> m.
+ */
+public class Truncate implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private static BigInteger TWO_TO_MINUS_M;
+  private final DRes<SInt> input;
+  private final int m;
+  private final int k;
+  private final int kappa;
+
+  public Truncate(DRes<SInt> input, int m, int k, int kappa) {
+    this.input = input;
+    this.m = m;
+    this.k = k;
+    this.kappa = kappa;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    DRes<SInt> inputMod2m = builder.seq(new Mod2m(input, m, k, kappa));
+    DRes<SInt> difference = builder.numeric().sub(input, inputMod2m);
+    BigInteger twoToMinusM = invertPowerOfTwo(m, builder.getBasicNumericContext().getModulus());
+    return builder.numeric().mult(twoToMinusM, difference);
+  }
+
+  /**
+   * Computes 2^{-m} % modulus.
+   */
+  private BigInteger invertPowerOfTwo(int m, BigInteger modulus) {
+    // TODO this might belong on the numeric context
+    if (TWO_TO_MINUS_M == null) {
+      TWO_TO_MINUS_M = BigInteger.ONE.shiftLeft(m - 1).modInverse(modulus);
+    }
+    return TWO_TO_MINUS_M;
+  }
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
index f03a926f5..5ed6b8fee 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
@@ -25,7 +25,8 @@ public void test() {
             // TODO implement
             DRes<SInt> value = builder.numeric().known(BigInteger.ONE);
             int m = 64;
-            return builder.seq(new Mod2m(value, m));
+//            return builder.seq(new Mod2m(value, m));
+            return null;
           };
           DRes<SInt> result = runApplication(app);
         }

From 3aa7983f187729e022733b2daf0979b2d7c74f29 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 11:18:18 +0200
Subject: [PATCH 020/231] Move inversion of two to big int helper

---
 .../lib/compare/MiscBigIntegerGenerators.java | 61 +++++++++++--------
 .../fresco/lib/compare/gt/Truncate.java       | 14 +----
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java
index 0526fe28c..bd4a23e3a 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java
@@ -10,22 +10,33 @@
 
 /**
  * Misc computation on BigIntegers -- results are cached.
- *
  */
 public class MiscBigIntegerGenerators {
 
   private Map<Integer, BigInteger[]> coefficientsOfPolynomiums;
   private List<BigInteger> twoPowersList;
   private BigInteger modulus;
+  private Map<Integer, BigInteger> invertedPowersOfTwo;
 
   public MiscBigIntegerGenerators(BigInteger modulus) {
     coefficientsOfPolynomiums = new HashMap<>();
-
+    invertedPowersOfTwo = new HashMap<>();
     this.modulus = modulus;
     twoPowersList = new ArrayList<>(1);
     twoPowersList.add(BigInteger.ONE);
   }
 
+  /**
+   * Computes 2^{-exponent} % modulus.
+   */
+  public BigInteger invertPowerOfTwo(int exponent) {
+    if (!invertedPowersOfTwo.containsKey(exponent)) {
+      invertedPowersOfTwo.put(
+          exponent,
+          BigInteger.ONE.shiftLeft(exponent - 1).modInverse(modulus));
+    }
+    return invertedPowersOfTwo.get(exponent);
+  }
 
   /**
    * Generate a degree l polynomium P such that P(1) = 1 and P(i) = 0 for i in {2,3,...,l+1}
@@ -52,38 +63,38 @@ public BigInteger[] getPoly(int l) {
   }
 
   /**
-   * Returns the coefficients of a polynomial of degree <i>l</i> such that
-   * <i>f(1) = 1</i> and <i>f(n) = 0</i> for <i>1 &le; n &le; l+1</i> and <i>n
-   * &ne; 1</i> in <i>Z<sub>p</sub></i>. The first element in the array is the
-   * coefficient of the term with the highest degree, eg. degree <i>l</i>.
+   * Returns the coefficients of a polynomial of degree <i>l</i> such that <i>f(1) = 1</i> and
+   * <i>f(n) = 0</i> for <i>1 &le; n &le; l+1</i> and <i>n &ne; 1</i> in <i>Z<sub>p</sub></i>. The
+   * first element in the array is the coefficient of the term with the highest degree, eg. degree
+   * <i>l</i>.
    *
    * @param l The desired degree of <i>f</i>
    */
   private BigInteger[] constructPolynomial(int l) {
-		/*
+    /*
      * Let f_i be the polynoimial which is the product of the first i of
-		 * (x-1), (x-2), ..., (x), (x-2), ..., (x-(l+1)). Then f_0 = 1
-		 * and f_i = (x-k) f_{i-1} where k = i if i < 1 and k = i+1 if i >= 1.
-		 * Note that we are interested in calculating f(x) = f_l(x) / f_l(1).
-		 *
-		 * If we let f_ij denote the j'th coefficient of f_i we have the
-		 * recurrence relations:
-		 *
-		 * f_i0 = 1 for all i (highest degree coefficient)
-		 *
-		 * f_ij = f_{i-1, j} - f_{i-1, j-1} * k for j = 1,...,i
-		 *
-		 * f_ij = 0 for j > i
-		 */
+     * (x-1), (x-2), ..., (x), (x-2), ..., (x-(l+1)). Then f_0 = 1
+     * and f_i = (x-k) f_{i-1} where k = i if i < 1 and k = i+1 if i >= 1.
+     * Note that we are interested in calculating f(x) = f_l(x) / f_l(1).
+     *
+     * If we let f_ij denote the j'th coefficient of f_i we have the
+     * recurrence relations:
+     *
+     * f_i0 = 1 for all i (highest degree coefficient)
+     *
+     * f_ij = f_{i-1, j} - f_{i-1, j-1} * k for j = 1,...,i
+     *
+     * f_ij = 0 for j > i
+     */
     BigInteger[] f = new BigInteger[l + 1];
 
     // Initial value: f_0 = 1
     f[0] = BigInteger.valueOf(1);
 
-		/*
+    /*
      * We also calculate f_i(m) in order to be able to normalize f such that
-		 * f(m) = 1. Note that f_i(m) = f_{i-1}(m)(m - k) with the above notation.
-		 */
+     * f(m) = 1. Note that f_i(m) = f_{i-1}(m)(m - k) with the above notation.
+     */
     BigInteger fm = BigInteger.ONE;
 
     for (int i = 1; i <= l; i++) {
@@ -110,8 +121,6 @@ private BigInteger[] constructPolynomial(int l) {
 
   /**
    * Generates a list of [2^0, 2^1, ..., 2^length]
-   * @param length
-   * @return
    */
   public List<BigInteger> getTwoPowersList(int length) {
     int currentLength = twoPowersList.size();
@@ -130,7 +139,7 @@ public List<BigInteger> getTwoPowersList(int length) {
 
   /**
    * Generates the sequence: [value, value^2, value^3, ..., value^maxBitSize-1]
-   * 
+   *
    * @param value The base of the exponentiation sequence
    * @param maxBitSize The length of the sequence
    * @return [value, value^2, value^3, ..., value^maxBitSize-1]
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
index b960d8397..17723face 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
@@ -12,7 +12,6 @@
  */
 public class Truncate implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private static BigInteger TWO_TO_MINUS_M;
   private final DRes<SInt> input;
   private final int m;
   private final int k;
@@ -29,19 +28,8 @@ public Truncate(DRes<SInt> input, int m, int k, int kappa) {
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<SInt> inputMod2m = builder.seq(new Mod2m(input, m, k, kappa));
     DRes<SInt> difference = builder.numeric().sub(input, inputMod2m);
-    BigInteger twoToMinusM = invertPowerOfTwo(m, builder.getBasicNumericContext().getModulus());
+    BigInteger twoToMinusM = builder.getBigIntegerHelper().invertPowerOfTwo(m);
     return builder.numeric().mult(twoToMinusM, difference);
   }
 
-  /**
-   * Computes 2^{-m} % modulus.
-   */
-  private BigInteger invertPowerOfTwo(int m, BigInteger modulus) {
-    // TODO this might belong on the numeric context
-    if (TWO_TO_MINUS_M == null) {
-      TWO_TO_MINUS_M = BigInteger.ONE.shiftLeft(m - 1).modInverse(modulus);
-    }
-    return TWO_TO_MINUS_M;
-  }
-
 }

From 56b2cbfd049a6f1f1a32aa292671c1b2f9deeffd Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 11:37:20 +0200
Subject: [PATCH 021/231] Temporary dummy mod2m protocol

---
 .../fresco/lib/compare/gt/Truncate.java       |  4 +-
 .../lib/math/integer/mod/DummyMod2m.java      | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
index 17723face..9c9e90081 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
@@ -4,7 +4,7 @@
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.math.integer.mod.Mod2m;
+import dk.alexandra.fresco.lib.math.integer.mod.DummyMod2m;
 import java.math.BigInteger;
 
 /**
@@ -26,7 +26,7 @@ public Truncate(DRes<SInt> input, int m, int k, int kappa) {
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> inputMod2m = builder.seq(new Mod2m(input, m, k, kappa));
+    DRes<SInt> inputMod2m = builder.seq(new DummyMod2m(input, m, k, kappa));
     DRes<SInt> difference = builder.numeric().sub(input, inputMod2m);
     BigInteger twoToMinusM = builder.getBigIntegerHelper().invertPowerOfTwo(m);
     return builder.numeric().mult(twoToMinusM, difference);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java
new file mode 100644
index 000000000..5dcd060e7
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java
@@ -0,0 +1,46 @@
+package dk.alexandra.fresco.lib.math.integer.mod;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+
+@Deprecated
+public class DummyMod2m implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<SInt> input;
+  private final int m;
+  private final int k;
+  private final int kappa;
+
+  /**
+   * Constructs new {@link Mod2m}.
+   *
+   * @param input
+   *          value to reduce
+   * @param m
+   *          exponent (2^{m})
+   * @param k
+   *          bitlength of the input
+   * @param kappa
+   *          Computational security parameter
+   */
+  public DummyMod2m(DRes<SInt> input, int m, int k, int kappa) {
+    this.input = input;
+    this.m = m;
+    this.k = k;
+    this.kappa = kappa;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    DRes<BigInteger> openInputDef = builder.numeric().open(input);
+    return builder.seq(seq -> {
+      BigInteger openInput = openInputDef.out();
+      BigInteger twoToM = BigInteger.ONE.shiftLeft(m - 1);
+      return seq.numeric().input(openInput.mod(twoToM), 1);
+    });
+  }
+
+}

From c8bd2dc634a961039d6b13e74973eafe56ed82d1 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 11:46:52 +0200
Subject: [PATCH 022/231] WIP truncate tests

---
 .../fresco/lib/compare/gt/Truncate.java       | 10 +++-
 .../fresco/lib/compare/gt/TruncateTests.java  | 47 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
index 9c9e90081..a8753779d 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
@@ -8,7 +8,7 @@
 import java.math.BigInteger;
 
 /**
- * Given k-bit secret input a and value m < k computes a >> m.
+ * Given k-bit secret input a and value m < k masks k - m upper bits and right shifts result by m.
  */
 public class Truncate implements Computation<SInt, ProtocolBuilderNumeric> {
 
@@ -17,6 +17,14 @@ public class Truncate implements Computation<SInt, ProtocolBuilderNumeric> {
   private final int k;
   private final int kappa;
 
+  /**
+   * Constructs new {@link Truncate}.
+   *
+   * @param input input to be shifted
+   * @param m shift by
+   * @param k bit length of input
+   * @param kappa computational security parameter
+   */
   public Truncate(DRes<SInt> input, int m, int k, int kappa) {
     this.input = input;
     this.m = m;
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
new file mode 100644
index 000000000..885d8ac3c
--- /dev/null
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
@@ -0,0 +1,47 @@
+package dk.alexandra.fresco.lib.compare.gt;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+
+public class TruncateTests {
+
+  public static class TestTruncate<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    private final List<BigInteger> inputs;
+
+    public TestTruncate(BigInteger modulus) {
+      inputs = Arrays.asList(
+          BigInteger.ZERO,
+          BigInteger.ONE
+      );
+    }
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+            Numeric numeric = builder.numeric();
+            DRes<SInt> p1 = numeric.known(BigInteger.ONE);
+            return null;
+          };
+          List<BigInteger> actual = runApplication(app);
+        }
+      };
+    }
+
+  }
+
+}

From fb713567a391bde9e8891501fbc086010f517e78 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 13:00:49 +0200
Subject: [PATCH 023/231] Add known(list) default to numeric

---
 .../fresco/framework/builder/numeric/Numeric.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
index ecd008da3..c9794ec7a 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
@@ -4,6 +4,8 @@
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Basic interface for numeric applications. This is the interface which an arithmetic protocol
@@ -118,4 +120,16 @@ public interface Numeric extends ComputationDirectory {
    * @return The opened value if you are the outputParty, or null otherwise.
    */
   DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty);
+
+  /**
+   * Helper methods for inputting multiple known values at once.
+   */
+  default List<DRes<SInt>> known(List<BigInteger> values) {
+    List<DRes<SInt>> secret = new ArrayList<>(values.size());
+    for (BigInteger value : values) {
+      secret.add(known(value));
+    }
+    return secret;
+  }
+
 }

From 0e759d80c3e38c3d86b43c5c139d02b64973bc71 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 13:01:18 +0200
Subject: [PATCH 024/231] Update truncate description

---
 .../java/dk/alexandra/fresco/lib/compare/gt/Truncate.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
index a8753779d..0b2b46e17 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
@@ -8,9 +8,11 @@
 import java.math.BigInteger;
 
 /**
- * Given k-bit secret input a and value m < k masks k - m upper bits and right shifts result by m.
+ * Shifts m-th bit into least significant bit position and masks all other bits. <p>Given k-bit
+ * secret input a and value m < k masks k - m upper bits and right shifts result by m.</>
  */
 public class Truncate implements Computation<SInt, ProtocolBuilderNumeric> {
+  // TODO add reference to protocol description
 
   private final DRes<SInt> input;
   private final int m;
@@ -21,7 +23,7 @@ public class Truncate implements Computation<SInt, ProtocolBuilderNumeric> {
    * Constructs new {@link Truncate}.
    *
    * @param input input to be shifted
-   * @param m shift by
+   * @param m position of bit to extract
    * @param k bit length of input
    * @param kappa computational security parameter
    */

From 30d4a4f483af9ac1aa4f242cdf659d36004c0515 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 13:02:02 +0200
Subject: [PATCH 025/231] More work on truncate tests

---
 .../fresco/lib/compare/gt/TruncateTests.java  | 38 ++++++++++++++++---
 .../TestDummyArithmeticProtocolSuite.java     |  9 +++++
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
index 885d8ac3c..2384eadb8 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
@@ -9,21 +9,40 @@
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.Assert;
 
 public class TruncateTests {
 
   public static class TestTruncate<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
-    private final List<BigInteger> inputs;
+    private final List<BigInteger> openInputs;
+    private final List<BigInteger> expected;
 
-    public TestTruncate(BigInteger modulus) {
-      inputs = Arrays.asList(
+    public TestTruncate(BigInteger modulus, int m) {
+      this.openInputs = Arrays.asList(
           BigInteger.ZERO,
           BigInteger.ONE
       );
+      this.expected = computeExpected(openInputs, modulus, m);
+    }
+
+    public TestTruncate(BigInteger modulus) {
+      this(modulus, modulus.bitLength());
+    }
+
+    private static List<BigInteger> computeExpected(List<BigInteger> inputs, BigInteger modulus,
+        int m) {
+      List<BigInteger> expected = new ArrayList<>(inputs.size());
+      BigInteger twoToM = BigInteger.ONE.shiftLeft(m - 1);
+      for (BigInteger input : inputs) {
+        expected.add(input.mod(twoToM).shiftLeft(m));
+      }
+      return expected;
     }
 
     @Override
@@ -34,14 +53,21 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
             Numeric numeric = builder.numeric();
-            DRes<SInt> p1 = numeric.known(BigInteger.ONE);
-            return null;
+            int k = builder.getBasicNumericContext().getModulus().bitLength();
+            int kappa = 40;
+            List<DRes<SInt>> inputs = numeric.known(openInputs);
+            List<DRes<SInt>> actualInner = new ArrayList<>(inputs.size());
+            for (DRes<SInt> input : inputs) {
+              actualInner.add(builder.seq(new Truncate(input, k - 1, k, kappa)));
+            }
+            DRes<List<DRes<BigInteger>>> opened = builder.collections().openList(() -> actualInner);
+            return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
           };
           List<BigInteger> actual = runApplication(app);
+          Assert.assertEquals(expected, actual);
         }
       };
     }
-
   }
 
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index bc2d2b42b..93ac8ca8b 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -26,6 +26,7 @@
 import dk.alexandra.fresco.lib.compare.gt.CarryOutTests.TestCarryOut;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestCarryHelper;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestPreCarryBits;
+import dk.alexandra.fresco.lib.compare.gt.TruncateTests.TestTruncate;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelectTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapNeighborsTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapRowsTests;
@@ -837,4 +838,12 @@ public void testBitLessThanOpen() {
     runTest(new TestBitLessThanOpen<>(modulus, 128), parameters);
   }
 
+  @Test
+  public void testTruncate() {
+    BigInteger modulus = ModulusFinder.findSuitableModulus(128);
+    TestParameters parameters = new TestParameters().numParties(2)
+        .modulus(modulus);
+    runTest(new TestTruncate<>(modulus), parameters);
+  }
+
 }

From d38d19f7002b2fb5c1e14e8ec1f30a07d75172db Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 13:17:45 +0200
Subject: [PATCH 026/231] Correct shift in expected result

---
 .../dk/alexandra/fresco/lib/compare/gt/TruncateTests.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
index 2384eadb8..18c208341 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
@@ -22,6 +22,7 @@ public static class TestTruncate<ResourcePoolT extends ResourcePool>
 
     private final List<BigInteger> openInputs;
     private final List<BigInteger> expected;
+    private final int m;
 
     public TestTruncate(BigInteger modulus, int m) {
       this.openInputs = Arrays.asList(
@@ -29,10 +30,11 @@ public TestTruncate(BigInteger modulus, int m) {
           BigInteger.ONE
       );
       this.expected = computeExpected(openInputs, modulus, m);
+      this.m = m;
     }
 
     public TestTruncate(BigInteger modulus) {
-      this(modulus, modulus.bitLength());
+      this(modulus, modulus.bitLength() - 1);
     }
 
     private static List<BigInteger> computeExpected(List<BigInteger> inputs, BigInteger modulus,
@@ -40,7 +42,7 @@ private static List<BigInteger> computeExpected(List<BigInteger> inputs, BigInte
       List<BigInteger> expected = new ArrayList<>(inputs.size());
       BigInteger twoToM = BigInteger.ONE.shiftLeft(m - 1);
       for (BigInteger input : inputs) {
-        expected.add(input.mod(twoToM).shiftLeft(m));
+        expected.add(input.mod(twoToM).shiftRight(m));
       }
       return expected;
     }
@@ -58,7 +60,7 @@ public void test() {
             List<DRes<SInt>> inputs = numeric.known(openInputs);
             List<DRes<SInt>> actualInner = new ArrayList<>(inputs.size());
             for (DRes<SInt> input : inputs) {
-              actualInner.add(builder.seq(new Truncate(input, k - 1, k, kappa)));
+              actualInner.add(builder.seq(new Truncate(input, m, k, kappa)));
             }
             DRes<List<DRes<BigInteger>>> opened = builder.collections().openList(() -> actualInner);
             return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());

From 1684023311edb9a40bd09c2a6b3b7abc4363a2bc Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 13:39:44 +0200
Subject: [PATCH 027/231] Truncate -> LessThanZero

---
 .../gt/{Truncate.java => LessThanZero.java}   | 24 ++++++++---------
 ...ncateTests.java => LessThanZeroTests.java} | 27 ++++++++-----------
 .../TestDummyArithmeticProtocolSuite.java     |  6 ++---
 3 files changed, 25 insertions(+), 32 deletions(-)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/gt/{Truncate.java => LessThanZero.java} (54%)
 rename core/src/test/java/dk/alexandra/fresco/lib/compare/gt/{TruncateTests.java => LessThanZeroTests.java} (77%)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
similarity index 54%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
index 0b2b46e17..0e4a76905 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/Truncate.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
@@ -2,44 +2,42 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.math.integer.mod.DummyMod2m;
 import java.math.BigInteger;
 
 /**
- * Shifts m-th bit into least significant bit position and masks all other bits. <p>Given k-bit
- * secret input a and value m < k masks k - m upper bits and right shifts result by m.</>
+ * Given secret value a, computes a <? 0.
  */
-public class Truncate implements Computation<SInt, ProtocolBuilderNumeric> {
+public class LessThanZero implements Computation<SInt, ProtocolBuilderNumeric> {
   // TODO add reference to protocol description
 
   private final DRes<SInt> input;
-  private final int m;
   private final int k;
   private final int kappa;
 
   /**
-   * Constructs new {@link Truncate}.
+   * Constructs new {@link LessThanZero}.
    *
-   * @param input input to be shifted
-   * @param m position of bit to extract
+   * @param input input to compare to 0
    * @param k bit length of input
    * @param kappa computational security parameter
    */
-  public Truncate(DRes<SInt> input, int m, int k, int kappa) {
+  public LessThanZero(DRes<SInt> input, int k, int kappa) {
     this.input = input;
-    this.m = m;
     this.k = k;
     this.kappa = kappa;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> inputMod2m = builder.seq(new DummyMod2m(input, m, k, kappa));
-    DRes<SInt> difference = builder.numeric().sub(input, inputMod2m);
-    BigInteger twoToMinusM = builder.getBigIntegerHelper().invertPowerOfTwo(m);
-    return builder.numeric().mult(twoToMinusM, difference);
+    DRes<SInt> inputMod2m = builder.seq(new DummyMod2m(input, k - 1, k, kappa));
+    Numeric numeric = builder.numeric();
+    DRes<SInt> difference = numeric.sub(input, inputMod2m);
+    BigInteger twoToMinusM = builder.getBigIntegerHelper().invertPowerOfTwo(k - 1);
+    return numeric.sub(BigInteger.ZERO, numeric.mult(twoToMinusM, difference));
   }
 
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
similarity index 77%
rename from core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
rename to core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
index 18c208341..85ef966a2 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/TruncateTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
@@ -15,34 +15,28 @@
 import java.util.stream.Collectors;
 import org.junit.Assert;
 
-public class TruncateTests {
+public class LessThanZeroTests {
 
-  public static class TestTruncate<ResourcePoolT extends ResourcePool>
+  public static class TestLessThanZero<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
     private final List<BigInteger> openInputs;
     private final List<BigInteger> expected;
-    private final int m;
 
-    public TestTruncate(BigInteger modulus, int m) {
+    public TestLessThanZero(BigInteger modulus) {
       this.openInputs = Arrays.asList(
           BigInteger.ZERO,
-          BigInteger.ONE
+          BigInteger.ONE,
+          BigInteger.valueOf(-1)
       );
-      this.expected = computeExpected(openInputs, modulus, m);
-      this.m = m;
+      this.expected = computeExpected(openInputs, modulus);
     }
 
-    public TestTruncate(BigInteger modulus) {
-      this(modulus, modulus.bitLength() - 1);
-    }
-
-    private static List<BigInteger> computeExpected(List<BigInteger> inputs, BigInteger modulus,
-        int m) {
+    private static List<BigInteger> computeExpected(List<BigInteger> inputs, BigInteger modulus) {
       List<BigInteger> expected = new ArrayList<>(inputs.size());
-      BigInteger twoToM = BigInteger.ONE.shiftLeft(m - 1);
       for (BigInteger input : inputs) {
-        expected.add(input.mod(twoToM).shiftRight(m));
+        boolean lessThanZero = input.compareTo(BigInteger.ZERO) < 0;
+        expected.add(lessThanZero ? BigInteger.ONE : BigInteger.ZERO);
       }
       return expected;
     }
@@ -60,13 +54,14 @@ public void test() {
             List<DRes<SInt>> inputs = numeric.known(openInputs);
             List<DRes<SInt>> actualInner = new ArrayList<>(inputs.size());
             for (DRes<SInt> input : inputs) {
-              actualInner.add(builder.seq(new Truncate(input, m, k, kappa)));
+              actualInner.add(builder.seq(new LessThanZero(input, k, kappa)));
             }
             DRes<List<DRes<BigInteger>>> opened = builder.collections().openList(() -> actualInner);
             return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
           };
           List<BigInteger> actual = runApplication(app);
           Assert.assertEquals(expected, actual);
+          System.out.println(expected);
         }
       };
     }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 93ac8ca8b..4c96b7d8f 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -26,7 +26,7 @@
 import dk.alexandra.fresco.lib.compare.gt.CarryOutTests.TestCarryOut;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestCarryHelper;
 import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestPreCarryBits;
-import dk.alexandra.fresco.lib.compare.gt.TruncateTests.TestTruncate;
+import dk.alexandra.fresco.lib.compare.gt.LessThanZeroTests.TestLessThanZero;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelectTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapNeighborsTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapRowsTests;
@@ -839,11 +839,11 @@ public void testBitLessThanOpen() {
   }
 
   @Test
-  public void testTruncate() {
+  public void testLessThanZero() {
     BigInteger modulus = ModulusFinder.findSuitableModulus(128);
     TestParameters parameters = new TestParameters().numParties(2)
         .modulus(modulus);
-    runTest(new TestTruncate<>(modulus), parameters);
+    runTest(new TestLessThanZero<>(modulus), parameters);
   }
 
 }

From bcd91c8b8810caeb0fe46b30bbe75043df082afd Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 19 Apr 2018 14:15:19 +0200
Subject: [PATCH 028/231] Not working version of mod2m

---
 .../dk/alexandra/fresco/commitment/.gitignore |  1 +
 .../fresco/lib/math/integer/mod/Mod2m.java    | 54 +++++++++----------
 .../lib/math/integer/mod/Mod2mTests.java      | 49 ++++++++++++++---
 .../TestDummyArithmeticProtocolSuite.java     |  4 +-
 4 files changed, 73 insertions(+), 35 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/commitment/.gitignore

diff --git a/core/src/main/java/dk/alexandra/fresco/commitment/.gitignore b/core/src/main/java/dk/alexandra/fresco/commitment/.gitignore
new file mode 100644
index 000000000..4f2b47ed3
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/commitment/.gitignore
@@ -0,0 +1 @@
+/Commitment.java
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index e8f0f72a3..65037ad76 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -3,7 +3,8 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.IntStream;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
@@ -40,46 +41,43 @@ public Mod2m(DRes<SInt> input, int m, int k, int kappa) {
     this.kappa = kappa;
   }
 
+  private static DRes<List<DRes<SInt>>> getDeferedList(
+      ProtocolBuilderNumeric builder, List<DRes<SInt>> baseList, int amount) {
+    BigInteger two = new BigInteger("2");
+    return  builder.par(par -> {
+      List<DRes<SInt>> list = new ArrayList<>(amount);
+      for (int i = 0; i < amount; i++) {
+        list.add(par.numeric().mult(two.pow(i), baseList.get(i)));
+      }
+      return () -> list;
+    });
+  }
+
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     if (m >= k) {
-      return input; // TODO is that ok?
+      return input; // TODO is that ok? not semantically correct for negative numbers
     }
-    List<DRes<SInt>> randomBits = new ArrayList<DRes<SInt>>(k + kappa);
-    IntStream.range(0, k + kappa).forEach(i -> randomBits.add(builder.numeric()
-        .randomBit()));
     BigInteger two = new BigInteger("2");
-    DRes<List<DRes<SInt>>> rList = builder.par(par -> {
-      List<DRes<SInt>> list = new ArrayList<>(k + kappa);
-      for (int i = 0; i < k + kappa; i++) {
-        list.add(par.numeric().mult(two.pow(i), randomBits.get(i)));
-      }
-      return () -> list;
-    });
+    List<DRes<SInt>> randomBits = Stream.generate(() -> builder.numeric()
+        .randomBit()).limit(k + kappa).collect(Collectors.toList());
+    DRes<List<DRes<SInt>>> rList = getDeferedList(builder, randomBits, k
+        + kappa);
     DRes<SInt> r = builder.advancedNumeric().sum(rList);
 
-    DRes<List<DRes<SInt>>> rPrimeList = builder.par(par -> {
-      List<DRes<SInt>> list = new ArrayList<>(m);
-      for (int i = 0; i < m; i++) {
-        list.add(par.numeric().mult(two.pow(i), randomBits.get(i)));
-      }
-      return () -> list;
-    });
+    DRes<List<DRes<SInt>>> rPrimeList = getDeferedList(builder, randomBits, m);
     DRes<SInt> rPrime = builder.advancedNumeric().sum(rPrimeList);
 
-    DRes<SInt> temp1 = builder.numeric().add(input, r);
+    // Handle the case that we work with signed integers
+    DRes<SInt> temp = builder.numeric().add(input, r);
+    // DRes<SInt> temp1 = builder.numeric().add(input, r);
     DRes<BigInteger> c = builder.numeric().open(builder.numeric().add(two.pow(k
-        - 1), temp1));
+        - 1), temp));
     return builder.seq( seq -> {
       BigInteger cPrime = c.out().mod(two.pow(m));
       DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrime, rPrimeList));
-      DRes<SInt> temp2 = seq.numeric().mult(two.pow(m), u);
-      DRes<SInt> temp3 = seq.numeric().sub(cPrime, rPrime);
-      DRes<SInt> aPrime = seq.numeric().add(temp2, temp3);
-      // builder.numeric().known(randomBits.get(i).two.pow(i))
-      // randomBits.forEach(r -> {
-      // System.out.println(builder.numeric().open(r).out());
-      // });
+      DRes<SInt> aPrime = seq.numeric().add(seq.numeric().mult(two.pow(m), u),
+          seq.numeric().sub(cPrime, rPrime));
       return aPrime;
     });
 
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
index f03a926f5..7cf833bf0 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
@@ -6,8 +6,13 @@
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.Assert;
 
 public class Mod2mTests {
 
@@ -19,15 +24,47 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
 
+        private Pair<List<BigInteger>, List<BigInteger>> getExpecteds(int m, int k) {
+          BigInteger two = new BigInteger("2");
+          List<BigInteger> inputs = new ArrayList<>();
+          inputs.add(BigInteger.ONE);
+          inputs.add(two.pow(78));
+          inputs.add(two.pow(k - 2).add(new BigInteger("3")));
+          inputs.add(new BigInteger("3573894"));
+          inputs.add(new BigInteger("-1"));
+
+          List<BigInteger> outputs = new ArrayList<>();
+          outputs.add(BigInteger.ONE);
+          outputs.add(BigInteger.ZERO);
+          outputs.add(new BigInteger("3"));
+          outputs.add(new BigInteger("3573894"));
+          outputs.add(two.pow(m).subtract(new BigInteger("-1")));
+          return new Pair<List<BigInteger>, List<BigInteger>>(
+              inputs, outputs);
+        }
+
         @Override
         public void test() {
-          Application<SInt, ProtocolBuilderNumeric> app = builder -> {
-            // TODO implement
-            DRes<SInt> value = builder.numeric().known(BigInteger.ONE);
-            int m = 64;
-            return builder.seq(new Mod2m(value, m));
+          int m = 64;
+          int k = 128;
+          int kappa = 128;
+          Pair<List<BigInteger>, List<BigInteger>> expecteds = getExpecteds(
+              m, k);
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+            // Make input list into list of differed, known, shared integers
+            List<DRes<SInt>> inputs = expecteds.getFirst().stream().map(
+                input -> builder.numeric().known(
+                input)).collect(Collectors.toList());
+            // Apply mod2m to each of the inputs, open the result
+            List<DRes<BigInteger>> results = inputs.stream().map(
+                input -> builder.numeric().open(builder.seq(
+                new Mod2m(input, m, k, kappa)))).collect(Collectors.toList());
+            return () -> results.stream().map(DRes::out).collect(Collectors
+                .toList());
           };
-          DRes<SInt> result = runApplication(app);
+          List<BigInteger> actuals = runApplication(app);
+          Assert.assertArrayEquals(expecteds.getSecond().toArray(), actuals
+              .toArray());
         }
       };
     }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index bc2d2b42b..9d51d26e6 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -790,7 +790,9 @@ public void testArithmeticXorKnownRight() {
 
   @Test
   public void testMod2mBaseCase() {
-    runTest(new TestMod2mBaseCase<>(), new TestParameters());
+    TestParameters params = new TestParameters();
+    params.modulus(ModulusFinder.findSuitableModulus(128));
+    runTest(new TestMod2mBaseCase<>(), params);
   }
 
   @Test

From 0a45a71aece2d035c3af2a98160517a18623bcf0 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 14:20:05 +0200
Subject: [PATCH 029/231] Fixed carry test expected

---
 .../fresco/lib/compare/gt/LessThanZeroTests.java         | 9 ++++++---
 .../alexandra/fresco/lib/compare/gt/PreCarryTests.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
index 85ef966a2..afa6ca5d4 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
@@ -27,12 +27,15 @@ public TestLessThanZero(BigInteger modulus) {
       this.openInputs = Arrays.asList(
           BigInteger.ZERO,
           BigInteger.ONE,
-          BigInteger.valueOf(-1)
+          BigInteger.valueOf(-1),
+          BigInteger.valueOf(-111111),
+          BigInteger.valueOf(-123123),
+          modulus
       );
-      this.expected = computeExpected(openInputs, modulus);
+      this.expected = computeExpected(openInputs);
     }
 
-    private static List<BigInteger> computeExpected(List<BigInteger> inputs, BigInteger modulus) {
+    private static List<BigInteger> computeExpected(List<BigInteger> inputs) {
       List<BigInteger> expected = new ArrayList<>(inputs.size());
       for (BigInteger input : inputs) {
         boolean lessThanZero = input.compareTo(BigInteger.ZERO) < 0;
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
index c9186f312..ba6f4335f 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
@@ -44,7 +44,7 @@ public void test() {
             });
           };
           Pair<BigInteger, BigInteger> expected = new Pair<>(
-              BigInteger.ONE, // p1 * p2
+              BigInteger.ZERO, // p1 * p2
               BigInteger.ONE  // g2 + (p1 * g1)
           );
           Pair<BigInteger, BigInteger> actual = runApplication(app);

From 30787cee287e1bfc234d4b0e00dbbe5b08acc8cd Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 15:56:41 +0200
Subject: [PATCH 030/231] Use correct random bits in mod2m

---
 .../dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java   | 5 ++---
 .../alexandra/fresco/lib/math/integer/mod/Mod2mTests.java | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index 65037ad76..fc5f1f725 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -75,10 +75,9 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
         - 1), temp));
     return builder.seq( seq -> {
       BigInteger cPrime = c.out().mod(two.pow(m));
-      DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrime, rPrimeList));
-      DRes<SInt> aPrime = seq.numeric().add(seq.numeric().mult(two.pow(m), u),
+      DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrime, () -> randomBits.subList(0, m)));
+      return seq.numeric().add(seq.numeric().mult(two.pow(m), u),
           seq.numeric().sub(cPrime, rPrime));
-      return aPrime;
     });
 
   }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
index 7cf833bf0..50553e3f6 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
@@ -38,16 +38,16 @@ private Pair<List<BigInteger>, List<BigInteger>> getExpecteds(int m, int k) {
           outputs.add(BigInteger.ZERO);
           outputs.add(new BigInteger("3"));
           outputs.add(new BigInteger("3573894"));
-          outputs.add(two.pow(m).subtract(new BigInteger("-1")));
+          outputs.add(two.pow(m).add(new BigInteger("-1")));
           return new Pair<List<BigInteger>, List<BigInteger>>(
               inputs, outputs);
         }
 
         @Override
         public void test() {
-          int m = 64;
-          int k = 128;
-          int kappa = 128;
+          int m = 32;
+          int k = 64;
+          int kappa = 40;
           Pair<List<BigInteger>, List<BigInteger>> expecteds = getExpecteds(
               m, k);
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {

From 96300ef377f57023f933b72cb057e5318d6f67b5 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 16:52:05 +0200
Subject: [PATCH 031/231] Fix less than zero protocol

---
 .../lib/compare/MiscBigIntegerGenerators.java       |  2 +-
 .../fresco/lib/compare/gt/CarryHelper.java          |  6 ++++++
 .../fresco/lib/compare/gt/LessThanZero.java         |  4 ++--
 .../fresco/lib/compare/gt/PreCarryBits.java         | 10 +++++++---
 .../fresco/lib/compare/gt/BitLessThanOpenTests.java |  2 ++
 .../fresco/lib/compare/gt/LessThanZeroTests.java    |  3 +--
 .../TestDummyArithmeticProtocolSuite.java           | 13 ++++++-------
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java
index bd4a23e3a..428291e40 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/MiscBigIntegerGenerators.java
@@ -33,7 +33,7 @@ public BigInteger invertPowerOfTwo(int exponent) {
     if (!invertedPowersOfTwo.containsKey(exponent)) {
       invertedPowersOfTwo.put(
           exponent,
-          BigInteger.ONE.shiftLeft(exponent - 1).modInverse(modulus));
+          BigInteger.ONE.shiftLeft(exponent).modInverse(modulus));
     }
     return invertedPowersOfTwo.get(exponent);
   }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
index c3f7a47db..844208bfd 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
@@ -23,6 +23,12 @@ public CarryHelper(DRes<SIntPair> leftBitPair, DRes<SIntPair> rightBitPair) {
 
   @Override
   public DRes<SIntPair> buildComputation(ProtocolBuilderNumeric builder) {
+    if (leftBitPair == null) {
+      return rightBitPair;
+    }
+    if (rightBitPair == null) {
+      return leftBitPair;
+    }
     SIntPair left = leftBitPair.out();
     SIntPair right = rightBitPair.out();
     DRes<SInt> p1 = left.getFirst();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
index 0e4a76905..5b8fae660 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
@@ -5,7 +5,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.math.integer.mod.DummyMod2m;
+import dk.alexandra.fresco.lib.math.integer.mod.Mod2m;
 import java.math.BigInteger;
 
 /**
@@ -33,7 +33,7 @@ public LessThanZero(DRes<SInt> input, int k, int kappa) {
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> inputMod2m = builder.seq(new DummyMod2m(input, k - 1, k, kappa));
+    DRes<SInt> inputMod2m = builder.seq(new Mod2m(input, k - 1, k, kappa));
     Numeric numeric = builder.numeric();
     DRes<SInt> difference = numeric.sub(input, inputMod2m);
     BigInteger twoToMinusM = builder.getBigIntegerHelper().invertPowerOfTwo(k - 1);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
index 03381547f..1e581a311 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
@@ -19,17 +19,21 @@ public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    // TODO enforce that input size is power of 2?
     List<DRes<SIntPair>> pairs = pairsDef.out();
     // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
     Collections.reverse(pairs);
     int k = pairs.size();
+    if (k % 2 != 0 && k != 1) {
+      pairs.add(null);
+      k++;
+    }
+    int finalK = k;
     if (k == 1) {
       return pairs.get(0).out().getSecond();
     } else {
       DRes<List<DRes<SIntPair>>> nextRound = builder.par(par -> {
-        List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(k / 2);
-        for (int i = 0; i < k / 2; i++) {
+        List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(finalK / 2);
+        for (int i = 0; i < finalK / 2; i++) {
           DRes<SIntPair> left = pairs.get(2 * i + 1);
           DRes<SIntPair> right = pairs.get(2 * i);
           nextRoundInner.add(par.seq(new CarryHelper(left, right)));
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
index 8481bac11..0b7932d1b 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
@@ -38,6 +38,7 @@ public TestBitLessThanOpen(BigInteger modulus, int numBits) {
           BigInteger.valueOf(111),
           modulus.subtract(BigInteger.ONE),
           modulus.subtract(BigInteger.ONE),
+          BigInteger.valueOf(2055014152),
           new BigInteger(numBits, random).mod(modulus)
       );
       this.right = Arrays.asList(
@@ -49,6 +50,7 @@ public TestBitLessThanOpen(BigInteger modulus, int numBits) {
           BigInteger.valueOf(112),
           modulus.subtract(BigInteger.ONE),
           modulus.subtract(BigInteger.valueOf(2)),
+          BigInteger.valueOf(2055014153),
           new BigInteger(numBits, random).mod(modulus)
       );
     }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
index afa6ca5d4..a781ee989 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
@@ -52,12 +52,11 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
             Numeric numeric = builder.numeric();
-            int k = builder.getBasicNumericContext().getModulus().bitLength();
             int kappa = 40;
             List<DRes<SInt>> inputs = numeric.known(openInputs);
             List<DRes<SInt>> actualInner = new ArrayList<>(inputs.size());
             for (DRes<SInt> input : inputs) {
-              actualInner.add(builder.seq(new LessThanZero(input, k, kappa)));
+              actualInner.add(builder.seq(new LessThanZero(input, 64, kappa)));
             }
             DRes<List<DRes<BigInteger>>> opened = builder.collections().openList(() -> actualInner);
             return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 2ea0c9388..7852b5bcd 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -791,8 +791,9 @@ public void testArithmeticXorKnownRight() {
 
   @Test
   public void testMod2mBaseCase() {
-    TestParameters params = new TestParameters();
-    params.modulus(ModulusFinder.findSuitableModulus(128));
+    TestParameters params = new TestParameters()
+        .modulus(ModulusFinder.findSuitableModulus(128))
+        .numParties(2);
     runTest(new TestMod2mBaseCase<>(), params);
   }
 
@@ -835,16 +836,14 @@ public void testCarryOutRandom() {
   @Test
   public void testBitLessThanOpen() {
     BigInteger modulus = ModulusFinder.findSuitableModulus(128);
-    TestParameters parameters = new TestParameters().numParties(2)
-        .modulus(modulus);
-    runTest(new TestBitLessThanOpen<>(modulus, 128), parameters);
+    TestParameters parameters = new TestParameters().numParties(2).modulus(modulus);
+    runTest(new TestBitLessThanOpen<>(modulus, 64), parameters);
   }
 
   @Test
   public void testLessThanZero() {
     BigInteger modulus = ModulusFinder.findSuitableModulus(128);
-    TestParameters parameters = new TestParameters().numParties(2)
-        .modulus(modulus);
+    TestParameters parameters = new TestParameters().numParties(2).modulus(modulus);
     runTest(new TestLessThanZero<>(modulus), parameters);
   }
 

From a975a837030519612deee1d22a695913274bbf03 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 19 Apr 2018 16:54:43 +0200
Subject: [PATCH 032/231] Added more mod2m tests

---
 .../fresco/lib/math/integer/mod/Mod2mTests.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
index 50553e3f6..3c61a6233 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
@@ -28,10 +28,15 @@ private Pair<List<BigInteger>, List<BigInteger>> getExpecteds(int m, int k) {
           BigInteger two = new BigInteger("2");
           List<BigInteger> inputs = new ArrayList<>();
           inputs.add(BigInteger.ONE);
-          inputs.add(two.pow(78));
+          inputs.add(two.pow(m + 3));
           inputs.add(two.pow(k - 2).add(new BigInteger("3")));
           inputs.add(new BigInteger("3573894"));
           inputs.add(new BigInteger("-1"));
+          inputs.add(two.pow(m).subtract(BigInteger.ONE).multiply(
+              new BigInteger("-1")));
+          inputs.add(two.pow(m + 4).multiply(new BigInteger("-1")));
+          inputs.add(two.pow(m + 5).add(new BigInteger("23493892").multiply(
+              new BigInteger("-1"))));
 
           List<BigInteger> outputs = new ArrayList<>();
           outputs.add(BigInteger.ONE);
@@ -39,6 +44,9 @@ private Pair<List<BigInteger>, List<BigInteger>> getExpecteds(int m, int k) {
           outputs.add(new BigInteger("3"));
           outputs.add(new BigInteger("3573894"));
           outputs.add(two.pow(m).add(new BigInteger("-1")));
+          outputs.add(BigInteger.ONE);
+          outputs.add(BigInteger.ZERO);
+          outputs.add(two.pow(m).subtract(new BigInteger("23493892")));
           return new Pair<List<BigInteger>, List<BigInteger>>(
               inputs, outputs);
         }

From d07cc45f26383ad9d004419718ee21e929f7449e Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 19 Apr 2018 17:12:49 +0200
Subject: [PATCH 033/231] Added a few more mod2m tests

---
 .../alexandra/fresco/lib/math/integer/mod/Mod2m.java |  4 +---
 .../fresco/lib/math/integer/mod/Mod2mTests.java      | 12 +++++++-----
 .../arithmetic/TestDummyArithmeticProtocolSuite.java |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index fc5f1f725..1531cefe6 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -56,7 +56,7 @@ private static DRes<List<DRes<SInt>>> getDeferedList(
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     if (m >= k) {
-      return input; // TODO is that ok? not semantically correct for negative numbers
+      return input;
     }
     BigInteger two = new BigInteger("2");
     List<DRes<SInt>> randomBits = Stream.generate(() -> builder.numeric()
@@ -68,9 +68,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<List<DRes<SInt>>> rPrimeList = getDeferedList(builder, randomBits, m);
     DRes<SInt> rPrime = builder.advancedNumeric().sum(rPrimeList);
 
-    // Handle the case that we work with signed integers
     DRes<SInt> temp = builder.numeric().add(input, r);
-    // DRes<SInt> temp1 = builder.numeric().add(input, r);
     DRes<BigInteger> c = builder.numeric().open(builder.numeric().add(two.pow(k
         - 1), temp));
     return builder.seq( seq -> {
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
index 3c61a6233..81ee37333 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2mTests.java
@@ -51,11 +51,7 @@ private Pair<List<BigInteger>, List<BigInteger>> getExpecteds(int m, int k) {
               inputs, outputs);
         }
 
-        @Override
-        public void test() {
-          int m = 32;
-          int k = 64;
-          int kappa = 40;
+        private void runTest(int m, int k, int kappa) {
           Pair<List<BigInteger>, List<BigInteger>> expecteds = getExpecteds(
               m, k);
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
@@ -74,6 +70,12 @@ public void test() {
           Assert.assertArrayEquals(expecteds.getSecond().toArray(), actuals
               .toArray());
         }
+
+        @Override
+        public void test() {
+          runTest(32, 64, 40);
+          runTest(64, 128, 80);
+        }
       };
     }
   }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 7852b5bcd..fbe74c6ef 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -792,7 +792,7 @@ public void testArithmeticXorKnownRight() {
   @Test
   public void testMod2mBaseCase() {
     TestParameters params = new TestParameters()
-        .modulus(ModulusFinder.findSuitableModulus(128))
+        .modulus(ModulusFinder.findSuitableModulus(256))
         .numParties(2);
     runTest(new TestMod2mBaseCase<>(), params);
   }

From 9daf8525698e64fb95dcb7e0b1efdfb2698892b7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 17:30:36 +0200
Subject: [PATCH 034/231] Clean up pre carry and fix test

---
 .../fresco/lib/compare/gt/PreCarryBits.java   | 23 +++++++++++--------
 .../fresco/lib/compare/gt/PreCarryTests.java  |  3 +--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
index 1e581a311..10f624abb 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
@@ -22,18 +22,13 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SIntPair>> pairs = pairsDef.out();
     // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
     Collections.reverse(pairs);
-    int k = pairs.size();
-    if (k % 2 != 0 && k != 1) {
-      pairs.add(null);
-      k++;
-    }
-    int finalK = k;
-    if (k == 1) {
+    padIfUneven(pairs);
+    if (pairs.size() == 1) {
       return pairs.get(0).out().getSecond();
     } else {
       DRes<List<DRes<SIntPair>>> nextRound = builder.par(par -> {
-        List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(finalK / 2);
-        for (int i = 0; i < finalK / 2; i++) {
+        List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(pairs.size() / 2);
+        for (int i = 0; i < pairs.size() / 2; i++) {
           DRes<SIntPair> left = pairs.get(2 * i + 1);
           DRes<SIntPair> right = pairs.get(2 * i);
           nextRoundInner.add(par.seq(new CarryHelper(left, right)));
@@ -45,4 +40,14 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     }
   }
 
+  /**
+   * Pad with dummy null element if number of pairs is uneven.
+   */
+  private void padIfUneven(List<DRes<SIntPair>> pairs) {
+    int size = pairs.size();
+    if (size % 2 != 0 && size != 1) {
+      pairs.add(null);
+    }
+  }
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
index ba6f4335f..38067aca6 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
@@ -78,9 +78,8 @@ public void test() {
             DRes<SInt> carried = builder.seq(new PreCarryBits(() -> pairs));
             return builder.numeric().open(carried);
           };
-          // TODO implement real test
           BigInteger actual = runApplication(app);
-          Assert.assertEquals(BigInteger.ZERO, actual);
+          Assert.assertEquals(BigInteger.ONE, actual);
         }
       };
     }

From 27e6712dc5d79dac3c0dab014f82520e2ebf5a5d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 19 Apr 2018 17:31:23 +0200
Subject: [PATCH 035/231] Remove dummy mod2m protocol

---
 .../lib/math/integer/mod/DummyMod2m.java      | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java
deleted file mode 100644
index 5dcd060e7..000000000
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/DummyMod2m.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package dk.alexandra.fresco.lib.math.integer.mod;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.SInt;
-import java.math.BigInteger;
-
-@Deprecated
-public class DummyMod2m implements Computation<SInt, ProtocolBuilderNumeric> {
-
-  private final DRes<SInt> input;
-  private final int m;
-  private final int k;
-  private final int kappa;
-
-  /**
-   * Constructs new {@link Mod2m}.
-   *
-   * @param input
-   *          value to reduce
-   * @param m
-   *          exponent (2^{m})
-   * @param k
-   *          bitlength of the input
-   * @param kappa
-   *          Computational security parameter
-   */
-  public DummyMod2m(DRes<SInt> input, int m, int k, int kappa) {
-    this.input = input;
-    this.m = m;
-    this.k = k;
-    this.kappa = kappa;
-  }
-
-  @Override
-  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<BigInteger> openInputDef = builder.numeric().open(input);
-    return builder.seq(seq -> {
-      BigInteger openInput = openInputDef.out();
-      BigInteger twoToM = BigInteger.ONE.shiftLeft(m - 1);
-      return seq.numeric().input(openInput.mod(twoToM), 1);
-    });
-  }
-
-}

From e7e3bfe883a12df6a6cbce95d87ef045a05bfd5b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 20 Apr 2018 13:12:15 +0200
Subject: [PATCH 036/231] Less than protocol

---
 .../framework/builder/numeric/Comparison.java | 45 +++++++++---
 .../builder/numeric/DefaultComparison.java    | 16 ++++-
 .../compare/{gt => lt}/BitLessThanOpen.java   |  2 +-
 .../lib/compare/{gt => lt}/CarryHelper.java   |  2 +-
 .../lib/compare/{gt => lt}/CarryOut.java      |  2 +-
 .../lib/compare/lt/LessThanLogRounds.java     | 31 ++++++++
 .../compare/{gt => lt}/LessThanOrEquals.java  |  2 +-
 .../lib/compare/{gt => lt}/LessThanZero.java  |  2 +-
 .../lib/compare/{gt => lt}/PreCarryBits.java  |  2 +-
 .../fresco/lib/math/integer/mod/Mod2m.java    |  2 +-
 .../arithmetic/ComparisonLoggerDecorator.java |  9 +++
 .../fresco/lib/compare/CompareTests.java      | 70 +++++++++++++++++++
 .../{gt => lt}/BitLessThanOpenTests.java      |  2 +-
 .../lib/compare/{gt => lt}/CarryOutTests.java |  2 +-
 .../compare/{gt => lt}/LessThanZeroTests.java |  3 +-
 .../lib/compare/{gt => lt}/PreCarryTests.java |  2 +-
 .../TestDummyArithmeticProtocolSuite.java     | 22 ++++--
 17 files changed, 189 insertions(+), 27 deletions(-)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/{gt => lt}/BitLessThanOpen.java (97%)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/{gt => lt}/CarryHelper.java (97%)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/{gt => lt}/CarryOut.java (98%)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/{gt => lt}/LessThanOrEquals.java (99%)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/{gt => lt}/LessThanZero.java (96%)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/{gt => lt}/PreCarryBits.java (97%)
 rename core/src/test/java/dk/alexandra/fresco/lib/compare/{gt => lt}/BitLessThanOpenTests.java (98%)
 rename core/src/test/java/dk/alexandra/fresco/lib/compare/{gt => lt}/CarryOutTests.java (98%)
 rename core/src/test/java/dk/alexandra/fresco/lib/compare/{gt => lt}/LessThanZeroTests.java (96%)
 rename core/src/test/java/dk/alexandra/fresco/lib/compare/{gt => lt}/PreCarryTests.java (98%)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 452ed3df5..4fc037309 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -9,15 +9,24 @@
  */
 public interface Comparison extends ComputationDirectory {
 
+  /**
+   * The different algorithms supported by Fresco.
+   */
+  enum ComparisonAlgorithm {
+    LT_LOG_ROUNDS,
+    LT_CONST_ROUNDS
+  }
+
   /**
    * Compares two values and return x == y
-   * @param bitLength The maximum bit-length of the numbers to compare. 
+   *
+   * @param bitLength The maximum bit-length of the numbers to compare.
    * @param x The first number
    * @param y The second number
    * @return A deferred result computing x == y
    */
   DRes<SInt> equals(int bitLength, DRes<SInt> x, DRes<SInt> y);
-  
+
   /**
    * Computes x == y.
    *
@@ -26,9 +35,10 @@ public interface Comparison extends ComputationDirectory {
    * @return A deferred result computing x == y. Result will be either [1] (true) or [0] (false).
    */
   DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y);
-  
+
   /**
    * Computes if x1 <= x2.
+   *
    * @param x1 input
    * @param x2 input
    * @return A deferred result computing x1 <= x2. Result will be either [1] (true) or [0] (false).
@@ -36,10 +46,27 @@ public interface Comparison extends ComputationDirectory {
   DRes<SInt> compareLEQ(DRes<SInt> x1, DRes<SInt> x2);
 
   /**
-   * Compares if x1 <= x2, but with twice the possible bit-length.
-   * Requires that the maximum bit length is set to something that can handle
-   * this scenario. It has to be at least less than half the modulus bit size.
-   * 
+   * Computes if x1 < x2.
+   *
+   * @param x1 input
+   * @param x2 input
+   * @param algorithm the comparison algorithm to use
+   * @return A deferred result computing x1 <= x2. Result will be either [1] (true) or [0] (false).
+   */
+  DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm);
+
+  /**
+   * Call to {@link #compareLT(DRes, DRes, ComparisonAlgorithm)} with default comparison algorithm.
+   */
+  default DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2) {
+    return compareLT(x1, x2, ComparisonAlgorithm.LT_LOG_ROUNDS);
+  }
+
+  /**
+   * Compares if x1 <= x2, but with twice the possible bit-length. Requires that the maximum bit
+   * length is set to something that can handle this scenario. It has to be at least less than half
+   * the modulus bit size.
+   *
    * @param x1 input
    * @param x2 input
    * @return A deferred result computing x1 <= x2. Result will be either [1] (true) or [0] (false).
@@ -48,10 +75,10 @@ public interface Comparison extends ComputationDirectory {
 
   /**
    * Computes the sign of the value (positive or negative)
-   * 
+   *
    * @param x The value to compute the sign off
    * @return A deferred result computing the sign. Result will be 1 if the value is positive
-   *         (including 0) and -1 if negative.
+   * (including 0) and -1 if negative.
    */
   DRes<SInt> sign(DRes<SInt> x);
 
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 7f84b44c1..99296ecff 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -3,7 +3,8 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.eq.Equality;
-import dk.alexandra.fresco.lib.compare.gt.LessThanOrEquals;
+import dk.alexandra.fresco.lib.compare.lt.LessThanLogRounds;
+import dk.alexandra.fresco.lib.compare.lt.LessThanOrEquals;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTest;
 import java.math.BigInteger;
 
@@ -52,6 +53,19 @@ public DRes<SInt> compareLEQ(DRes<SInt> x, DRes<SInt> y) {
         new LessThanOrEquals(bitLength, magicSecureNumber, x, y));
   }
 
+  @Override
+  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm) {
+    if (algorithm == ComparisonAlgorithm.LT_LOG_ROUNDS) {
+      int k = builder.getBasicNumericContext().getMaxBitLength();
+      // TODO this belongs somewhere else
+      int kappa = 40;
+      // TODO throw if k + kappa > mod bit length
+      return builder.seq(new LessThanLogRounds(x1, x2, k, kappa));
+    } else {
+      throw new UnsupportedOperationException("Not implemented yet");
+    }
+  }
+
   @Override
   public DRes<SInt> sign(DRes<SInt> x) {
     Numeric input = builder.numeric();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
similarity index 97%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index a86874a0f..0280802b7 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
similarity index 97%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
index 844208bfd..3f4e9e122 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryHelper.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
similarity index 98%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 869dbe8e3..d417507c7 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
new file mode 100644
index 000000000..0d85e6003
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
@@ -0,0 +1,31 @@
+package dk.alexandra.fresco.lib.compare.lt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+
+/**
+ * Given two secret values a and b computes a < b. <p></p>
+ */
+public class LessThanLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<SInt> left;
+  private final DRes<SInt> right;
+  private final int k;
+  private final int kappa;
+
+  public LessThanLogRounds(DRes<SInt> left, DRes<SInt> right, int k, int kappa) {
+    this.left = left;
+    this.right = right;
+    this.k = k;
+    this.kappa = kappa;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    DRes<SInt> difference = builder.numeric().sub(left, right);
+    return builder.seq(new LessThanZero(difference, k, kappa));
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanOrEquals.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
similarity index 99%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanOrEquals.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
index 724d8f4ed..35b1fe1d3 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanOrEquals.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanZero.java
similarity index 96%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanZero.java
index 5b8fae660..92aa2c36e 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/LessThanZero.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanZero.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
similarity index 97%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 10f624abb..2609637a1 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/gt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index 1531cefe6..4746e14c5 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -10,7 +10,7 @@
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.compare.gt.BitLessThanOpen;
+import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
 
 /**
  * Computes modular reduction of value mod 2^m.
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 1e41034d8..190314123 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -17,6 +17,7 @@ public class ComparisonLoggerDecorator implements Comparison, PerformanceLogger
   private Comparison delegate;
   private long eqCount;
   private long leqCount;
+  private long ltCount;
   private long signCount;
   private long comp0Count;
   
@@ -43,6 +44,12 @@ public DRes<SInt> compareLEQ(DRes<SInt> x1, DRes<SInt> x2) {
     return this.delegate.compareLEQ(x1, x2);
   }
 
+  @Override
+  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm) {
+    ltCount++;
+    return this.delegate.compareLT(x1, x2, algorithm);
+  }
+
   @Override
   public DRes<SInt> compareLEQLong(DRes<SInt> x1, DRes<SInt> x2) {
     leqCount++;
@@ -65,12 +72,14 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitLength) {
   public void reset() {
     eqCount = 0;
     leqCount = 0;
+    ltCount = 0;
     signCount = 0;
     comp0Count = 0;
   }
 
   @Override
   public Map<String, Long> getLoggedValues() {
+    // TODO add ltCount
     Map<String, Long> values = new HashMap<>();
     values.put(ARITHMETIC_COMPARISON_EQ, this.eqCount);
     values.put(ARITHMETIC_COMPARISON_LEQ, this.leqCount);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index 3fb9a399d..aa7292118 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -6,6 +6,7 @@
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
 import dk.alexandra.fresco.framework.builder.binary.ProtocolBuilderBinary;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.builder.numeric.Comparison.ComparisonAlgorithm;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
@@ -272,4 +273,73 @@ public void test() throws Exception {
     }
   }
 
+  public static class TestLessThanLogRounds<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    private final List<BigInteger> openLeft;
+    private final List<BigInteger> openRight;
+    private final List<BigInteger> expected;
+
+    public TestLessThanLogRounds(BigInteger modulus, int maxBitLength) {
+      BigInteger two = BigInteger.valueOf(2);
+      this.openLeft = Arrays.asList(
+          BigInteger.ZERO,
+          BigInteger.ONE,
+          BigInteger.valueOf(-1),
+          BigInteger.valueOf(-111111),
+          BigInteger.valueOf(-111),
+          BigInteger.ONE,
+          modulus,
+          two.pow(maxBitLength).subtract(BigInteger.ONE),
+          two.pow(maxBitLength).subtract(two)
+      );
+      this.openRight = Arrays.asList(
+          BigInteger.ZERO,
+          BigInteger.ONE,
+          BigInteger.valueOf(-1),
+          BigInteger.valueOf(-111112),
+          BigInteger.valueOf(-110),
+          BigInteger.valueOf(5),
+          modulus,
+          two.pow(maxBitLength).subtract(two),
+          two.pow(maxBitLength).subtract(BigInteger.ONE)
+      );
+      this.expected = computeExpected(openLeft, openRight);
+    }
+
+    private static List<BigInteger> computeExpected(List<BigInteger> openLeft,
+        List<BigInteger> openRight) {
+      List<BigInteger> expected = new ArrayList<>(openLeft.size());
+      for (int i = 0; i < openLeft.size(); i++) {
+        boolean lessThan = openLeft.get(i).compareTo(openRight.get(i)) < 0;
+        expected.add(lessThan ? BigInteger.ONE : BigInteger.ZERO);
+      }
+      return expected;
+    }
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+            Numeric numeric = builder.numeric();
+            List<DRes<SInt>> left = numeric.known(openLeft);
+            List<DRes<SInt>> right = numeric.known(openRight);
+            List<DRes<SInt>> actualInner = new ArrayList<>(left.size());
+            for (int i = 0; i < left.size(); i++) {
+              actualInner.add(builder.comparison().compareLT(left.get(i), right.get(i),
+                  ComparisonAlgorithm.LT_LOG_ROUNDS));
+            }
+            DRes<List<DRes<BigInteger>>> opened = builder.collections().openList(() -> actualInner);
+            return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigInteger> actual = runApplication(app);
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
similarity index 98%
rename from core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
rename to core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
index 0b7932d1b..6eb63e53a 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/BitLessThanOpenTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.Application;
 import dk.alexandra.fresco.framework.DRes;
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
similarity index 98%
rename from core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
rename to core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
index 63610ef3b..f68596a22 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.Application;
 import dk.alexandra.fresco.framework.DRes;
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/LessThanZeroTests.java
similarity index 96%
rename from core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
rename to core/src/test/java/dk/alexandra/fresco/lib/compare/lt/LessThanZeroTests.java
index a781ee989..f298b2634 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/LessThanZeroTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/LessThanZeroTests.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.Application;
 import dk.alexandra.fresco.framework.DRes;
@@ -63,7 +63,6 @@ public void test() {
           };
           List<BigInteger> actual = runApplication(app);
           Assert.assertEquals(expected, actual);
-          System.out.println(expected);
         }
       };
     }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
similarity index 98%
rename from core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
rename to core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
index 38067aca6..364b765c8 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/gt/PreCarryTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.lib.compare.gt;
+package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.Application;
 import dk.alexandra.fresco.framework.DRes;
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index fbe74c6ef..8cbf8df29 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -22,11 +22,12 @@
 import dk.alexandra.fresco.lib.collections.relational.LeakyAggregationTests;
 import dk.alexandra.fresco.lib.collections.shuffle.ShuffleRowsTests;
 import dk.alexandra.fresco.lib.compare.CompareTests;
-import dk.alexandra.fresco.lib.compare.gt.BitLessThanOpenTests.TestBitLessThanOpen;
-import dk.alexandra.fresco.lib.compare.gt.CarryOutTests.TestCarryOut;
-import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestCarryHelper;
-import dk.alexandra.fresco.lib.compare.gt.PreCarryTests.TestPreCarryBits;
-import dk.alexandra.fresco.lib.compare.gt.LessThanZeroTests.TestLessThanZero;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
+import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
+import dk.alexandra.fresco.lib.compare.lt.CarryOutTests.TestCarryOut;
+import dk.alexandra.fresco.lib.compare.lt.LessThanZeroTests.TestLessThanZero;
+import dk.alexandra.fresco.lib.compare.lt.PreCarryTests.TestCarryHelper;
+import dk.alexandra.fresco.lib.compare.lt.PreCarryTests.TestPreCarryBits;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelectTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapNeighborsTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapRowsTests;
@@ -847,4 +848,15 @@ public void testLessThanZero() {
     runTest(new TestLessThanZero<>(modulus), parameters);
   }
 
+  @Test
+  public void testLessThanLogRounds() {
+    BigInteger modulus = ModulusFinder.findSuitableModulus(128);
+    int maxBitLength = 64;
+    TestParameters parameters = new TestParameters()
+        .numParties(2)
+        .modulus(modulus)
+        .maxBitLength(maxBitLength);
+    runTest(new TestLessThanLogRounds<>(modulus, maxBitLength), parameters);
+  }
+
 }

From 7d9f9ca2a165c9797d49bc6287131cddadced8bc Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 20 Apr 2018 13:17:45 +0200
Subject: [PATCH 037/231] Add less than test to spdz suite

---
 .../fresco/suite/spdz/TestSpdzComparison.java | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
index 8278fd1e3..e7bc6aa33 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
@@ -3,10 +3,13 @@
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.sce.resources.storage.FilebasedStreamedStorageImpl;
 import dk.alexandra.fresco.framework.sce.resources.storage.InMemoryStorage;
+import dk.alexandra.fresco.framework.util.ModulusFinder;
 import dk.alexandra.fresco.lib.compare.CompareTests;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.list.EliminateDuplicatesTests.TestFindDuplicatesOne;
 import dk.alexandra.fresco.suite.spdz.configuration.PreprocessingStrategy;
 import dk.alexandra.fresco.suite.spdz.storage.InitializeStorage;
+import java.math.BigInteger;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -63,19 +66,29 @@ public void test_find_duplicates() {
   @Test
   public void testCompareLTBatchedMascot() {
     runTest(new CompareTests.TestCompareLT<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
-        PreprocessingStrategy.MASCOT, 2, 64,2, 1);
+        PreprocessingStrategy.MASCOT, 2, 64, 2, 1);
+  }
+
+  @Test
+  public void testLessThanLogRounds() {
+    BigInteger modulus = ModulusFinder.findSuitableModulus(128);
+    int maxBitLength = 64;
+    runTest(new TestLessThanLogRounds<>(modulus, maxBitLength),
+        EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY,
+        2, 128, 64, 32);
   }
 
   @Test
   public void testCompareEQSequentialBatchedMascot() {
     runTest(new CompareTests.TestCompareEQ<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
-        PreprocessingStrategy.MASCOT, 2, 64,2, 1);
+        PreprocessingStrategy.MASCOT, 2, 64, 2, 1);
   }
 
   @Test
   public void testCompareEQEdgeCasesBatchedMascot() {
     runTest(new CompareTests.TestCompareEQEdgeCases<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
-        PreprocessingStrategy.MASCOT, 2, 64,2, 1);
+        PreprocessingStrategy.MASCOT, 2, 64, 2, 1);
   }
 
 }

From d682f3af72f63e9357d4f673b9d085799b604590 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 20 Apr 2018 14:21:15 +0200
Subject: [PATCH 038/231] Clean up carry out

---
 .../fresco/lib/compare/lt/CarryOut.java       | 81 ++++++++++++-------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index d417507c7..06c407c82 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -2,11 +2,11 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticAndKnownRight;
-import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticXorKnownRight;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,48 +18,69 @@
  */
 public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<List<DRes<BigInteger>>> clearBits;
-  private final DRes<List<DRes<SInt>>> secretBits;
+  private static final BigInteger TWO = BigInteger.valueOf(2);
+  private final DRes<List<DRes<BigInteger>>> clearBitsDef;
+  private final DRes<List<DRes<SInt>>> secretBitsDef;
   private final BigInteger carryIn;
 
+  /**
+   * Constructs new {@link CarryOut}.
+   *
+   * @param clearBits clear bits
+   * @param secretBits secret bits
+   * @param carryIn an additional carry-in bit which we add to the least-significant bits of the
+   * inputs
+   */
   public CarryOut(DRes<List<DRes<BigInteger>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
       BigInteger carryIn) {
-    this.secretBits = secretBits;
-    this.clearBits = clearBits;
+    this.secretBitsDef = secretBits;
+    this.clearBitsDef = clearBits;
     this.carryIn = carryIn;
   }
 
+  /**
+   * Default call to {@link #CarryOut(DRes, DRes, BigInteger)} without a carry-in.
+   */
   public CarryOut(DRes<List<DRes<BigInteger>>> clearBits, DRes<List<DRes<SInt>>> secretBits) {
     this(clearBits, secretBits, BigInteger.ZERO);
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    // TODO both calls should be in parallel
-    // TODO don't re-use generic protocols to cut number of mults in half
-    DRes<List<DRes<SInt>>> xoredDef = builder
-        .par(new ArithmeticXorKnownRight(secretBits, clearBits));
-    DRes<List<DRes<SInt>>> andedDef = builder
-        .par(new ArithmeticAndKnownRight(secretBits, clearBits));
-    DRes<List<DRes<SIntPair>>> pairs = builder.seq(seq -> {
-      List<DRes<SInt>> xored = xoredDef.out();
-      List<DRes<SInt>> anded = andedDef.out();
-      List<DRes<SIntPair>> innerPairs = new ArrayList<>(xored.size());
-      for (int i = 0; i < xored.size() - 1; i++) {
-        SIntPair pair = new SIntPair(xored.get(i), anded.get(i));
-        innerPairs.add(() -> pair);
-      }
-      // need to account for carry-in bit
-      int lastIdx = xored.size() - 1;
-      DRes<SInt> lastCarryPropagator = seq.numeric().add(
-          anded.get(lastIdx),
-          seq.numeric().mult(carryIn, xored.get(lastIdx)));
-      SIntPair pair = new SIntPair(xored.get(lastIdx), lastCarryPropagator);
-      innerPairs.add(() -> pair);
-      Collections.reverse(innerPairs);
-      return () -> innerPairs;
-    });
-    return builder.seq(new PreCarryBits(pairs));
+    List<DRes<SInt>> secretBits = secretBitsDef.out();
+    List<DRes<BigInteger>> clearBits = clearBitsDef.out();
+    if (secretBits.size() != clearBits.size()) {
+      throw new IllegalArgumentException("Number of bits must be the same");
+    }
+    return builder.par(new ArithmeticAndKnownRight(secretBitsDef, clearBitsDef))
+        .par((par, andedBits) -> {
+          List<DRes<SIntPair>> pairs = new ArrayList<>(andedBits.size());
+          for (int i = 0; i < secretBits.size(); i++) {
+            DRes<SInt> leftBit = secretBits.get(i);
+            BigInteger rightBit = clearBits.get(i).out();
+            DRes<SInt> andedBit = andedBits.get(i);
+            // logical xor of two bits can is leftBit + rightBit - 2 * leftBit * rightBit
+            DRes<SInt> xoredBit = par.seq(seq -> {
+              Numeric nb = seq.numeric();
+              return nb.sub(
+                  nb.add(rightBit, leftBit),
+                  nb.mult(TWO, andedBit)
+              );
+            });
+            pairs.add(() -> new SIntPair(xoredBit, andedBit));
+          }
+          return () -> pairs;
+        }).seq((seq, pairs) -> {
+          // need to account for carry-in bit
+          int lastIdx = pairs.size() - 1;
+          SIntPair lastPair = pairs.get(lastIdx).out();
+          DRes<SInt> lastCarryPropagator = seq.numeric().add(
+              lastPair.getSecond(),
+              seq.numeric().mult(carryIn, lastPair.getFirst()));
+          pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
+          Collections.reverse(pairs);
+          return seq.seq(new PreCarryBits(() -> pairs));
+        });
   }
 
 }

From d127207d3e7f0cef6501c85cf6847680052e3751 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 10:05:04 +0200
Subject: [PATCH 039/231] TODO note

---
 .../main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 06c407c82..4e1f13879 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -59,6 +59,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
             DRes<SInt> leftBit = secretBits.get(i);
             BigInteger rightBit = clearBits.get(i).out();
             DRes<SInt> andedBit = andedBits.get(i);
+            // TODO we need a logical computation directory for logical ops on arithmetic values
             // logical xor of two bits can is leftBit + rightBit - 2 * leftBit * rightBit
             DRes<SInt> xoredBit = par.seq(seq -> {
               Numeric nb = seq.numeric();

From 392c3dcfa84afd298d63506fa0f38fd05bdbbefa Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 10:05:42 +0200
Subject: [PATCH 040/231] More todos

---
 .../dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
index 0d85e6003..de7d34314 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
@@ -6,9 +6,10 @@
 import dk.alexandra.fresco.framework.value.SInt;
 
 /**
- * Given two secret values a and b computes a < b. <p></p>
+ * Given two secret values a and b computes a < b.
  */
 public class LessThanLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
+  // TODO add paper reference
 
   private final DRes<SInt> left;
   private final DRes<SInt> right;

From 4c2c67b05098b3dc41c033fdc8d179091e1d3325 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 10:05:57 +0200
Subject: [PATCH 041/231] OInt and factory

---
 .../value/BigIntegerOIntFactory.java          | 21 +++++++++++
 .../fresco/framework/value/OInt.java          | 12 ++++++
 .../fresco/framework/value/OIntFactory.java   | 37 +++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
new file mode 100644
index 000000000..775a71f13
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
@@ -0,0 +1,21 @@
+package dk.alexandra.fresco.framework.value;
+
+import java.math.BigInteger;
+
+/**
+ * A generic {@link OIntFactory} implementation for arithmetic backend suites that use the {@link
+ * BigInteger} directly as the underlying open value data type.
+ */
+public class BigIntegerOIntFactory implements OIntFactory {
+
+  @Override
+  public BigInteger toBigInteger(OInt value) {
+    return (BigInteger) value;
+  }
+
+  @Override
+  public OInt fromBigInteger(BigInteger value) {
+    return (OInt) value;
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java
new file mode 100644
index 000000000..ccf7148a3
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java
@@ -0,0 +1,12 @@
+package dk.alexandra.fresco.framework.value;
+
+import dk.alexandra.fresco.framework.DRes;
+
+/**
+ * Generic interface representing open (public) values. <p>Arithmetic suites must implement this
+ * interface. In some case this can just be a wrapper around a {@link java.math.BigInteger},
+ * however, other suites may choose to rely on more efficient implementations.</p>
+ */
+public interface OInt extends DRes<OInt> {
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
new file mode 100644
index 000000000..1e06e36be
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
@@ -0,0 +1,37 @@
+package dk.alexandra.fresco.framework.value;
+
+import java.math.BigInteger;
+
+/**
+ * A factory for creating instances of {@link OInt} from native java data types such as {@link
+ * java.math.BigInteger} and vice versa. <p>Arithmetic backend suites must implement this. A basic
+ * implementation for open values wrapping {@link BigInteger} instances is provided by {@link
+ * BigIntegerOIntFactory}.</p>
+ */
+public interface OIntFactory {
+
+  /**
+   * Convert open value to {@link BigInteger}.
+   */
+  BigInteger toBigInteger(OInt value);
+
+  /**
+   * Convert open value to long.
+   */
+  default long toLong(OInt value) {
+    return toBigInteger(value).longValue();
+  }
+
+  /**
+   * Convert {@link BigInteger} to {@link OInt}.
+   */
+  OInt fromBigInteger(BigInteger value);
+
+  /**
+   * Convert long to {@link OInt}.
+   */
+  default OInt fromLong(long value) {
+    return fromBigInteger(BigInteger.valueOf(value));
+  }
+
+}

From 510ccdfc3522bad6c1dd6a07babb7e24d5a82862 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 10:13:00 +0200
Subject: [PATCH 042/231] Add oint factory to numeric resource pool

---
 .../builder/numeric/NumericResourcePool.java    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java
index b50039a79..4b45e0f42 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java
@@ -2,14 +2,14 @@
 
 import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import java.math.BigInteger;
 
 /**
- * Every resource pool must have a set of properties available, primarily
- * the modulus and a BigInteger serialization.
- * <p>
- * This is paired with the {@link ProtocolSuiteNumeric}.
+ * Every resource pool must have a set of properties available, primarily the modulus and a
+ * BigInteger serialization. <p> This is paired with the {@link ProtocolSuiteNumeric}.
  */
 public interface NumericResourcePool extends ResourcePool {
 
@@ -42,4 +42,13 @@ default BigInteger convertRepresentation(BigInteger bigInteger) {
     }
     return actual;
   }
+
+  /**
+   * Returns the backend-specific implementation of {@link OIntFactory}, for converting between
+   * backend-suite representations of open values and native data types.
+   */
+  default OIntFactory getOIntFactory() {
+    return new BigIntegerOIntFactory();
+  }
+
 }

From 510e760b36e1a0434362cabab4b7a7fecad85df1 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 10:39:11 +0200
Subject: [PATCH 043/231] Move oint factory to factory numeric

---
 .../builder/numeric/BuilderFactoryNumeric.java         |  7 +++++++
 .../framework/builder/numeric/NumericResourcePool.java | 10 ----------
 .../builder/numeric/ProtocolBuilderNumeric.java        |  9 +++++++++
 .../fresco/lib/compare/lt/BitLessThanOpen.java         |  1 +
 .../fresco/lib/field/integer/BasicNumericContext.java  |  3 +--
 .../alexandra/fresco/logging/NumericSuiteLogging.java  |  6 ++++++
 .../arithmetic/DummyArithmeticBuilderFactory.java      | 10 +++++++++-
 .../dk/alexandra/fresco/suite/spdz/SpdzBuilder.java    |  9 +++++++++
 .../alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java   |  6 ++++++
 9 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
index 49f8db52c..c7c721e5f 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.BuilderFactory;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
 import dk.alexandra.fresco.lib.real.AdvancedRealNumeric;
@@ -36,6 +37,12 @@ public interface BuilderFactoryNumeric extends BuilderFactory<ProtocolBuilderNum
 
   MiscBigIntegerGenerators getBigIntegerHelper();
 
+  /**
+   * Returns the backend-specific implementation of {@link OIntFactory}, for converting between
+   * backend-suite representations of open values and native data types.
+   */
+  OIntFactory getOIntFactory();
+
   default Comparison createComparison(ProtocolBuilderNumeric builder) {
     return new DefaultComparison(this, builder);
   }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java
index 4b45e0f42..225d64aa7 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/NumericResourcePool.java
@@ -2,8 +2,6 @@
 
 import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
-import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
-import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import java.math.BigInteger;
 
@@ -43,12 +41,4 @@ default BigInteger convertRepresentation(BigInteger bigInteger) {
     return actual;
   }
 
-  /**
-   * Returns the backend-specific implementation of {@link OIntFactory}, for converting between
-   * backend-suite representations of open values and native data types.
-   */
-  default OIntFactory getOIntFactory() {
-    return new BigIntegerOIntFactory();
-  }
-
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
index 71bc47c17..b16bef8fd 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
@@ -1,6 +1,7 @@
 package dk.alexandra.fresco.framework.builder.numeric;
 
 import dk.alexandra.fresco.framework.builder.ProtocolBuilderImpl;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
 import dk.alexandra.fresco.lib.real.AdvancedRealNumeric;
@@ -140,6 +141,14 @@ public MiscBigIntegerGenerators getBigIntegerHelper() {
     return factory.getBigIntegerHelper();
   }
 
+  /**
+   * Returns the backend-specific implementation of {@link OIntFactory}, for converting between
+   * backend-suite representations of open values and native data types.
+   */
+  public OIntFactory getOIntFactory() {
+    return factory.getOIntFactory();
+  }
+
   /**
    * Creates a {@link RealNumeric} computation directory for this instance - i.e. this intended
    * producer. Contains basic arithmetic operations on fixed point numbers.
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index 0280802b7..0712681ee 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -27,6 +27,7 @@ public BitLessThanOpen(BigInteger openValue, List<DRes<SInt>> secretBits) {
     this(() -> openValue, () -> secretBits);
   }
 
+
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java b/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
index 4b50d6b66..8e2dccade 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
@@ -12,7 +12,6 @@ public class BasicNumericContext {
   private final int myId;
   private final int noOfParties;
 
-
   /**
    * @param maxBitLength The maximum length in bits that the numbers in the application will
    *     have.
@@ -34,7 +33,6 @@ public int getMaxBitLength() {
     return this.maxBitLength;
   }
 
-
   /**
    * Returns the modulus used in the underlying arithmetic protocol suite.
    *
@@ -58,4 +56,5 @@ public int getMyId() {
   public int getNoOfParties() {
     return noOfParties;
   }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java b/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
index 8b2ac0d26..a55b595ec 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
@@ -6,6 +6,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.NumericResourcePool;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
 import dk.alexandra.fresco.lib.real.RealNumericContext;
@@ -59,6 +60,11 @@ public MiscBigIntegerGenerators getBigIntegerHelper() {
         return delegateFactory.getBigIntegerHelper();
       }
 
+      @Override
+      public OIntFactory getOIntFactory() {
+        return delegateFactory.getOIntFactory();
+      }
+
       @Override
       public Comparison createComparison(ProtocolBuilderNumeric builder) {
         ComparisonLoggerDecorator comparisonLoggerDecorator =
diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index a465ba0ac..0d8f011e8 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -5,6 +5,8 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
@@ -22,6 +24,7 @@ public class DummyArithmeticBuilderFactory implements BuilderFactoryNumeric {
   private BasicNumericContext basicNumericContext;
   private RealNumericContext realNumericContext;
   private MiscBigIntegerGenerators mog;
+  private final OIntFactory oIntFactory;
   private Random rand;
 
   /**
@@ -35,9 +38,9 @@ public DummyArithmeticBuilderFactory(BasicNumericContext basicNumericContext,
     this.basicNumericContext = basicNumericContext;
     this.realNumericContext = realNumericContext;
     this.rand = new Random(0);
+    this.oIntFactory = new BigIntegerOIntFactory();
   }
 
-
   @Override
   public BasicNumericContext getBasicNumericContext() {
     return basicNumericContext;
@@ -194,4 +197,9 @@ public MiscBigIntegerGenerators getBigIntegerHelper() {
     return mog;
   }
 
+  @Override
+  public OIntFactory getOIntFactory() {
+    return oIntFactory;
+  }
+
 }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index a43029c09..159c54f70 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -5,6 +5,8 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.PreprocessedValues;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
@@ -31,10 +33,12 @@ class SpdzBuilder implements BuilderFactoryNumeric {
   private BasicNumericContext basicNumericContext;
   private MiscBigIntegerGenerators miscOIntGenerators;
   private RealNumericContext realNumericContext;
+  private final OIntFactory oIntFactory;
 
   SpdzBuilder(BasicNumericContext basicNumericContext, RealNumericContext realNumericContext) {
     this.basicNumericContext = basicNumericContext;
     this.realNumericContext = realNumericContext;
+    this.oIntFactory = new BigIntegerOIntFactory();
   }
 
   @Override
@@ -150,4 +154,9 @@ public MiscBigIntegerGenerators getBigIntegerHelper() {
     return miscOIntGenerators;
   }
 
+  @Override
+  public OIntFactory getOIntFactory() {
+    return oIntFactory;
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 8a71409c5..2c44ed012 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
@@ -123,6 +124,11 @@ public MiscBigIntegerGenerators getBigIntegerHelper() {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public OIntFactory getOIntFactory() {
+    throw new UnsupportedOperationException();
+  }
+
   /**
    * Get result from deferred and downcast result to {@link Spdz2kSInt<PlainT>}.
    */

From 77ca5b6bc4bbc9596e669be212cf64a262cc4c96 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 11:20:40 +0200
Subject: [PATCH 044/231] Add oint arithmetic

---
 .../numeric/BuilderFactoryNumeric.java        | 32 +++++++++--------
 .../numeric/ProtocolBuilderNumeric.java       |  5 +++
 .../value/BigIntegerOIntArithmetic.java       | 34 +++++++++++++++++++
 .../framework/value/OIntArithmetic.java       | 18 ++++++++++
 .../lib/compare/lt/BitLessThanOpen.java       | 16 ++++-----
 .../fresco/lib/math/integer/mod/Mod2m.java    | 20 +++++------
 .../fresco/logging/NumericSuiteLogging.java   |  6 ++++
 .../DummyArithmeticBuilderFactory.java        |  9 +++++
 .../lib/compare/lt/BitLessThanOpenTests.java  |  3 +-
 .../fresco/suite/spdz/SpdzBuilder.java        |  9 +++++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  8 +++++
 11 files changed, 125 insertions(+), 35 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
index c7c721e5f..ea2c7c0e0 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.BuilderFactory;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
@@ -14,15 +15,11 @@
 import dk.alexandra.fresco.lib.real.fixed.FixedNumeric;
 
 /**
- * The core factory to implement when creating a numeric protocol. Every
- * {@link ComputationDirectory} found in this factory will
- * append the produced protocols to the supplied builder. Implementors must provide
- * a {@link Numeric} - being directory for
- * <ul>
- * <li>simple, numeric operations (+, -, *)</li>
- * <li>Open operations for opening a small subset of values used in the control flow (is a<b)<</li>
- * <li>Factories for producing secret shared values</li>
- * </ul>
+ * The core factory to implement when creating a numeric protocol. Every {@link
+ * ComputationDirectory} found in this factory will append the produced protocols to the supplied
+ * builder. Implementors must provide a {@link Numeric} - being directory for <ul> <li>simple,
+ * numeric operations (+, -, *)</li> <li>Open operations for opening a small subset of values used
+ * in the control flow (is a<b)<</li> <li>Factories for producing secret shared values</li> </ul>
  * The other directories have defaults, based on the raw methods, but can be overridden if the
  * particular protocol suite has a more efficient way of e.g. comparing two numbers than a generic
  * approach would have.
@@ -32,7 +29,7 @@ public interface BuilderFactoryNumeric extends BuilderFactory<ProtocolBuilderNum
   BasicNumericContext getBasicNumericContext();
 
   RealNumericContext getRealNumericContext();
-  
+
   Numeric createNumeric(ProtocolBuilderNumeric builder);
 
   MiscBigIntegerGenerators getBigIntegerHelper();
@@ -43,6 +40,11 @@ public interface BuilderFactoryNumeric extends BuilderFactory<ProtocolBuilderNum
    */
   OIntFactory getOIntFactory();
 
+  /**
+   * Returns the backend-specific implementation of open value arithmetic helper.
+   */
+  OIntArithmetic getOIntArithmetic();
+
   default Comparison createComparison(ProtocolBuilderNumeric builder) {
     return new DefaultComparison(this, builder);
   }
@@ -50,19 +52,19 @@ default Comparison createComparison(ProtocolBuilderNumeric builder) {
   default AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
     return new DefaultAdvancedNumeric(this, builder);
   }
-  
+
   default Collections createCollections(ProtocolBuilderNumeric builder) {
     return new DefaultCollections(this, builder);
   }
-  
+
   default PreprocessedValues createPreprocessedValues(ProtocolBuilderNumeric builder) {
     return new DefaultPreprocessedValues(builder);
   }
-  
+
   default RealNumeric createRealNumeric(ProtocolBuilderNumeric builder) {
     return new FixedNumeric(builder);
   }
-  
+
   default AdvancedRealNumeric createAdvancedRealNumeric(ProtocolBuilderNumeric builder) {
     return new AdvancedFixedNumeric(builder);
   }
@@ -71,7 +73,7 @@ default RealLinearAlgebra createRealLinearAlgebra(ProtocolBuilderNumeric builder
     return new FixedLinearAlgebra(builder);
   }
 
-  
+
   /**
    * Returns a builder which can be helpful while developing a new protocol. Be very careful though,
    * to include this in any production code since the debugging opens values to all parties.
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
index b16bef8fd..43a839fab 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
@@ -1,6 +1,7 @@
 package dk.alexandra.fresco.framework.builder.numeric;
 
 import dk.alexandra.fresco.framework.builder.ProtocolBuilderImpl;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
@@ -149,6 +150,10 @@ public OIntFactory getOIntFactory() {
     return factory.getOIntFactory();
   }
 
+  public OIntArithmetic getOIntArithmetic() {
+    return factory.getOIntArithmetic();
+  }
+
   /**
    * Creates a {@link RealNumeric} computation directory for this instance - i.e. this intended
    * producer. Contains basic arithmetic operations on fixed point numbers.
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
new file mode 100644
index 000000000..0410859bd
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -0,0 +1,34 @@
+package dk.alexandra.fresco.framework.value;
+
+import dk.alexandra.fresco.framework.DRes;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Implementation of {@link OIntArithmetic} for the case when open values are represented directly
+ * via {@link BigInteger}.
+ */
+public class BigIntegerOIntArithmetic implements OIntArithmetic {
+
+  private final OIntFactory factory;
+
+  public BigIntegerOIntArithmetic(OIntFactory factory) {
+    this.factory = factory;
+  }
+
+  @Override
+  public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
+    BigInteger value = factory.toBigInteger(openValue);
+    List<DRes<OInt>> bits = new ArrayList<>(numBits);
+    for (int b = 0; b < numBits; b++) {
+      boolean boolBit = value.testBit(b);
+      OInt bit = factory.fromLong(boolBit ? 1 : 0);
+      bits.add(() -> bit);
+    }
+    Collections.reverse(bits);
+    return bits;
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
new file mode 100644
index 000000000..e3fc79441
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -0,0 +1,18 @@
+package dk.alexandra.fresco.framework.value;
+
+import dk.alexandra.fresco.framework.DRes;
+import java.util.List;
+
+/**
+ * Helper class for implementing various arithmetic operations on open values.
+ */
+public interface OIntArithmetic {
+
+  /**
+   * Turns input value into bits in big-endian order. <p>If the actual bit length of the value is
+   * smaller than numBits, the result is padded with 0s. If the bit length is larger only the first
+   * numBits bits are used.</p>
+   */
+  List<DRes<OInt>> toBits(OInt value, int numBits);
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index 0712681ee..cfac01e1b 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -3,7 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.util.MathUtils;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -15,25 +15,24 @@
  */
 public class BitLessThanOpen implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<BigInteger> openValueDef;
+  private final DRes<OInt> openValueDef;
   private final DRes<List<DRes<SInt>>> secretBitsDef;
 
-  public BitLessThanOpen(DRes<BigInteger> openValue, DRes<List<DRes<SInt>>> secretBits) {
+  public BitLessThanOpen(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits) {
     this.openValueDef = openValue;
     this.secretBitsDef = secretBits;
   }
 
-  public BitLessThanOpen(BigInteger openValue, List<DRes<SInt>> secretBits) {
+  public BitLessThanOpen(OInt openValue, List<DRes<SInt>> secretBits) {
     this(() -> openValue, () -> secretBits);
   }
 
-
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
-    BigInteger openValueA = openValueDef.out();
+    OInt openValueA = openValueDef.out();
     int numBits = secretBits.size();
-    List<DRes<BigInteger>> openBits = MathUtils.toBitsAsDRes(openValueA, numBits);
+    List<DRes<OInt>> openBits = builder.getOIntArithmetic().toBits(openValueA, numBits);
     DRes<List<DRes<SInt>>> secretBitsNegated = builder.par(par -> {
       List<DRes<SInt>> negatedBits = new ArrayList<>(numBits);
       for (DRes<SInt> secretBit : secretBits) {
@@ -42,7 +41,8 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       Collections.reverse(negatedBits);
       return () -> negatedBits;
     });
-    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, BigInteger.ONE));
+//    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, BigInteger.ONE));
+    DRes<SInt> gt = builder.seq(new CarryOut(() -> null, secretBitsNegated, BigInteger.ONE));
     return builder.numeric().sub(BigInteger.ONE, gt);
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index 4746e14c5..87d4770ea 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.lib.math.integer.mod;
 
+import dk.alexandra.fresco.framework.value.OInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,14 +26,10 @@ public class Mod2m implements Computation<SInt, ProtocolBuilderNumeric> {
   /**
    * Constructs new {@link Mod2m}.
    *
-   * @param input
-   *          value to reduce
-   * @param m
-   *          exponent (2^{m})
-   * @param k
-   *          bitlength of the input
-   * @param kappa
-   *          Computational security parameter
+   * @param input value to reduce
+   * @param m exponent (2^{m})
+   * @param k bitlength of the input
+   * @param kappa Computational security parameter
    */
   public Mod2m(DRes<SInt> input, int m, int k, int kappa) {
     this.input = input;
@@ -44,7 +41,7 @@ public Mod2m(DRes<SInt> input, int m, int k, int kappa) {
   private static DRes<List<DRes<SInt>>> getDeferedList(
       ProtocolBuilderNumeric builder, List<DRes<SInt>> baseList, int amount) {
     BigInteger two = new BigInteger("2");
-    return  builder.par(par -> {
+    return builder.par(par -> {
       List<DRes<SInt>> list = new ArrayList<>(amount);
       for (int i = 0; i < amount; i++) {
         list.add(par.numeric().mult(two.pow(i), baseList.get(i)));
@@ -71,9 +68,10 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<SInt> temp = builder.numeric().add(input, r);
     DRes<BigInteger> c = builder.numeric().open(builder.numeric().add(two.pow(k
         - 1), temp));
-    return builder.seq( seq -> {
+    return builder.seq(seq -> {
       BigInteger cPrime = c.out().mod(two.pow(m));
-      DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrime, () -> randomBits.subList(0, m)));
+      OInt cPrimeOInt = seq.getOIntFactory().fromBigInteger(cPrime);
+      DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrimeOInt, () -> randomBits.subList(0, m)));
       return seq.numeric().add(seq.numeric().mult(two.pow(m), u),
           seq.numeric().sub(cPrime, rPrime));
     });
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java b/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
index a55b595ec..759c03652 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
@@ -6,6 +6,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.NumericResourcePool;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
@@ -65,6 +66,11 @@ public OIntFactory getOIntFactory() {
         return delegateFactory.getOIntFactory();
       }
 
+      @Override
+      public OIntArithmetic getOIntArithmetic() {
+        return delegateFactory.getOIntArithmetic();
+      }
+
       @Override
       public Comparison createComparison(ProtocolBuilderNumeric builder) {
         ComparisonLoggerDecorator comparisonLoggerDecorator =
diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index 0d8f011e8..f17e287a8 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -5,7 +5,9 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.BigIntegerOIntArithmetic;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
@@ -25,6 +27,7 @@ public class DummyArithmeticBuilderFactory implements BuilderFactoryNumeric {
   private RealNumericContext realNumericContext;
   private MiscBigIntegerGenerators mog;
   private final OIntFactory oIntFactory;
+  private final OIntArithmetic oIntArithmetic;
   private Random rand;
 
   /**
@@ -39,6 +42,7 @@ public DummyArithmeticBuilderFactory(BasicNumericContext basicNumericContext,
     this.realNumericContext = realNumericContext;
     this.rand = new Random(0);
     this.oIntFactory = new BigIntegerOIntFactory();
+    this.oIntArithmetic = new BigIntegerOIntArithmetic(oIntFactory);
   }
 
   @Override
@@ -202,4 +206,9 @@ public OIntFactory getOIntFactory() {
     return oIntFactory;
   }
 
+  @Override
+  public OIntArithmetic getOIntArithmetic() {
+    return oIntArithmetic;
+  }
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
index 6eb63e53a..568f9f171 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
@@ -7,6 +7,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.MathUtils;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -68,7 +69,7 @@ public void test() {
                 List<DRes<BigInteger>> results = new ArrayList<>(left.size());
                 for (int i = 0; i < left.size(); i++) {
                   int finalI = i;
-                  DRes<BigInteger> leftValue = () -> left.get(finalI);
+                  DRes<OInt> leftValue = () -> root.getOIntFactory().fromBigInteger(left.get(finalI));
                   DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(finalI), myId,
                       numBits);
                   results.add(
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 159c54f70..502b2639a 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -5,7 +5,9 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.PreprocessedValues;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.BigIntegerOIntArithmetic;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
@@ -34,11 +36,13 @@ class SpdzBuilder implements BuilderFactoryNumeric {
   private MiscBigIntegerGenerators miscOIntGenerators;
   private RealNumericContext realNumericContext;
   private final OIntFactory oIntFactory;
+  private final OIntArithmetic oIntArithmetic;
 
   SpdzBuilder(BasicNumericContext basicNumericContext, RealNumericContext realNumericContext) {
     this.basicNumericContext = basicNumericContext;
     this.realNumericContext = realNumericContext;
     this.oIntFactory = new BigIntegerOIntFactory();
+    this.oIntArithmetic = new BigIntegerOIntArithmetic(oIntFactory);
   }
 
   @Override
@@ -159,4 +163,9 @@ public OIntFactory getOIntFactory() {
     return oIntFactory;
   }
 
+  @Override
+  public OIntArithmetic getOIntArithmetic() {
+    return oIntArithmetic;
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 2c44ed012..e49e1528b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
@@ -126,6 +127,13 @@ public MiscBigIntegerGenerators getBigIntegerHelper() {
 
   @Override
   public OIntFactory getOIntFactory() {
+    // TODO implement
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public OIntArithmetic getOIntArithmetic() {
+    // TODO implement
     throw new UnsupportedOperationException();
   }
 

From 097e6e6ad817d51d4c8087cb56fcd3a071e91c1d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 12:39:48 +0200
Subject: [PATCH 045/231] Add oint methods to numeric comp dir

---
 .../framework/builder/numeric/Numeric.java    | 33 +++++++++++++++++++
 .../fresco/framework/value/OIntFactory.java   |  7 ++++
 .../lib/compare/lt/BitLessThanOpen.java       |  3 +-
 .../fresco/lib/compare/lt/CarryOut.java       | 19 ++++++-----
 .../binary/ArithmeticAndKnownRight.java       | 14 ++++----
 .../arithmetic/NumericLoggingDecorator.java   | 21 ++++++++++++
 .../DummyArithmeticBuilderFactory.java        | 25 ++++++++++++--
 .../fresco/lib/compare/lt/CarryOutTests.java  | 17 ++++------
 .../integer/binary/BinaryOperationsTests.java | 11 ++++---
 9 files changed, 114 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
index c9794ec7a..e265ccf2e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -31,6 +32,14 @@ public interface Numeric extends ComputationDirectory {
    */
   DRes<SInt> add(BigInteger a, DRes<SInt> b);
 
+  /**
+   * Adds a secret value with a public value and returns the result.
+   * @param a Public value
+   * @param b Secret value
+   * @return A deferred result computing a+b
+   */
+  DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b);
+
   /**
    * Subtracts two secret values and returns the result.
    * @param a Secret value 1
@@ -47,6 +56,22 @@ public interface Numeric extends ComputationDirectory {
    */
   DRes<SInt> sub(BigInteger a, DRes<SInt> b);
 
+  /**
+   * Subtracts a public value and a secret value and returns the result.
+   * @param a Public value
+   * @param b Secret value
+   * @return A deferred result computing a-b
+   */
+  DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b);
+
+  /**
+   * Subtracts a secret value and a public value and returns the result.
+   * @param a Secret value
+   * @param b Public value
+   * @return A deferred result computing a-b
+   */
+  DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b);
+
   /**
    * Subtracts a secret value and a public value and returns the result.
    * @param a Secret value
@@ -71,6 +96,14 @@ public interface Numeric extends ComputationDirectory {
    */
   DRes<SInt> mult(BigInteger a, DRes<SInt> b);
 
+  /**
+   * Multiplies a public value onto a secret value and returns the result.
+   * @param a Public value
+   * @param b Secret value
+   * @return A deferred result computing a*b
+   */
+  DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b);
+
   /**
    * Returns a deferred result which creates a secret shared random bit. (This should be computed
    * beforehand to increase the speed of the application)
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
index 1e06e36be..2c557ff19 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
@@ -1,6 +1,9 @@
 package dk.alexandra.fresco.framework.value;
 
+import dk.alexandra.fresco.framework.DRes;
 import java.math.BigInteger;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * A factory for creating instances of {@link OInt} from native java data types such as {@link
@@ -34,4 +37,8 @@ default OInt fromLong(long value) {
     return fromBigInteger(BigInteger.valueOf(value));
   }
 
+  default List<DRes<OInt>> fromBigInteger(List<BigInteger> values) {
+    return values.stream().map(this::fromBigInteger).collect(Collectors.toList());
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index cfac01e1b..a4eae882b 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -41,8 +41,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       Collections.reverse(negatedBits);
       return () -> negatedBits;
     });
-//    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, BigInteger.ONE));
-    DRes<SInt> gt = builder.seq(new CarryOut(() -> null, secretBitsNegated, BigInteger.ONE));
+    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, BigInteger.ONE));
     return builder.numeric().sub(BigInteger.ONE, gt);
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 4e1f13879..bc4859c0c 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -5,6 +5,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticAndKnownRight;
 import java.math.BigInteger;
@@ -19,7 +20,7 @@
 public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private static final BigInteger TWO = BigInteger.valueOf(2);
-  private final DRes<List<DRes<BigInteger>>> clearBitsDef;
+  private final DRes<List<DRes<OInt>>> openBitsDef;
   private final DRes<List<DRes<SInt>>> secretBitsDef;
   private final BigInteger carryIn;
 
@@ -31,40 +32,40 @@ public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
    * @param carryIn an additional carry-in bit which we add to the least-significant bits of the
    * inputs
    */
-  public CarryOut(DRes<List<DRes<BigInteger>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
+  public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
       BigInteger carryIn) {
     this.secretBitsDef = secretBits;
-    this.clearBitsDef = clearBits;
+    this.openBitsDef = clearBits;
     this.carryIn = carryIn;
   }
 
   /**
    * Default call to {@link #CarryOut(DRes, DRes, BigInteger)} without a carry-in.
    */
-  public CarryOut(DRes<List<DRes<BigInteger>>> clearBits, DRes<List<DRes<SInt>>> secretBits) {
+  public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretBits) {
     this(clearBits, secretBits, BigInteger.ZERO);
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
-    List<DRes<BigInteger>> clearBits = clearBitsDef.out();
-    if (secretBits.size() != clearBits.size()) {
+    List<DRes<OInt>> openBits = openBitsDef.out();
+    if (secretBits.size() != openBits.size()) {
       throw new IllegalArgumentException("Number of bits must be the same");
     }
-    return builder.par(new ArithmeticAndKnownRight(secretBitsDef, clearBitsDef))
+    return builder.par(new ArithmeticAndKnownRight(secretBitsDef, openBitsDef))
         .par((par, andedBits) -> {
           List<DRes<SIntPair>> pairs = new ArrayList<>(andedBits.size());
           for (int i = 0; i < secretBits.size(); i++) {
             DRes<SInt> leftBit = secretBits.get(i);
-            BigInteger rightBit = clearBits.get(i).out();
+            DRes<OInt> rightBit = openBits.get(i);
             DRes<SInt> andedBit = andedBits.get(i);
             // TODO we need a logical computation directory for logical ops on arithmetic values
             // logical xor of two bits can is leftBit + rightBit - 2 * leftBit * rightBit
             DRes<SInt> xoredBit = par.seq(seq -> {
               Numeric nb = seq.numeric();
               return nb.sub(
-                  nb.add(rightBit, leftBit),
+                  nb.addOpen(rightBit, leftBit),
                   nb.mult(TWO, andedBit)
               );
             });
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
index 3ce36918c..7d14f1055 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
@@ -3,8 +3,8 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationParallel;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,17 +16,17 @@ public class ArithmeticAndKnownRight implements
     ComputationParallel<List<DRes<SInt>>, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<SInt>>> leftBits;
-  private final DRes<List<DRes<BigInteger>>> rightBits;
+  private final DRes<List<DRes<OInt>>> rightBits;
 
   /**
-   * Constructs new {@link ArithmeticXorKnownRight}.
+   * Constructs new {@link ArithmeticAndKnownRight}.
    *
    * @param leftBits secret bits represented as arithmetic elements
    * @param rightBits open bits represented as arithmetic elements
    */
   public ArithmeticAndKnownRight(
       DRes<List<DRes<SInt>>> leftBits,
-      DRes<List<DRes<BigInteger>>> rightBits) {
+      DRes<List<DRes<OInt>>> rightBits) {
     this.leftBits = leftBits;
     this.rightBits = rightBits;
   }
@@ -34,13 +34,13 @@ public ArithmeticAndKnownRight(
   @Override
   public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> leftOut = leftBits.out();
-    List<DRes<BigInteger>> rightOut = rightBits.out();
+    List<DRes<OInt>> rightOut = rightBits.out();
     List<DRes<SInt>> andedBits = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       DRes<SInt> leftBit = leftOut.get(i);
-      BigInteger rightBit = rightOut.get(i).out();
+      DRes<OInt> rightBit = rightOut.get(i);
       // logical and of two bits can be computed as product
-      DRes<SInt> andedBit = builder.seq(seq -> seq.numeric().mult(rightBit, leftBit));
+      DRes<SInt> andedBit = builder.seq(seq -> seq.numeric().multByOpen(rightBit, leftBit));
       andedBits.add(andedBit);
     }
     return () -> andedBits;
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java
index 8bc18af99..1cd8fc53e 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.logging.PerformanceLogger;
 import java.math.BigInteger;
@@ -38,6 +39,11 @@ public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
     return this.delegate.add(a, b);
   }
 
+  @Override
+  public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
+    return delegate.addOpen(a, b);
+  }
+
   @Override
   public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
     subCount++;
@@ -49,6 +55,16 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
     return this.delegate.sub(a, b);
   }
 
+  @Override
+  public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
+    return delegate.subFromOpen(a, b);
+  }
+
+  @Override
+  public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
+    return delegate.subOpen(a, b);
+  }
+
   @Override
   public DRes<SInt> sub(DRes<SInt> a, BigInteger b) {
     return this.delegate.sub(a, b);
@@ -65,6 +81,11 @@ public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
     return this.delegate.mult(a, b);
   }
 
+  @Override
+  public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
+    return delegate.multByOpen(a, b);
+  }
+
   @Override
   public DRes<SInt> randomBit() {
     this.bitCount++;
diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index f17e287a8..61238b247 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -7,6 +7,7 @@
 import dk.alexandra.fresco.framework.network.Network;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntArithmetic;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -32,8 +33,6 @@ public class DummyArithmeticBuilderFactory implements BuilderFactoryNumeric {
 
   /**
    * Creates a dummy arithmetic builder factory which creates basic numeric operations
-   *
-   * @param factory The numeric context we work within.
    */
   public DummyArithmeticBuilderFactory(BasicNumericContext basicNumericContext,
       RealNumericContext realNumericContext) {
@@ -54,7 +53,7 @@ public BasicNumericContext getBasicNumericContext() {
   public RealNumericContext getRealNumericContext() {
     return realNumericContext;
   }
-  
+
   @Override
   public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
@@ -73,6 +72,16 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
         return builder.append(c);
       }
 
+      @Override
+      public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
+        return sub(builder.getOIntFactory().toBigInteger(a.out()), b);
+      }
+
+      @Override
+      public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
+        return sub(a, builder.getOIntFactory().toBigInteger(b.out()));
+      }
+
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
         DummyArithmeticSubtractProtocol c = new DummyArithmeticSubtractProtocol(a, b);
@@ -144,6 +153,11 @@ public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
         return builder.append(c);
       }
 
+      @Override
+      public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
+        return mult(builder.getOIntFactory().toBigInteger(a.out()), b);
+      }
+
       @Override
       public DRes<SInt> mult(DRes<SInt> a, DRes<SInt> b) {
         DummyArithmeticMultProtocol c = new DummyArithmeticMultProtocol(a, b);
@@ -185,6 +199,11 @@ public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
         return builder.append(c);
       }
 
+      @Override
+      public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
+        return add(builder.getOIntFactory().toBigInteger(a.out()), b);
+      }
+
       @Override
       public DRes<SInt> add(DRes<SInt> a, DRes<SInt> b) {
         DummyArithmeticAddProtocol c = new DummyArithmeticAddProtocol(a, b);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
index f68596a22..92bd7993d 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
@@ -6,6 +6,7 @@
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -19,16 +20,14 @@ public static class TestCarryOut<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
     private final List<BigInteger> left;
-    private final List<DRes<BigInteger>> right;
+    private final List<BigInteger> right;
     private final BigInteger expected;
 
     public TestCarryOut(int l, int r) {
       expected = carry(l, r);
       left = intToBits(l);
       right = new ArrayList<>(left.size());
-      for (BigInteger bit : intToBits(r)) {
-        right.add(() -> bit);
-      }
+      right.addAll(intToBits(r));
     }
 
     @Override
@@ -40,12 +39,10 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<BigInteger, ProtocolBuilderNumeric> app =
               root -> {
-                int myId = root.getBasicNumericContext().getMyId();
-                DRes<List<DRes<SInt>>> leftClosed =
-                    (myId == 1) ?
-                        root.collections().closeList(left, 1)
-                        : root.collections().closeList(left.size(), 1);
-                DRes<SInt> carry = root.seq(new CarryOut(() -> right, leftClosed));
+                DRes<List<DRes<SInt>>> leftClosed = () -> root.numeric().known(right);
+                OIntFactory oIntFactory = root.getOIntFactory();
+                DRes<SInt> carry = root
+                    .seq(new CarryOut(() -> oIntFactory.fromBigInteger(right), leftClosed));
                 return root.numeric().open(carry);
               };
           BigInteger actual = runApplication(app);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
index 5eecad1c9..6618530c8 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
@@ -8,6 +8,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.RightShiftResult;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -133,11 +134,11 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
             BigInteger.ZERO,
             BigInteger.ONE,
             BigInteger.ZERO);
-        private final List<DRes<BigInteger>> right = Arrays.asList(
-            () -> BigInteger.ONE,
-            () -> BigInteger.ONE,
-            () -> BigInteger.ZERO,
-            () -> BigInteger.ZERO);
+        private final List<DRes<OInt>> right = Arrays.asList(
+            () -> (OInt) BigInteger.ONE,
+            () -> (OInt) BigInteger.ONE,
+            () -> (OInt) BigInteger.ZERO,
+            () -> (OInt) BigInteger.ZERO);
 
         @Override
         public void test() {

From 3fd68280459c3b2ad0d1703a5111834632bd6f0f Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 12:41:03 +0200
Subject: [PATCH 046/231] Update spdz and spdz2k builders

---
 .../fresco/suite/spdz/SpdzBuilder.java        | 21 +++++++++++++++-
 .../suite/spdz/MaliciousSpdzBuilder.java      | 20 +++++++++++++++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 25 +++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 502b2639a..6f6630618 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -7,6 +7,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntArithmetic;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -73,13 +74,16 @@ public DRes<SInt> add(DRes<SInt> a, DRes<SInt> b) {
         return protocolBuilder.append(spdzAddProtocol);
       }
 
-
       @Override
       public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
         SpdzAddProtocolKnownLeft spdzAddProtocolKnownLeft = new SpdzAddProtocolKnownLeft(a, b);
         return protocolBuilder.append(spdzAddProtocolKnownLeft);
       }
 
+      @Override
+      public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
+        return add(protocolBuilder.getOIntFactory().toBigInteger(a.out()), b);
+      }
 
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
@@ -94,6 +98,16 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
         return protocolBuilder.append(spdzSubtractProtocolKnownLeft);
       }
 
+      @Override
+      public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
+        return sub(protocolBuilder.getOIntFactory().toBigInteger(a.out()), b);
+      }
+
+      @Override
+      public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
+        return sub(a, protocolBuilder.getOIntFactory().toBigInteger(b.out()));
+      }
+
       @Override
       public DRes<SInt> sub(DRes<SInt> a, BigInteger b) {
         SpdzSubtractProtocolKnownRight spdzSubtractProtocolKnownRight =
@@ -114,6 +128,11 @@ public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
 
       }
 
+      @Override
+      public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
+        return mult(protocolBuilder.getOIntFactory().toBigInteger(a.out()), b);
+      }
+
       @Override
       public DRes<SInt> randomBit() {
         return protocolBuilder.append(new SpdzRandomBitProtocol());
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java
index 102645ae2..d34722f03 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
 import dk.alexandra.fresco.lib.real.RealNumericContext;
@@ -41,6 +42,11 @@ public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
         return protocolBuilder.append(spdzAddProtocolKnownLeft);
       }
 
+      @Override
+      public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
+        throw new UnsupportedOperationException();
+      }
+
 
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
@@ -55,6 +61,16 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
         return protocolBuilder.append(spdzSubtractProtocolKnownLeft);
       }
 
+      @Override
+      public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
+        throw new UnsupportedOperationException();
+      }
+
       @Override
       public DRes<SInt> sub(DRes<SInt> a, BigInteger b) {
         SpdzSubtractProtocolKnownRight spdzSubtractProtocolKnownRight =
@@ -72,7 +88,11 @@ public DRes<SInt> mult(DRes<SInt> a, DRes<SInt> b) {
       public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
         SpdzMultProtocolKnownLeft spdzMultProtocol4 = new SpdzMultProtocolKnownLeft(a, b);
         return protocolBuilder.append(spdzMultProtocol4);
+      }
 
+      @Override
+      public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
+        throw new UnsupportedOperationException();
       }
 
       @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index e49e1528b..6382c0e01 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -59,6 +60,12 @@ public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
         return builder.append(new Spdz2kAddKnownProtocol<>(factory.createFromBigInteger(a), b));
       }
 
+      @Override
+      public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
+        // TODO implement
+        throw new UnsupportedOperationException();
+      }
+
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
         return () -> (toSpdz2kSInt(a)).subtract(toSpdz2kSInt(b));
@@ -70,6 +77,18 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
             new Spdz2kSubtractFromKnownProtocol<>(factory.createFromBigInteger(a), b));
       }
 
+      @Override
+      public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
+        // TODO implement
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
+        // TODO implement
+        throw new UnsupportedOperationException();
+      }
+
       @Override
       public DRes<SInt> sub(DRes<SInt> a, BigInteger b) {
         return builder.append(
@@ -86,6 +105,12 @@ public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
         return () -> toSpdz2kSInt(b).multiply(factory.createFromBigInteger(a));
       }
 
+      @Override
+      public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
+        // TODO implement
+        throw new UnsupportedOperationException();
+      }
+
       @Override
       public DRes<SInt> randomBit() {
         return builder.append(new Spdz2kRandomBitProtocol<>());

From 377a7d3f01368c72185883f316a5fa778fb39441 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 12:56:59 +0200
Subject: [PATCH 047/231] Use oint big int wrapper class

---
 .../framework/builder/numeric/Numeric.java    |  8 ++++++
 .../value/BigIntegerOIntFactory.java          |  4 +--
 .../framework/value/OIntBigInteger.java       | 25 +++++++++++++++++++
 .../fresco/lib/compare/lt/CarryOutTests.java  |  4 +--
 .../integer/binary/BinaryOperationsTests.java | 19 ++++++--------
 5 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/value/OIntBigInteger.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
index e265ccf2e..5518f254e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
@@ -165,4 +165,12 @@ default List<DRes<SInt>> known(List<BigInteger> values) {
     return secret;
   }
 
+  default DRes<List<DRes<SInt>>> knownAsDRes(List<BigInteger> values) {
+    List<DRes<SInt>> secret = new ArrayList<>(values.size());
+    for (BigInteger value : values) {
+      secret.add(known(value));
+    }
+    return () -> secret;
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
index 775a71f13..02e73b37a 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
@@ -10,12 +10,12 @@ public class BigIntegerOIntFactory implements OIntFactory {
 
   @Override
   public BigInteger toBigInteger(OInt value) {
-    return (BigInteger) value;
+    return ((OIntBigInteger) value).getValue();
   }
 
   @Override
   public OInt fromBigInteger(BigInteger value) {
-    return (OInt) value;
+    return new OIntBigInteger(value);
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntBigInteger.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntBigInteger.java
new file mode 100644
index 000000000..94c6f60f6
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntBigInteger.java
@@ -0,0 +1,25 @@
+package dk.alexandra.fresco.framework.value;
+
+import java.math.BigInteger;
+
+/**
+ * An open value wrapper for {@link BigInteger}.
+ */
+public class OIntBigInteger implements OInt {
+
+  private final BigInteger value;
+
+  public OIntBigInteger(BigInteger value) {
+    this.value = value;
+  }
+
+  public BigInteger getValue() {
+    return value;
+  }
+
+  @Override
+  public OInt out() {
+    return this;
+  }
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
index 92bd7993d..f72c64837 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
@@ -39,10 +39,10 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<BigInteger, ProtocolBuilderNumeric> app =
               root -> {
-                DRes<List<DRes<SInt>>> leftClosed = () -> root.numeric().known(right);
+                List<DRes<SInt>> leftClosed = root.numeric().known(right);
                 OIntFactory oIntFactory = root.getOIntFactory();
                 DRes<SInt> carry = root
-                    .seq(new CarryOut(() -> oIntFactory.fromBigInteger(right), leftClosed));
+                    .seq(new CarryOut(() -> oIntFactory.fromBigInteger(right), () -> leftClosed));
                 return root.numeric().open(carry);
               };
           BigInteger actual = runApplication(app);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
index 6618530c8..61cb50140 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
@@ -134,23 +134,20 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
             BigInteger.ZERO,
             BigInteger.ONE,
             BigInteger.ZERO);
-        private final List<DRes<OInt>> right = Arrays.asList(
-            () -> (OInt) BigInteger.ONE,
-            () -> (OInt) BigInteger.ONE,
-            () -> (OInt) BigInteger.ZERO,
-            () -> (OInt) BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
 
         @Override
         public void test() {
           Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
               root -> {
-                int myId = root.getBasicNumericContext().getMyId();
-                DRes<List<DRes<SInt>>> leftClosed =
-                    (myId == 1) ?
-                        root.collections().closeList(left, 1)
-                        : root.collections().closeList(left.size(), 1);
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
                 DRes<List<DRes<SInt>>> anded = root
-                    .par(new ArithmeticAndKnownRight(leftClosed, () -> right));
+                    .par(new ArithmeticAndKnownRight(leftClosed, () -> rightOInts));
                 return root.collections().openList(anded);
               };
           List<BigInteger> actual = runApplication(app).stream().map(DRes::out)

From cea5eb9d4fc9a05376522f5c5f49b7b29f9bc1ba Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 13:11:32 +0200
Subject: [PATCH 048/231] Add constants to oint factory

---
 .../value/BigIntegerOIntFactory.java          | 19 +++++++++++++++++++
 .../fresco/framework/value/OIntFactory.java   | 18 ++++++++++++++++++
 .../lib/compare/lt/BitLessThanOpen.java       |  4 +++-
 .../fresco/lib/compare/lt/CarryOut.java       |  9 +++++----
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
index 02e73b37a..31dff6229 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
@@ -8,6 +8,10 @@
  */
 public class BigIntegerOIntFactory implements OIntFactory {
 
+  private static final OInt ZERO = new OIntBigInteger(BigInteger.ZERO);
+  private static final OInt ONE = new OIntBigInteger(BigInteger.ONE);
+  private static final OInt TWO = new OIntBigInteger(BigInteger.valueOf(2));
+
   @Override
   public BigInteger toBigInteger(OInt value) {
     return ((OIntBigInteger) value).getValue();
@@ -18,4 +22,19 @@ public OInt fromBigInteger(BigInteger value) {
     return new OIntBigInteger(value);
   }
 
+  @Override
+  public OInt zero() {
+    return ZERO;
+  }
+
+  @Override
+  public OInt one() {
+    return ONE;
+  }
+
+  @Override
+  public OInt two() {
+    return TWO;
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
index 2c557ff19..0169b8ef3 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
@@ -37,8 +37,26 @@ default OInt fromLong(long value) {
     return fromBigInteger(BigInteger.valueOf(value));
   }
 
+  /**
+   * Default method for converting multiple instances of {@link BigInteger}.
+   */
   default List<DRes<OInt>> fromBigInteger(List<BigInteger> values) {
     return values.stream().map(this::fromBigInteger).collect(Collectors.toList());
   }
 
+  /**
+   * Returns representation of the value 0.
+   */
+  OInt zero();
+
+  /**
+   * Returns representation of the value 1.
+   */
+  OInt one();
+
+  /**
+   * Returns representation of the value 2.
+   */
+  OInt two();
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index a4eae882b..98b20bb42 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -29,6 +30,7 @@ public BitLessThanOpen(OInt openValue, List<DRes<SInt>> secretBits) {
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    OIntFactory oIntFactory = builder.getOIntFactory();
     List<DRes<SInt>> secretBits = secretBitsDef.out();
     OInt openValueA = openValueDef.out();
     int numBits = secretBits.size();
@@ -42,7 +44,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       return () -> negatedBits;
     });
     DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, BigInteger.ONE));
-    return builder.numeric().sub(BigInteger.ONE, gt);
+    return builder.numeric().subFromOpen(oIntFactory.one(), gt);
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index bc4859c0c..61dc32d25 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -6,6 +6,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticAndKnownRight;
 import java.math.BigInteger;
@@ -19,7 +20,6 @@
  */
 public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private static final BigInteger TWO = BigInteger.valueOf(2);
   private final DRes<List<DRes<OInt>>> openBitsDef;
   private final DRes<List<DRes<SInt>>> secretBitsDef;
   private final BigInteger carryIn;
@@ -48,6 +48,7 @@ public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretB
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    OIntFactory oIntFactory = builder.getOIntFactory();
     List<DRes<SInt>> secretBits = secretBitsDef.out();
     List<DRes<OInt>> openBits = openBitsDef.out();
     if (secretBits.size() != openBits.size()) {
@@ -61,12 +62,12 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
             DRes<OInt> rightBit = openBits.get(i);
             DRes<SInt> andedBit = andedBits.get(i);
             // TODO we need a logical computation directory for logical ops on arithmetic values
-            // logical xor of two bits can is leftBit + rightBit - 2 * leftBit * rightBit
+            // logical xor of two bits is leftBit + rightBit - 2 * leftBit * rightBit
             DRes<SInt> xoredBit = par.seq(seq -> {
               Numeric nb = seq.numeric();
               return nb.sub(
                   nb.addOpen(rightBit, leftBit),
-                  nb.mult(TWO, andedBit)
+                  nb.multByOpen(oIntFactory.two(), andedBit)
               );
             });
             pairs.add(() -> new SIntPair(xoredBit, andedBit));
@@ -78,7 +79,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           SIntPair lastPair = pairs.get(lastIdx).out();
           DRes<SInt> lastCarryPropagator = seq.numeric().add(
               lastPair.getSecond(),
-              seq.numeric().mult(carryIn, lastPair.getFirst()));
+              seq.numeric().multByOpen(oIntFactory.fromBigInteger(carryIn), lastPair.getFirst()));
           pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
           Collections.reverse(pairs);
           return seq.seq(new PreCarryBits(() -> pairs));

From cfb1438a13365471cdcbc9a158daf7c9566a37da Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 13:22:02 +0200
Subject: [PATCH 049/231] Minor changes mod2m

---
 .../alexandra/fresco/lib/math/integer/mod/Mod2m.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index 87d4770ea..123aa4f3e 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -18,6 +18,7 @@
  */
 public class Mod2m implements Computation<SInt, ProtocolBuilderNumeric> {
 
+  private static final BigInteger TWO = new BigInteger("2");
   private final DRes<SInt> input;
   private final int m;
   private final int k;
@@ -55,7 +56,6 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     if (m >= k) {
       return input;
     }
-    BigInteger two = new BigInteger("2");
     List<DRes<SInt>> randomBits = Stream.generate(() -> builder.numeric()
         .randomBit()).limit(k + kappa).collect(Collectors.toList());
     DRes<List<DRes<SInt>>> rList = getDeferedList(builder, randomBits, k
@@ -66,13 +66,13 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<SInt> rPrime = builder.advancedNumeric().sum(rPrimeList);
 
     DRes<SInt> temp = builder.numeric().add(input, r);
-    DRes<BigInteger> c = builder.numeric().open(builder.numeric().add(two.pow(k
+    DRes<BigInteger> c = builder.numeric().open(builder.numeric().add(TWO.pow(k
         - 1), temp));
     return builder.seq(seq -> {
-      BigInteger cPrime = c.out().mod(two.pow(m));
+      BigInteger cPrime = c.out().mod(TWO.pow(m));
       OInt cPrimeOInt = seq.getOIntFactory().fromBigInteger(cPrime);
-      DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrimeOInt, () -> randomBits.subList(0, m)));
-      return seq.numeric().add(seq.numeric().mult(two.pow(m), u),
+      DRes<SInt> u = seq.seq(new BitLessThanOpen(cPrimeOInt, () -> randomBits.subList(0, m)));
+      return seq.numeric().add(seq.numeric().mult(TWO.pow(m), u),
           seq.numeric().sub(cPrime, rPrime));
     });
 

From c79a88cc29a4b031cd9ca87a965dc9d7ad7f158d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 13:24:24 +0200
Subject: [PATCH 050/231] Fix comment

---
 .../java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 61dc32d25..e377e7a44 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -15,8 +15,8 @@
 import java.util.List;
 
 /**
- * Given values a and b represented as bits, computes if a + b overflows, i.e., if there is a
- * carry.
+ * Given values a and b represented as bits, computes if a + b overflows, i.e., if the addition
+ * results in a carry.
  */
 public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 

From b4e2d5eae7d7496587bdd53bb7d552caa116974a Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 15:06:30 +0200
Subject: [PATCH 051/231] Add oints to spdz2k

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  3 +-
 .../suite/spdz2k/datatypes/CompUInt.java      |  4 +-
 .../suite/spdz2k/datatypes/CompUInt128.java   |  6 +++
 .../suite/spdz2k/datatypes/CompUInt96.java    |  6 +++
 .../spdz2k/datatypes/CompUIntFactory.java     | 35 +++++++++++++++-
 .../spdz2k/datatypes/CompUIntOIntFactory.java | 40 +++++++++++++++++++
 .../spdz2k/datatypes/GenericCompUInt.java     |  6 +++
 7 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 6382c0e01..f65418972 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -152,8 +152,7 @@ public MiscBigIntegerGenerators getBigIntegerHelper() {
 
   @Override
   public OIntFactory getOIntFactory() {
-    // TODO implement
-    throw new UnsupportedOperationException();
+    return factory;
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 93baf009b..748c126e2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -1,5 +1,7 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
+import dk.alexandra.fresco.framework.value.OInt;
+
 /**
  * An unsigned integer conceptually composed of two other unsigned integers. <p>Composite integers
  * have a bit length of t = s + k, where the s most significant bits can be viewed as a s-bit
@@ -9,7 +11,7 @@
 public interface CompUInt<
     HighT extends UInt<HighT>,
     LowT extends UInt<LowT>,
-    CompT extends UInt<CompT>> extends UInt<CompT> {
+    CompT extends UInt<CompT>> extends UInt<CompT>, OInt {
 
   /**
    * Get the s most significant bits as an unsigned integer of type {@link HighT}.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 93db9ec63..87068bb62 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
+import dk.alexandra.fresco.framework.value.OInt;
 import java.math.BigInteger;
 
 /**
@@ -196,6 +197,11 @@ public byte[] toByteArray() {
     return bytes;
   }
 
+  @Override
+  public OInt out() {
+    return this;
+  }
+
   private void toByteArrayLong(byte[] bytes, int start, long value) {
     int offset = bytes.length - start - 1;
     for (int i = 0; i < 8; i++) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index ae22a2ed4..0b8883792 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
+import dk.alexandra.fresco.framework.value.OInt;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -192,4 +193,9 @@ public byte[] toByteArray() {
     return buffer.array();
   }
 
+  @Override
+  public OInt out() {
+    return this;
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index 1ae28d4a2..06ed6f520 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -1,12 +1,35 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
 import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import java.math.BigInteger;
 
 /**
  * Factory for {@link CompT} instances.
  */
-public interface CompUIntFactory<CompT extends CompUInt<?, ?, CompT>> {
+public interface CompUIntFactory<CompT extends CompUInt<?, ?, CompT>> extends OIntFactory {
+
+  @Override
+  default BigInteger toBigInteger(OInt value) {
+    return ((CompUInt) value).toBigInteger();
+  }
+
+  @Override
+  default long toLong(OInt value) {
+    return ((CompUInt) value).toLong();
+  }
+
+  @Override
+  default OInt fromBigInteger(BigInteger value) {
+    return createFromBigInteger(value);
+  }
+
+  @Override
+  default OInt fromLong(long value) {
+    // TODO rethink this
+    return fromBigInteger(BigInteger.valueOf(value));
+  }
 
   /**
    * Creates new {@link CompT} from a raw array of bytes.
@@ -53,5 +76,13 @@ default CompT createFromBigInteger(BigInteger value) {
   default CompT zero() {
     return createFromBytes(new byte[getCompositeBitLength() / Byte.SIZE]);
   }
-  
+
+  default CompT one() {
+    return createFromBigInteger(BigInteger.ONE);
+  }
+
+  default CompT two() {
+    return createFromBigInteger(BigInteger.valueOf(2));
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java
new file mode 100644
index 000000000..3d045da30
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java
@@ -0,0 +1,40 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntFactory;
+import java.math.BigInteger;
+
+public class CompUIntOIntFactory<CompT extends CompUInt<?, ?, CompT>> implements OIntFactory {
+
+  private final CompUIntFactory<CompT> factory;
+
+  public CompUIntOIntFactory(
+      CompUIntFactory<CompT> factory) {
+    this.factory = factory;
+  }
+
+  @Override
+  public BigInteger toBigInteger(OInt value) {
+    return ((CompUInt) value).toBigInteger();
+  }
+
+  @Override
+  public OInt fromBigInteger(BigInteger value) {
+    return factory.createFromBigInteger(value);
+  }
+
+  @Override
+  public OInt zero() {
+    return null;
+  }
+
+  @Override
+  public OInt one() {
+    return null;
+  }
+
+  @Override
+  public OInt two() {
+    return null;
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java
index ac6303390..6b159439c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
+import dk.alexandra.fresco.framework.value.OInt;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -165,6 +166,11 @@ public String toString() {
     return toBigInteger().toString();
   }
 
+  @Override
+  public OInt out() {
+    return this;
+  }
+
   private GenericCompUInt one() {
     // TODO cache this
     int[] temp = new int[getCompositeBitLength() / Integer.SIZE];

From 6a93830c8af24248cd9232fbd31699ddea415daa Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 15:11:53 +0200
Subject: [PATCH 052/231] Remove generic compuint

---
 .../spdz2k/Spdz2kProtocolSuiteGeneric.java    |  16 -
 .../datatypes/CompUIntConverterGeneric.java   |  28 --
 .../spdz2k/datatypes/GenericCompUInt.java     | 216 ------------
 .../datatypes/GenericCompUIntFactory.java     |  46 ---
 .../TestSpdz2kBasicArithmeticGeneric.java     |  38 ---
 .../spdz2k/datatypes/TestGenericCompUInt.java | 318 ------------------
 .../storage/TestSpdz2kDummyDataSupplier.java  |  88 ++---
 .../suite/spdz2k/util/TestUIntSerializer.java |  19 +-
 8 files changed, 53 insertions(+), 716 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuiteGeneric.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverterGeneric.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUIntFactory.java
 delete mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmeticGeneric.java
 delete mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestGenericCompUInt.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuiteGeneric.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuiteGeneric.java
deleted file mode 100644
index 009167ada..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuiteGeneric.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k;
-
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverterGeneric;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.GenericCompUInt;
-
-/**
- * Protocol suite using {@link GenericCompUInt} as the underlying plain-value type.
- */
-public class Spdz2kProtocolSuiteGeneric extends
-    Spdz2kProtocolSuite<GenericCompUInt, GenericCompUInt, GenericCompUInt> {
-
-  Spdz2kProtocolSuiteGeneric(int highBitLength, int lowBitLength) {
-    super(new CompUIntConverterGeneric(highBitLength, lowBitLength));
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverterGeneric.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverterGeneric.java
deleted file mode 100644
index 7b9d0b050..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverterGeneric.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-public class CompUIntConverterGeneric implements
-    CompUIntConverter<GenericCompUInt, GenericCompUInt, GenericCompUInt> {
-
-  private final int highBitLength;
-  private final int lowBitLength;
-
-  public CompUIntConverterGeneric(int highBitLength, int lowBitLength) {
-    this.highBitLength = highBitLength;
-    this.lowBitLength = lowBitLength;
-  }
-
-  @Override
-  public GenericCompUInt createFromHigh(GenericCompUInt value) {
-    return new GenericCompUInt(value, getCompositeBitLength());
-  }
-
-  @Override
-  public GenericCompUInt createFromLow(GenericCompUInt value) {
-    return new GenericCompUInt(value, getCompositeBitLength());
-  }
-
-  private int getCompositeBitLength() {
-    return highBitLength + lowBitLength;
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java
deleted file mode 100644
index 6b159439c..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUInt.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-import dk.alexandra.fresco.framework.value.OInt;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
-import java.util.Arrays;
-
-/**
- * Implementation of {@link CompUInt} that allows for any size least-significant and
- * most-significant bit portion. <p>Note that this class is a lot slower than dedicated
- * implementations such as {@link CompUInt128}.</p>
- */
-public class GenericCompUInt implements
-    CompUInt<GenericCompUInt, GenericCompUInt, GenericCompUInt> {
-
-  private final int lowBitLength;
-  private final int[] ints;
-
-  GenericCompUInt(final int[] ints, int lowBitLength) {
-    this.lowBitLength = lowBitLength;
-    this.ints = ints;
-  }
-
-  GenericCompUInt(int low, int requiredBitLength) {
-    this(initIntArray(low, requiredBitLength));
-  }
-
-  GenericCompUInt(final int[] ints) {
-    this(ints, ints.length / 2 * Integer.SIZE);
-  }
-
-  GenericCompUInt(GenericCompUInt other, int requiredBitLength) {
-    this(pad(other.ints, requiredBitLength));
-  }
-
-  GenericCompUInt(byte[] bytes, int requiredBitLength) {
-    this(toIntArray(bytes, requiredBitLength));
-  }
-
-  GenericCompUInt(BigInteger value, int requiredBitLength) {
-    this(value.toByteArray(), requiredBitLength);
-  }
-
-  @Override
-  public GenericCompUInt add(final GenericCompUInt other) {
-    final int[] resultInts = new int[ints.length];
-    long carry = 0;
-    // big-endian, so reverse order
-    for (int l = ints.length - 1; l >= 0; l--) {
-      final long sum = UInt.toUnLong(ints[l]) + UInt.toUnLong(other.ints[l]) + carry;
-      resultInts[l] = (int) sum;
-      carry = sum >>> 32;
-    }
-    return new GenericCompUInt(resultInts);
-  }
-
-  @Override
-  public GenericCompUInt multiply(final GenericCompUInt other) {
-    // note that we assume that other has the same bit-length as this
-    final int[] resultInts = new int[ints.length];
-    for (int l = ints.length - 1; l >= 0; l--) {
-      long carry = 0;
-      int resIdxOffset = l;
-      for (int r = ints.length - 1; r >= 0 && resIdxOffset >= 0; r--, resIdxOffset--) {
-        final long product = UInt.toUnLong(ints[l]) * UInt.toUnLong(other.ints[r])
-            + UInt.toUnLong(resultInts[resIdxOffset]) + carry;
-        carry = product >>> 32;
-        resultInts[resIdxOffset] = (int) product;
-      }
-    }
-    return new GenericCompUInt(resultInts);
-  }
-
-  @Override
-  public GenericCompUInt subtract(GenericCompUInt other) {
-    return this.add(other.negate());
-  }
-
-  @Override
-  public GenericCompUInt negate() {
-    int[] reversed = new int[ints.length];
-    for (int i = 0; i < reversed.length; i++) {
-      reversed[i] = ~ints[i];
-    }
-    return new GenericCompUInt(reversed).add(one());
-  }
-
-  @Override
-  public boolean isZero() {
-    for (int val : ints) {
-      if (val != 0) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  public int getBitLength() {
-    return ints.length * Integer.SIZE;
-  }
-
-  @Override
-  public byte[] toByteArray() {
-    ByteBuffer buffer = ByteBuffer.allocate(getBitLength() / Byte.SIZE);
-    IntBuffer intBuffer = buffer.asIntBuffer();
-    intBuffer.put(ints);
-    return buffer.array();
-  }
-
-  @Override
-  public BigInteger toBigInteger() {
-    return new BigInteger(1, toByteArray());
-  }
-
-  @Override
-  public GenericCompUInt getLeastSignificant() {
-    return getSubRange(0, getLowBitLength() / Integer.SIZE);
-  }
-
-  @Override
-  public GenericCompUInt getLeastSignificantAsHigh() {
-    return getSubRange(0, getHighBitLength() / Integer.SIZE);
-  }
-
-  @Override
-  public GenericCompUInt getMostSignificant() {
-    return getSubRange(getLowBitLength() / Integer.SIZE, getCompositeBitLength() / Integer.SIZE);
-  }
-
-  @Override
-  public long toLong() {
-    return (UInt.toUnLong(ints[ints.length - 2]) << 32) + UInt.toUnLong(ints[ints.length - 1]);
-  }
-
-  @Override
-  public int toInt() {
-    return ints[ints.length - 1];
-  }
-
-  @Override
-  public GenericCompUInt shiftLowIntoHigh() {
-    int[] shifted = new int[ints.length];
-    int smallerByteLength = Integer.min(getLowBitLength(), getHighBitLength()) / Integer.SIZE;
-    int lowByteLength = getLowBitLength() / Integer.SIZE;
-    for (int i = 0; i < smallerByteLength; i++) {
-      shifted[shifted.length - (lowByteLength + i + 1)] = ints[shifted.length - i - 1];
-    }
-    return new GenericCompUInt(shifted);
-  }
-
-  @Override
-  public int getLowBitLength() {
-    return lowBitLength;
-  }
-
-  @Override
-  public int getHighBitLength() {
-    return ints.length * Integer.SIZE - getLowBitLength();
-  }
-
-  @Override
-  public String toString() {
-    return toBigInteger().toString();
-  }
-
-  @Override
-  public OInt out() {
-    return this;
-  }
-
-  private GenericCompUInt one() {
-    // TODO cache this
-    int[] temp = new int[getCompositeBitLength() / Integer.SIZE];
-    temp[temp.length - 1] = 1;
-    return new GenericCompUInt(temp);
-  }
-
-  private GenericCompUInt getSubRange(int from, int to) {
-    return new GenericCompUInt(getIntSubRange(from, to));
-  }
-
-  private int[] getIntSubRange(int from, int to) {
-    // big-endian order so need to flip indexes
-    int fromFlipped = ints.length - from - (to - from);
-    int toFlipped = ints.length - from;
-    return Arrays.copyOfRange(ints, fromFlipped, toFlipped);
-  }
-
-  private static int[] toIntArray(byte[] bytes, int requiredBitLength) {
-    IntBuffer intBuf =
-        ByteBuffer.wrap(CompUInt.pad(bytes, requiredBitLength))
-            .order(ByteOrder.BIG_ENDIAN)
-            .asIntBuffer();
-    int[] array = new int[intBuf.remaining()];
-    intBuf.get(array);
-    return array;
-  }
-
-  private static int[] pad(int[] ints, int requiredBitLength) {
-    int byteLength = requiredBitLength / Integer.SIZE;
-    int[] padded = new int[byteLength];
-    // assuming ints is shorter than required length
-    System.arraycopy(ints, 0, padded, byteLength - ints.length, ints.length);
-    return padded;
-  }
-
-  private static int[] initIntArray(int value, int requiredBitLength) {
-    int[] temp = new int[requiredBitLength / Integer.SIZE];
-    temp[temp.length - 1] = value;
-    return temp;
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUIntFactory.java
deleted file mode 100644
index b648fdb8a..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/GenericCompUIntFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
-import dk.alexandra.fresco.suite.spdz2k.util.UIntSerializer;
-import java.security.SecureRandom;
-
-public class GenericCompUIntFactory implements
-    CompUIntFactory<GenericCompUInt> {
-
-  private final SecureRandom random = new SecureRandom();
-  private final int highBitLength;
-  private final int lowBitLength;
-
-  public GenericCompUIntFactory(int highBitLength, int lowBitLength) {
-    this.highBitLength = highBitLength;
-    this.lowBitLength = lowBitLength;
-  }
-
-  @Override
-  public GenericCompUInt createFromBytes(byte[] bytes) {
-    return new GenericCompUInt(bytes, getCompositeBitLength());
-  }
-
-  @Override
-  public GenericCompUInt createRandom() {
-    byte[] bytes = new byte[getCompositeBitLength() / Byte.SIZE];
-    this.random.nextBytes(bytes);
-    return createFromBytes(bytes);
-  }
-
-  @Override
-  public ByteSerializer<GenericCompUInt> createSerializer() {
-    return new UIntSerializer<>(this);
-  }
-
-  @Override
-  public int getLowBitLength() {
-    return lowBitLength;
-  }
-
-  @Override
-  public int getHighBitLength() {
-    return highBitLength;
-  }
-
-}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmeticGeneric.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmeticGeneric.java
deleted file mode 100644
index 6bb9a5381..000000000
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmeticGeneric.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k;
-
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.util.AesCtrDrbg;
-import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.GenericCompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.GenericCompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
-import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
-import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
-import java.util.function.Supplier;
-
-public class TestSpdz2kBasicArithmeticGeneric extends
-    Spdz2kTestSuite<Spdz2kResourcePool<GenericCompUInt>> {
-
-  @Override
-  protected Spdz2kResourcePool<GenericCompUInt> createResourcePool(int playerId, int noOfParties,
-      Supplier<Network> networkSupplier) {
-    CompUIntFactory<GenericCompUInt> factory = new GenericCompUIntFactory(32, 32);
-    Spdz2kResourcePool<GenericCompUInt> resourcePool =
-        new Spdz2kResourcePoolImpl<>(
-            playerId,
-            noOfParties, null,
-            new Spdz2kOpenedValueStoreImpl<>(),
-            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, factory.createRandom(), factory),
-            factory);
-    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
-    return resourcePool;
-  }
-
-  @Override
-  protected ProtocolSuiteNumeric<Spdz2kResourcePool<GenericCompUInt>> createProtocolSuite() {
-    return new Spdz2kProtocolSuiteGeneric(32, 32);
-  }
-
-}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestGenericCompUInt.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestGenericCompUInt.java
deleted file mode 100644
index 1e036bc19..000000000
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestGenericCompUInt.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigInteger;
-import java.util.Random;
-import org.junit.Test;
-
-public class TestGenericCompUInt {
-
-  private final BigInteger two = BigInteger.valueOf(2);
-  private final BigInteger twoTo32 = BigInteger.ONE.shiftLeft(32);
-  private final BigInteger twoTo64 = BigInteger.ONE.shiftLeft(64);
-  private final BigInteger twoTo128 = BigInteger.ONE.shiftLeft(128);
-
-  @Test
-  public void testConstruct() {
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(BigInteger.ZERO, 128).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new GenericCompUInt(BigInteger.ONE, 128).toBigInteger()
-    );
-    assertEquals(
-        new BigInteger("42"),
-        new GenericCompUInt(new BigInteger("42"), 128).toBigInteger()
-    );
-    assertEquals(
-        twoTo32,
-        new GenericCompUInt(twoTo32, 128).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.subtract(BigInteger.ONE),
-        new GenericCompUInt(twoTo32.subtract(BigInteger.ONE), 128).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.add(BigInteger.ONE),
-        new GenericCompUInt(twoTo32.add(BigInteger.ONE), 128).toBigInteger()
-    );
-    assertEquals(
-        twoTo64.subtract(BigInteger.ONE),
-        new GenericCompUInt(twoTo64.subtract(BigInteger.ONE), 128).toBigInteger()
-    );
-    assertEquals(
-        twoTo64,
-        new GenericCompUInt(twoTo64, 128).toBigInteger()
-    );
-    assertEquals(
-        twoTo64.add(BigInteger.ONE),
-        new GenericCompUInt(twoTo64.add(BigInteger.ONE), 128).toBigInteger()
-    );
-    assertEquals(
-        twoTo128.subtract(BigInteger.ONE),
-        new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128).toBigInteger()
-    );
-  }
-
-  @Test
-  public void testAdd() {
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(0, 128).add(new GenericCompUInt(0, 128)).toBigInteger()
-    );
-    assertEquals(
-        two,
-        new GenericCompUInt(1, 128).add(new GenericCompUInt(1, 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo32,
-        new GenericCompUInt(twoTo32, 128).add(new GenericCompUInt(0, 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.add(BigInteger.ONE),
-        new GenericCompUInt(twoTo32, 128).add(new GenericCompUInt(1, 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo64,
-        new GenericCompUInt(twoTo64, 128).add(new GenericCompUInt(0, 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo64.add(BigInteger.ONE),
-        new GenericCompUInt(twoTo64, 128).add(new GenericCompUInt(1, 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo128.subtract(BigInteger.ONE),
-        new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128).add(new GenericCompUInt(0, 128))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128)
-            .add(new GenericCompUInt(BigInteger.ONE, 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo128.subtract(new BigInteger("10000000")).add(twoTo32.add(twoTo64)).mod(twoTo128),
-        new GenericCompUInt(twoTo128.subtract(new BigInteger("10000000")), 128)
-            .add(new GenericCompUInt(twoTo32.add(twoTo64), 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.add(twoTo64).mod(twoTo128),
-        new GenericCompUInt(twoTo32, 128).add(new GenericCompUInt(twoTo64, 128)).toBigInteger()
-    );
-  }
-
-  @Test
-  public void testMultiply() {
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(0, 128).multiply(new GenericCompUInt(0, 128)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(1, 128).multiply(new GenericCompUInt(0, 128)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(0, 128).multiply(new GenericCompUInt(1, 128)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(1024, 128).multiply(new GenericCompUInt(0, 128)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128)
-            .multiply(new GenericCompUInt(0, 128))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new GenericCompUInt(1, 128).multiply(new GenericCompUInt(1, 128)).toBigInteger()
-    );
-    assertEquals(
-        twoTo128.subtract(BigInteger.ONE),
-        new GenericCompUInt(1, 128)
-            .multiply(new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128))
-            .toBigInteger()
-    );
-    assertEquals(
-        twoTo128.subtract(BigInteger.ONE),
-        new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128)
-            .multiply(new GenericCompUInt(1, 128))
-            .toBigInteger()
-    );
-    // multiply no overflow
-    assertEquals(
-        new BigInteger("42").multiply(new BigInteger("7")),
-        new GenericCompUInt(new BigInteger("42"), 128)
-            .multiply(new GenericCompUInt(new BigInteger("7"), 128))
-            .toBigInteger()
-    );
-    // multiply with overflow
-    assertEquals(
-        new BigInteger("42").multiply(twoTo128.subtract(BigInteger.ONE)).mod(twoTo128),
-        new GenericCompUInt(new BigInteger("42"), 128)
-            .multiply(new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128))
-            .toBigInteger()
-    );
-    assertEquals(
-        twoTo64.multiply(twoTo64.add(BigInteger.TEN)).mod(twoTo128),
-        new GenericCompUInt(twoTo64, 128)
-            .multiply(new GenericCompUInt(twoTo64.add(BigInteger.TEN), 128))
-            .toBigInteger()
-    );
-  }
-
-  @Test
-  public void testNegate() {
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(BigInteger.ZERO, 128).negate().toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new GenericCompUInt(twoTo128.subtract(BigInteger.ONE), 128).negate().toBigInteger()
-    );
-    assertEquals(
-        two,
-        new GenericCompUInt(twoTo128.subtract(two), 128).negate().toBigInteger()
-    );
-    assertEquals(
-        twoTo128.subtract(two),
-        new GenericCompUInt(two, 128).negate().toBigInteger()
-    );
-  }
-
-  @Test
-  public void testSubtract() {
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(BigInteger.ZERO, 128)
-            .subtract(new GenericCompUInt(BigInteger.ZERO, 128))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new GenericCompUInt(BigInteger.ONE, 128).subtract(new GenericCompUInt(BigInteger.ZERO, 128))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new GenericCompUInt(BigInteger.ONE, 128).subtract(new GenericCompUInt(BigInteger.ONE, 128))
-            .toBigInteger()
-    );
-    assertEquals(
-        twoTo128.subtract(BigInteger.ONE),
-        new GenericCompUInt(BigInteger.ONE, 128).subtract(new GenericCompUInt(two, 128))
-            .toBigInteger()
-    );
-  }
-
-  @Test
-  public void testToByteArrayWithPadding() {
-    byte[] bytes = new byte[]{0x42};
-    UInt<GenericCompUInt> uint = new GenericCompUInt(bytes, 128);
-    byte[] expected = new byte[16];
-    expected[expected.length - 1] = 0x42;
-    byte[] actual = uint.toByteArray();
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testToByteArray() {
-    byte[] bytes = new byte[16];
-    new Random(1).nextBytes(bytes);
-    UInt<GenericCompUInt> uint = new GenericCompUInt(bytes, 128);
-    byte[] actual = uint.toByteArray();
-    assertArrayEquals(bytes, actual);
-  }
-
-  @Test
-  public void testToByteArrayMore() {
-    byte[] bytes = new byte[]{
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // high
-        0x02, 0x02, 0x02, 0x02, // mid
-        0x03, 0x03, 0x02, 0x03  // low
-    };
-    UInt<GenericCompUInt> uint = new GenericCompUInt(bytes, 128);
-    byte[] actual = uint.toByteArray();
-    assertArrayEquals(bytes, actual);
-  }
-
-  @Test
-  public void testIsZero() {
-    assertTrue(new GenericCompUInt(0, 128).isZero());
-    assertFalse(new GenericCompUInt(1, 128).isZero());
-  }
-
-  @Test
-  public void testGetSubRange() {
-    byte[] bytes = new byte[]{
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-        0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x02, 0x03
-    };
-    CompUInt<GenericCompUInt, GenericCompUInt, GenericCompUInt> uint = new GenericCompUInt(bytes,
-        128);
-    GenericCompUInt subLow = uint.getLeastSignificant();
-    byte[] expectedSubRangeBytesLow = new byte[]{
-        0x02, 0x02, 0x02, 0x02,
-        0x03, 0x03, 0x02, 0x03
-    };
-    assertArrayEquals(expectedSubRangeBytesLow, subLow.toByteArray());
-    GenericCompUInt subHigh = uint.getMostSignificant();
-    byte[] expectedSubRangeBytesHigh = new byte[]{
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-    };
-    assertArrayEquals(expectedSubRangeBytesHigh, subHigh.toByteArray());
-  }
-
-  @Test
-  public void testGetBitLengths() {
-    GenericCompUInt uint3232 = new GenericCompUInt(new int[]{1, 0});
-    assertEquals(32, uint3232.getHighBitLength());
-    assertEquals(32, uint3232.getLowBitLength());
-    assertEquals(64, uint3232.getCompositeBitLength());
-    GenericCompUInt uint6432 = new GenericCompUInt(new int[]{2, 1, 0}, 32);
-    assertEquals(64, uint6432.getHighBitLength());
-    assertEquals(32, uint6432.getLowBitLength());
-    assertEquals(96, uint6432.getCompositeBitLength());
-  }
-
-  @Test
-  public void testShiftLowIntoHigh() {
-    GenericCompUInt uint3232 = new GenericCompUInt(new int[]{2, 1});
-    assertEquals(new GenericCompUInt(new int[]{1, 0}).toBigInteger(),
-        uint3232.shiftLowIntoHigh().toBigInteger());
-    GenericCompUInt uint6432 = new GenericCompUInt(new int[]{3, 2, 1}, 32);
-    assertEquals(new GenericCompUInt(new int[]{0, 1, 0}).toBigInteger(),
-        uint6432.shiftLowIntoHigh().toBigInteger());
-    GenericCompUInt uint3264 = new GenericCompUInt(new int[]{3, 2, 1}, 64);
-    assertEquals(new GenericCompUInt(new int[]{1, 0, 0}).toBigInteger(),
-        uint3264.shiftLowIntoHigh().toBigInteger());
-  }
-
-  @Test
-  public void testToInt() {
-    GenericCompUInt uint3232 = new GenericCompUInt(new int[]{1111});
-    assertEquals(1111, uint3232.toInt());
-  }
-
-  @Test
-  public void testToLong() {
-    GenericCompUInt uint3232 = new GenericCompUInt(new int[]{122, 1111});
-    assertEquals(523986011223L, uint3232.toLong());
-  }
-
-  @Test
-  public void testToString() {
-    GenericCompUInt uint3232 = new GenericCompUInt(new int[]{122, 1111});
-    assertEquals("523986011223", uint3232.toString());
-  }
-
-}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
index 4965502f5..9c57d2475 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
@@ -5,12 +5,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.GenericCompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.GenericCompUIntFactory;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,26 +20,26 @@
 public class TestSpdz2kDummyDataSupplier {
 
   private void testGetNextRandomElementShare(int noOfParties) {
-    List<Spdz2kDataSupplier<GenericCompUInt>> suppliers = setupSuppliers(noOfParties);
-    GenericCompUInt macKey = getMacKeyFromSuppliers(suppliers);
-    List<Spdz2kSInt<GenericCompUInt>> shares = new ArrayList<>(noOfParties);
-    for (Spdz2kDataSupplier<GenericCompUInt> supplier : suppliers) {
+    List<Spdz2kDataSupplier<CompUInt128>> suppliers = setupSuppliers(noOfParties);
+    CompUInt128 macKey = getMacKeyFromSuppliers(suppliers);
+    List<Spdz2kSInt<CompUInt128>> shares = new ArrayList<>(noOfParties);
+    for (Spdz2kDataSupplier<CompUInt128> supplier : suppliers) {
       shares.add(supplier.getNextRandomElementShare());
     }
-    Spdz2kSInt<GenericCompUInt> recombined = recombine(shares);
+    Spdz2kSInt<CompUInt128> recombined = recombine(shares);
     assertFalse("Random value was 0 ",
         recombined.getShare().toBigInteger().equals(BigInteger.ZERO));
     assertMacCorrect(recombined, macKey);
   }
 
   private void testGetNextBitShare(int noOfParties) {
-    List<Spdz2kDataSupplier<GenericCompUInt>> suppliers = setupSuppliers(noOfParties);
-    GenericCompUInt macKey = getMacKeyFromSuppliers(suppliers);
-    List<Spdz2kSInt<GenericCompUInt>> shares = new ArrayList<>(noOfParties);
-    for (Spdz2kDataSupplier<GenericCompUInt> supplier : suppliers) {
+    List<Spdz2kDataSupplier<CompUInt128>> suppliers = setupSuppliers(noOfParties);
+    CompUInt128 macKey = getMacKeyFromSuppliers(suppliers);
+    List<Spdz2kSInt<CompUInt128>> shares = new ArrayList<>(noOfParties);
+    for (Spdz2kDataSupplier<CompUInt128> supplier : suppliers) {
       shares.add(supplier.getNextBitShare());
     }
-    Spdz2kSInt<GenericCompUInt> recombined = recombine(shares);
+    Spdz2kSInt<CompUInt128> recombined = recombine(shares);
     BigInteger asBitInt = recombined.getShare().toBigInteger();
     assertTrue("Not a bit " + asBitInt,
         asBitInt.equals(BigInteger.ZERO) || asBitInt.equals(BigInteger.ONE));
@@ -47,16 +47,16 @@ private void testGetNextBitShare(int noOfParties) {
   }
 
   private void testGetInputMask(int noOfParties, int towardParty) {
-    List<Spdz2kDataSupplier<GenericCompUInt>> suppliers = setupSuppliers(noOfParties);
-    GenericCompUInt macKey = getMacKeyFromSuppliers(suppliers);
-    List<Spdz2kInputMask<GenericCompUInt>> masks = new ArrayList<>(noOfParties);
-    for (Spdz2kDataSupplier<GenericCompUInt> supplier : suppliers) {
+    List<Spdz2kDataSupplier<CompUInt128>> suppliers = setupSuppliers(noOfParties);
+    CompUInt128 macKey = getMacKeyFromSuppliers(suppliers);
+    List<Spdz2kInputMask<CompUInt128>> masks = new ArrayList<>(noOfParties);
+    for (Spdz2kDataSupplier<CompUInt128> supplier : suppliers) {
       masks.add(supplier.getNextInputMask(towardParty));
     }
-    GenericCompUInt realValue = null;
-    List<Spdz2kSInt<GenericCompUInt>> shares = new ArrayList<>(noOfParties);
+    CompUInt128 realValue = null;
+    List<Spdz2kSInt<CompUInt128>> shares = new ArrayList<>(noOfParties);
     for (int i = 1; i <= noOfParties; i++) {
-      Spdz2kInputMask<GenericCompUInt> inputMask = masks.get(i - 1);
+      Spdz2kInputMask<CompUInt128> inputMask = masks.get(i - 1);
       if (i != towardParty) {
         assertTrue(null == inputMask.getOpenValue());
       } else {
@@ -64,19 +64,19 @@ private void testGetInputMask(int noOfParties, int towardParty) {
       }
       shares.add(inputMask.getMaskShare());
     }
-    Spdz2kSInt<GenericCompUInt> recombined = recombine(shares);
+    Spdz2kSInt<CompUInt128> recombined = recombine(shares);
     assertMacCorrect(recombined, macKey);
     assertEquals(realValue.toBigInteger(), recombined.getShare().toBigInteger());
   }
 
   private void testGetNextTripleShares(int noOfParties) {
-    List<Spdz2kDataSupplier<GenericCompUInt>> suppliers = setupSuppliers(noOfParties);
-    GenericCompUInt macKey = getMacKeyFromSuppliers(suppliers);
-    List<Spdz2kTriple<GenericCompUInt>> triples = new ArrayList<>(noOfParties);
-    for (Spdz2kDataSupplier<GenericCompUInt> supplier : suppliers) {
+    List<Spdz2kDataSupplier<CompUInt128>> suppliers = setupSuppliers(noOfParties);
+    CompUInt128 macKey = getMacKeyFromSuppliers(suppliers);
+    List<Spdz2kTriple<CompUInt128>> triples = new ArrayList<>(noOfParties);
+    for (Spdz2kDataSupplier<CompUInt128> supplier : suppliers) {
       triples.add(supplier.getNextTripleShares());
     }
-    Spdz2kTriple<GenericCompUInt> recombined = recombineTriples(triples);
+    Spdz2kTriple<CompUInt128> recombined = recombineTriples(triples);
     assertTripleValid(recombined, macKey);
   }
 
@@ -111,45 +111,45 @@ public void testGetNextTripleShares() {
     testGetNextTripleShares(5);
   }
 
-  private Spdz2kSInt<GenericCompUInt> recombine(
-      List<Spdz2kSInt<GenericCompUInt>> shares) {
+  private Spdz2kSInt<CompUInt128> recombine(
+      List<Spdz2kSInt<CompUInt128>> shares) {
     return shares.stream().reduce(Spdz2kSInt::add).get();
   }
 
-  private void assertMacCorrect(Spdz2kSInt<GenericCompUInt> recombined,
-      GenericCompUInt macKey) {
+  private void assertMacCorrect(Spdz2kSInt<CompUInt128> recombined,
+      CompUInt128 macKey) {
     assertArrayEquals(
         macKey.multiply(recombined.getShare()).toByteArray(),
         recombined.getMacShare().toByteArray()
     );
   }
 
-  private List<Spdz2kDataSupplier<GenericCompUInt>> setupSuppliers(
+  private List<Spdz2kDataSupplier<CompUInt128>> setupSuppliers(
       int noOfParties) {
-    List<Spdz2kDataSupplier<GenericCompUInt>> suppliers = new ArrayList<>(
+    List<Spdz2kDataSupplier<CompUInt128>> suppliers = new ArrayList<>(
         noOfParties);
     for (int i = 0; i < noOfParties; i++) {
-      CompUIntFactory<GenericCompUInt> factory = new GenericCompUIntFactory(64, 64);
-      GenericCompUInt macKeyShare = factory.createRandom();
+      CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+      CompUInt128 macKeyShare = factory.createRandom();
       suppliers.add(new Spdz2kDummyDataSupplier<>(i + 1, noOfParties, macKeyShare,
           factory));
     }
     return suppliers;
   }
 
-  private GenericCompUInt getMacKeyFromSuppliers(
-      List<Spdz2kDataSupplier<GenericCompUInt>> suppliers) {
+  private CompUInt128 getMacKeyFromSuppliers(
+      List<Spdz2kDataSupplier<CompUInt128>> suppliers) {
     return suppliers.stream()
         .map(Spdz2kDataSupplier::getSecretSharedKey)
-        .reduce(GenericCompUInt::add).get();
+        .reduce(CompUInt128::add).get();
   }
 
-  private Spdz2kTriple<GenericCompUInt> recombineTriples(
-      List<Spdz2kTriple<GenericCompUInt>> triples) {
-    List<Spdz2kSInt<GenericCompUInt>> left = new ArrayList<>(triples.size());
-    List<Spdz2kSInt<GenericCompUInt>> right = new ArrayList<>(triples.size());
-    List<Spdz2kSInt<GenericCompUInt>> product = new ArrayList<>(triples.size());
-    for (Spdz2kTriple<GenericCompUInt> triple : triples) {
+  private Spdz2kTriple<CompUInt128> recombineTriples(
+      List<Spdz2kTriple<CompUInt128>> triples) {
+    List<Spdz2kSInt<CompUInt128>> left = new ArrayList<>(triples.size());
+    List<Spdz2kSInt<CompUInt128>> right = new ArrayList<>(triples.size());
+    List<Spdz2kSInt<CompUInt128>> product = new ArrayList<>(triples.size());
+    for (Spdz2kTriple<CompUInt128> triple : triples) {
       left.add(triple.getLeft());
       right.add(triple.getRight());
       product.add(triple.getProduct());
@@ -157,7 +157,7 @@ private Spdz2kTriple<GenericCompUInt> recombineTriples(
     return new Spdz2kTriple<>(recombine(left), recombine(right), recombine(product));
   }
 
-  private void assertTripleValid(Spdz2kTriple<GenericCompUInt> recombined, GenericCompUInt macKey) {
+  private void assertTripleValid(Spdz2kTriple<CompUInt128> recombined, CompUInt128 macKey) {
     assertMacCorrect(recombined.getLeft(), macKey);
     assertMacCorrect(recombined.getRight(), macKey);
     assertMacCorrect(recombined.getRight(), macKey);
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/util/TestUIntSerializer.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/util/TestUIntSerializer.java
index 60b582912..cab6ea0eb 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/util/TestUIntSerializer.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/util/TestUIntSerializer.java
@@ -4,9 +4,9 @@
 import static org.junit.Assert.assertEquals;
 
 import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.GenericCompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.GenericCompUIntFactory;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
@@ -14,8 +14,8 @@
 
 public class TestUIntSerializer {
 
-  private final CompUIntFactory<GenericCompUInt> factory = new GenericCompUIntFactory(64, 64);
-  private final ByteSerializer<GenericCompUInt> serializer = new UIntSerializer<>(factory);
+  private final CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+  private final ByteSerializer<CompUInt128> serializer = new UIntSerializer<>(factory);
 
   @Test
   public void testSerialize() {
@@ -24,7 +24,7 @@ public void testSerialize() {
     rawBytes[1] = 0x02;
     rawBytes[2] = 0x03;
     rawBytes[15] = 0x16;
-    GenericCompUInt element = factory.createFromBytes(rawBytes);
+    CompUInt128 element = factory.createFromBytes(rawBytes);
     assertArrayEquals(rawBytes, serializer.serialize(element));
   }
 
@@ -33,7 +33,7 @@ public void testSerializeList() {
     Random random = new Random(42);
     byte[] rawBytes = new byte[32];
     random.nextBytes(rawBytes);
-    List<GenericCompUInt> elements = Arrays.asList(
+    List<CompUInt128> elements = Arrays.asList(
         factory.createFromBytes(Arrays.copyOfRange(rawBytes, 0, 16)),
         factory.createFromBytes(Arrays.copyOfRange(rawBytes, 16, 32))
     );
@@ -46,7 +46,7 @@ public void testDeserialize() {
     Random random = new Random(42);
     byte[] bytes = new byte[16];
     random.nextBytes(bytes);
-    GenericCompUInt uint = serializer.deserialize(bytes);
+    CompUInt128 uint = serializer.deserialize(bytes);
     assertArrayEquals(bytes, uint.toByteArray());
   }
 
@@ -55,11 +55,11 @@ public void testDeserializeList() {
     Random random = new Random(42);
     byte[] rawBytes = new byte[32];
     random.nextBytes(rawBytes);
-    List<GenericCompUInt> expected = Arrays.asList(
+    List<CompUInt128> expected = Arrays.asList(
         factory.createFromBytes(Arrays.copyOfRange(rawBytes, 0, 16)),
         factory.createFromBytes(Arrays.copyOfRange(rawBytes, 16, 32))
     );
-    List<GenericCompUInt> actual = serializer.deserializeList(rawBytes);
+    List<CompUInt128> actual = serializer.deserializeList(rawBytes);
     assertEquals(expected.size(), actual.size());
     for (int i = 0; i < actual.size(); i++) {
       assertArrayEquals(expected.get(i).toByteArray(), actual.get(i).toByteArray());
@@ -68,7 +68,6 @@ public void testDeserializeList() {
 
   @Test(expected = IllegalArgumentException.class)
   public void testDeserializeListWrongLength() {
-    Random random = new Random(42);
     byte[] rawBytes = new byte[33];
     serializer.deserializeList(rawBytes);
   }

From 8766a3409f9766547839cb103f7ee8f485b7b16b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 15:52:16 +0200
Subject: [PATCH 053/231] WIP bit less than spdz2k

---
 .../lib/compare/lt/BitLessThanOpenTests.java  | 73 ++++++++++---------
 .../TestDummyArithmeticProtocolSuite.java     |  2 +-
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  |  6 ++
 .../spdz2k/TestSpdz2kBasicArithmetic128.java  |  8 ++
 4 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
index 568f9f171..8631143ab 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
@@ -4,8 +4,8 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.NumericResourcePool;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.MathUtils;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -20,41 +20,11 @@
 
 public class BitLessThanOpenTests {
 
-  public static class TestBitLessThanOpen<ResourcePoolT extends ResourcePool>
+  public static class TestBitLessThanOpen<ResourcePoolT extends NumericResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
-    private final int numBits;
-    private final List<BigInteger> left;
-    private final List<BigInteger> right;
-
-    public TestBitLessThanOpen(BigInteger modulus, int numBits) {
-      this.numBits = numBits;
-      Random random = new Random(42);
-      this.left = Arrays.asList(
-          BigInteger.ZERO,
-          BigInteger.ONE,
-          BigInteger.ZERO,
-          BigInteger.valueOf(5),
-          BigInteger.valueOf(111),
-          BigInteger.valueOf(111),
-          modulus.subtract(BigInteger.ONE),
-          modulus.subtract(BigInteger.ONE),
-          BigInteger.valueOf(2055014152),
-          new BigInteger(numBits, random).mod(modulus)
-      );
-      this.right = Arrays.asList(
-          BigInteger.ONE,
-          BigInteger.ZERO,
-          BigInteger.ZERO,
-          BigInteger.valueOf(4),
-          BigInteger.valueOf(111),
-          BigInteger.valueOf(112),
-          modulus.subtract(BigInteger.ONE),
-          modulus.subtract(BigInteger.valueOf(2)),
-          BigInteger.valueOf(2055014153),
-          new BigInteger(numBits, random).mod(modulus)
-      );
-    }
+    private List<BigInteger> left;
+    private List<BigInteger> right;
 
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
@@ -65,11 +35,14 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app =
               root -> {
+                int numBits = 32;
+                setupInputs(conf.getResourcePool().getModulus(), numBits);
                 int myId = root.getBasicNumericContext().getMyId();
                 List<DRes<BigInteger>> results = new ArrayList<>(left.size());
                 for (int i = 0; i < left.size(); i++) {
                   int finalI = i;
-                  DRes<OInt> leftValue = () -> root.getOIntFactory().fromBigInteger(left.get(finalI));
+                  DRes<OInt> leftValue = () -> root.getOIntFactory()
+                      .fromBigInteger(left.get(finalI));
                   DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(finalI), myId,
                       numBits);
                   results.add(
@@ -88,7 +61,35 @@ public void test() {
         }
       };
     }
-    
+
+    private void setupInputs(BigInteger modulus, int numBits) {
+      Random random = new Random(42);
+      this.left = Arrays.asList(
+          BigInteger.ZERO,
+          BigInteger.ONE,
+          BigInteger.ZERO,
+          BigInteger.valueOf(5),
+          BigInteger.valueOf(111),
+          BigInteger.valueOf(111),
+          modulus.subtract(BigInteger.ONE),
+          modulus.subtract(BigInteger.ONE),
+          BigInteger.valueOf(2055014152),
+          new BigInteger(numBits, random).mod(modulus)
+      );
+      this.right = Arrays.asList(
+          BigInteger.ONE,
+          BigInteger.ZERO,
+          BigInteger.ZERO,
+          BigInteger.valueOf(4),
+          BigInteger.valueOf(111),
+          BigInteger.valueOf(112),
+          modulus.subtract(BigInteger.ONE),
+          modulus.subtract(BigInteger.valueOf(2)),
+          BigInteger.valueOf(2055014153),
+          new BigInteger(numBits, random).mod(modulus)
+      );
+    }
+
   }
 
   private static DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root,
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 8cbf8df29..66bfb4668 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -838,7 +838,7 @@ public void testCarryOutRandom() {
   public void testBitLessThanOpen() {
     BigInteger modulus = ModulusFinder.findSuitableModulus(128);
     TestParameters parameters = new TestParameters().numParties(2).modulus(modulus);
-    runTest(new TestBitLessThanOpen<>(modulus, 64), parameters);
+    runTest(new TestBitLessThanOpen<>(), parameters);
   }
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 214e60aaf..d42a1a006 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.lib.arithmetic.BasicArithmeticTests;
 import dk.alexandra.fresco.lib.collections.io.CloseListTests.TestCloseAndOpenList;
+import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import org.junit.Test;
 
@@ -126,4 +127,9 @@ public void testRandomElement() {
         EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testBitLessThanOpen() {
+    runTest(new TestBitLessThanOpen<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
index 2cda4ebca..c10a2cb20 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
@@ -1,7 +1,9 @@
 package dk.alexandra.fresco.suite.spdz2k;
 
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
@@ -11,6 +13,7 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.util.function.Supplier;
+import org.junit.Test;
 
 public class TestSpdz2kBasicArithmetic128 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt128>> {
 
@@ -34,4 +37,9 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128();
   }
 
+  @Test
+  public void testBitLessThanOpen() {
+    runTest(new TestBitLessThanOpen<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
 }

From adc842fcb4bb7709622f1b2602935b239046338e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 15:58:45 +0200
Subject: [PATCH 054/231] Remove unused class

---
 .../spdz2k/datatypes/CompUIntOIntFactory.java | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java
deleted file mode 100644
index 3d045da30..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntOIntFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-import dk.alexandra.fresco.framework.value.OInt;
-import dk.alexandra.fresco.framework.value.OIntFactory;
-import java.math.BigInteger;
-
-public class CompUIntOIntFactory<CompT extends CompUInt<?, ?, CompT>> implements OIntFactory {
-
-  private final CompUIntFactory<CompT> factory;
-
-  public CompUIntOIntFactory(
-      CompUIntFactory<CompT> factory) {
-    this.factory = factory;
-  }
-
-  @Override
-  public BigInteger toBigInteger(OInt value) {
-    return ((CompUInt) value).toBigInteger();
-  }
-
-  @Override
-  public OInt fromBigInteger(BigInteger value) {
-    return factory.createFromBigInteger(value);
-  }
-
-  @Override
-  public OInt zero() {
-    return null;
-  }
-
-  @Override
-  public OInt one() {
-    return null;
-  }
-
-  @Override
-  public OInt two() {
-    return null;
-  }
-}

From 4b67c25600f111a0e51365214de1eef4eae79898 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 16:08:36 +0200
Subject: [PATCH 055/231] Naive compuint arithmetic

---
 .../value/BigIntegerOIntArithmetic.java       |  2 +-
 .../framework/value/OIntArithmetic.java       |  2 +-
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  4 +--
 .../spdz2k/datatypes/CompUIntArithmetic.java  | 34 +++++++++++++++++++
 .../fresco/suite/spdz2k/datatypes/UInt.java   |  7 ++++
 5 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 0410859bd..1dee906b9 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -24,7 +24,7 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
     List<DRes<OInt>> bits = new ArrayList<>(numBits);
     for (int b = 0; b < numBits; b++) {
       boolean boolBit = value.testBit(b);
-      OInt bit = factory.fromLong(boolBit ? 1 : 0);
+      OInt bit = boolBit ? factory.one() : factory.zero();
       bits.add(() -> bit);
     }
     Collections.reverse(bits);
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index e3fc79441..283963119 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -13,6 +13,6 @@ public interface OIntArithmetic {
    * smaller than numBits, the result is padded with 0s. If the bit length is larger only the first
    * numBits bits are used.</p>
    */
-  List<DRes<OInt>> toBits(OInt value, int numBits);
+  List<DRes<OInt>> toBits(OInt openValue, int numBits);
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index f65418972..6a6d6469c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -12,6 +12,7 @@
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
 import dk.alexandra.fresco.lib.real.RealNumericContext;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation;
@@ -157,8 +158,7 @@ public OIntFactory getOIntFactory() {
 
   @Override
   public OIntArithmetic getOIntArithmetic() {
-    // TODO implement
-    throw new UnsupportedOperationException();
+    return new CompUIntArithmetic<>(factory);
   }
 
   /**
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
new file mode 100644
index 000000000..525f5a079
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -0,0 +1,34 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Implementation of {@link OIntArithmetic} for {@link CompT}.
+ */
+public class CompUIntArithmetic<CompT extends CompUInt<?, ?, CompT>> implements OIntArithmetic {
+
+  private final CompUIntFactory<CompT> factory;
+
+  public CompUIntArithmetic(CompUIntFactory<CompT> factory) {
+    this.factory = factory;
+  }
+
+  @Override
+  public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
+    CompUInt value = (CompUInt) openValue;
+    List<DRes<OInt>> bits = new ArrayList<>(numBits);
+    for (int b = 0; b < numBits; b++) {
+      boolean boolBit = value.testBit(b);
+      OInt bit = boolBit ? factory.one() : factory.zero();
+      bits.add(() -> bit);
+    }
+    Collections.reverse(bits);
+    return bits;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java
index 2db729661..77ae55987 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java
@@ -60,6 +60,13 @@ public interface UInt<T extends UInt> {
    */
   int toInt();
 
+  /**
+   * Returns if bit at position is set or not.
+   */
+  default boolean testBit(int bit) {
+    return toBigInteger().testBit(bit);
+  }
+
   /**
    * Compute sum of elements.
    */

From e4f7c3738e7b91b4b106458e4be2a0780b7566e1 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 16:15:10 +0200
Subject: [PATCH 056/231] OInt numeric calls spdz2k

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java         | 14 ++++++--------
 .../suite/spdz2k/TestSpdz2kBasicArithmetic128.java |  8 --------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 6a6d6469c..e936555b0 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -63,8 +63,7 @@ public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
-        // TODO implement
-        throw new UnsupportedOperationException();
+        return builder.append(new Spdz2kAddKnownProtocol<>((PlainT) a.out(), b));
       }
 
       @Override
@@ -80,14 +79,14 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
-        // TODO implement
-        throw new UnsupportedOperationException();
+        return builder.append(
+            new Spdz2kSubtractFromKnownProtocol<>((PlainT) a.out(), b));
       }
 
       @Override
       public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
-        // TODO implement
-        throw new UnsupportedOperationException();
+        return builder.append(
+            new Spdz2kAddKnownProtocol<>(((PlainT) b.out()).negate(), a));
       }
 
       @Override
@@ -108,8 +107,7 @@ public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
-        // TODO implement
-        throw new UnsupportedOperationException();
+        return () -> toSpdz2kSInt(b).multiply((PlainT) a.out());
       }
 
       @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
index c10a2cb20..2cda4ebca 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
@@ -1,9 +1,7 @@
 package dk.alexandra.fresco.suite.spdz2k;
 
 import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
-import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
@@ -13,7 +11,6 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.util.function.Supplier;
-import org.junit.Test;
 
 public class TestSpdz2kBasicArithmetic128 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt128>> {
 
@@ -37,9 +34,4 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128();
   }
 
-  @Test
-  public void testBitLessThanOpen() {
-    runTest(new TestBitLessThanOpen<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
-  }
-
 }

From 91b4ceca41670da170991bd5dd227ecbd7fd8e13 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 16:35:31 +0200
Subject: [PATCH 057/231] Move all casts to factory

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 23 ++++++-------------
 .../spdz2k/datatypes/CompUIntFactory.java     | 18 +++++++++++++++
 .../natives/Spdz2kAddKnownProtocol.java       |  2 +-
 .../natives/Spdz2kMultiplyProtocol.java       |  8 +++----
 .../natives/Spdz2kNativeProtocol.java         | 11 ---------
 .../Spdz2kOutputSinglePartyProtocol.java      |  4 +++-
 .../natives/Spdz2kOutputToAllProtocol.java    |  4 +++-
 .../Spdz2kSubtractFromKnownProtocol.java      |  4 +++-
 8 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index e936555b0..15741fbb3 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -14,7 +14,6 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
@@ -25,7 +24,6 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomElementProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kSubtractFromKnownProtocol;
 import java.math.BigInteger;
-import java.util.Objects;
 
 /**
  * Basic native builder for the SPDZ2k protocol suite.
@@ -53,7 +51,7 @@ public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
       @Override
       public DRes<SInt> add(DRes<SInt> a, DRes<SInt> b) {
-        return () -> toSpdz2kSInt(a).add(toSpdz2kSInt(b));
+        return () -> factory.toSpdz2kSInt(a).add(factory.toSpdz2kSInt(b));
       }
 
       @Override
@@ -63,12 +61,12 @@ public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
-        return builder.append(new Spdz2kAddKnownProtocol<>((PlainT) a.out(), b));
+        return builder.append(new Spdz2kAddKnownProtocol<>(factory.fromOInt(a), b));
       }
 
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
-        return () -> (toSpdz2kSInt(a)).subtract(toSpdz2kSInt(b));
+        return () -> (factory.toSpdz2kSInt(a)).subtract(factory.toSpdz2kSInt(b));
       }
 
       @Override
@@ -80,13 +78,13 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
       @Override
       public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
         return builder.append(
-            new Spdz2kSubtractFromKnownProtocol<>((PlainT) a.out(), b));
+            new Spdz2kSubtractFromKnownProtocol<>(factory.fromOInt(a), b));
       }
 
       @Override
       public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
         return builder.append(
-            new Spdz2kAddKnownProtocol<>(((PlainT) b.out()).negate(), a));
+            new Spdz2kAddKnownProtocol<>(factory.fromOInt(b).negate(), a));
       }
 
       @Override
@@ -102,12 +100,12 @@ public DRes<SInt> mult(DRes<SInt> a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
-        return () -> toSpdz2kSInt(b).multiply(factory.createFromBigInteger(a));
+        return () -> factory.toSpdz2kSInt(b).multiply(factory.createFromBigInteger(a));
       }
 
       @Override
       public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
-        return () -> toSpdz2kSInt(b).multiply((PlainT) a.out());
+        return () -> factory.toSpdz2kSInt(b).multiply(factory.fromOInt(a));
       }
 
       @Override
@@ -159,13 +157,6 @@ public OIntArithmetic getOIntArithmetic() {
     return new CompUIntArithmetic<>(factory);
   }
 
-  /**
-   * Get result from deferred and downcast result to {@link Spdz2kSInt<PlainT>}.
-   */
-  private Spdz2kSInt<PlainT> toSpdz2kSInt(DRes<SInt> value) {
-    return Objects.requireNonNull((Spdz2kSInt<PlainT>) value.out());
-  }
-
   @Override
   public RealNumericContext getRealNumericContext() {
     // TODO Auto-generated method stub
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index 06ed6f520..dae78427e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -1,9 +1,12 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
+import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntFactory;
+import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
+import java.util.Objects;
 
 /**
  * Factory for {@link CompT} instances.
@@ -12,6 +15,7 @@ public interface CompUIntFactory<CompT extends CompUInt<?, ?, CompT>> extends OI
 
   @Override
   default BigInteger toBigInteger(OInt value) {
+    // TODO test
     return ((CompUInt) value).toBigInteger();
   }
 
@@ -31,6 +35,20 @@ default OInt fromLong(long value) {
     return fromBigInteger(BigInteger.valueOf(value));
   }
 
+  /**
+   * Get result from deferred and downcast result to {@link CompT}.
+   */
+  default CompT fromOInt(DRes<OInt> value) {
+    return (CompT) value.out();
+  }
+
+  /**
+   * Get result from deferred and downcast result to {@link Spdz2kSInt<CompT>}.
+   */
+  default Spdz2kSInt<CompT> toSpdz2kSInt(DRes<SInt> value) {
+    return Objects.requireNonNull((Spdz2kSInt<CompT>) value.out());
+  }
+
   /**
    * Creates new {@link CompT} from a raw array of bytes.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java
index 66abf9175..cb618f9c2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java
@@ -34,7 +34,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Network network) {
     Spdz2kDataSupplier<PlainT> dataSupplier = resourcePool.getDataSupplier();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    out = toSpdz2kSInt(right).addConstant(left,
+    out = factory.toSpdz2kSInt(right).addConstant(left,
         dataSupplier.getSecretSharedKey(),
         factory.zero(),
         resourcePool.getMyId() == 1);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
index 493642e34..f65eae90b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
@@ -41,16 +41,17 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Network network) {
     final PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
     ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
       triple = resourcePool.getDataSupplier().getNextTripleShares();
-      epsilon = toSpdz2kSInt(left).subtract(triple.getLeft());
-      delta = toSpdz2kSInt(right).subtract(triple.getRight());
+      epsilon = factory.toSpdz2kSInt(left).subtract(triple.getLeft());
+      delta = factory.toSpdz2kSInt(right).subtract(triple.getRight());
       network.sendToAll(epsilon.getShare().getLeastSignificant().toByteArray());
       network.sendToAll(delta.getShare().getLeastSignificant().toByteArray());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
       Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
-          resourcePool.getFactory(),
+          factory,
           resourcePool.getNoOfParties(),
           serializer);
       // compute [prod] = [c] + epsilon * [b] + delta * [a] + epsilon * delta
@@ -60,7 +61,6 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Spdz2kSInt<PlainT> tripleRight = triple.getRight();
       Spdz2kSInt<PlainT> tripleLeft = triple.getLeft();
       Spdz2kSInt<PlainT> tripleProduct = triple.getProduct();
-      CompUIntFactory<PlainT> factory = resourcePool.getFactory();
       this.product = tripleProduct
           .add(tripleRight.multiply(e))
           .add(tripleLeft.multiply(d))
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNativeProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNativeProtocol.java
index 5a222e471..abca9d49d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNativeProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNativeProtocol.java
@@ -1,12 +1,8 @@
 package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
 
-import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.NativeProtocol;
-import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import java.util.Objects;
 
 /**
  * Generic native Spdz2k protocol.
@@ -16,11 +12,4 @@ public abstract class Spdz2kNativeProtocol<
     PlainT extends CompUInt<?, ?, PlainT>> implements
     NativeProtocol<OutputT, Spdz2kResourcePool<PlainT>> {
 
-  /**
-   * Get result from deferred and downcast result to {@link Spdz2kSInt<PlainT>}.
-   */
-  Spdz2kSInt<PlainT> toSpdz2kSInt(DRes<SInt> value) {
-    return Objects.requireNonNull((Spdz2kSInt<PlainT>) value.out());
-  }
-
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
index 3ba3dd1fa..d95145d4d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
@@ -5,6 +5,7 @@
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
@@ -43,9 +44,10 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> openedValueStore = resourcePool
         .getOpenedValueStore();
     Spdz2kDataSupplier<PlainT> supplier = resourcePool.getDataSupplier();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
       this.inputMask = supplier.getNextInputMask(outputParty);
-      inMinusMask = toSpdz2kSInt(share).subtract(this.inputMask.getMaskShare());
+      inMinusMask = factory.toSpdz2kSInt(share).subtract(this.inputMask.getMaskShare());
       network.sendToAll(inMinusMask.getShare().getLeastSignificant().toByteArray());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java
index cb32fe672..dcb1053eb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java
@@ -6,6 +6,7 @@
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
@@ -37,8 +38,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Network network) {
     OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> openedValueStore = resourcePool
         .getOpenedValueStore();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
-      authenticatedElement = toSpdz2kSInt(share);
+      authenticatedElement = factory.toSpdz2kSInt(share);
       network.sendToAll(authenticatedElement.getShare().getLeastSignificant().toByteArray());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
index 72deb5194..8ba441403 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.network.Network;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 
@@ -34,9 +35,10 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Network network) {
     PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
     PlainT zero = resourcePool.getFactory().zero();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     Spdz2kSInt<PlainT> leftSInt = new Spdz2kSInt<>(left, secretSharedKey, zero,
         resourcePool.getMyId() == 1);
-    difference = leftSInt.subtract(toSpdz2kSInt(right));
+    difference = leftSInt.subtract(factory.toSpdz2kSInt(right));
     return EvaluationStatus.IS_DONE;
   }
 

From 0c8a45e6b7f95d0fbaa87562613207870bf8672c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 17:25:39 +0200
Subject: [PATCH 058/231] uin128 testbit

---
 .../suite/spdz2k/datatypes/CompUInt128.java   | 18 +++++++++++++++
 .../spdz2k/datatypes/TestCompUInt128.java     | 22 +++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 87068bb62..63816ae51 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -197,6 +197,24 @@ public byte[] toByteArray() {
     return bytes;
   }
 
+  @Override
+  public boolean testBit(int bit) {
+    // TODO optimize if bottle-neck
+    long section;
+    int relative;
+    if (bit < Integer.SIZE) {
+      section = low;
+      relative = bit;
+    } else if (bit < Long.SIZE) {
+      section = mid;
+      relative = bit - Integer.SIZE;
+    } else {
+      section = high;
+      relative = bit - Long.SIZE;
+    }
+    return (((1L << relative) & section) >>> relative) == 1;
+  }
+
   @Override
   public OInt out() {
     return this;
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 6e390a2f8..438fdab97 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -268,10 +268,24 @@ public void testPadIllegal() {
 
   @Test
   public void testIsZero() {
-    assertTrue(new CompUInt128(0, 0,0).isZero());
-    assertFalse(new CompUInt128(0, 0,1).isZero());
-    assertFalse(new CompUInt128(0, 1,0).isZero());
-    assertFalse(new CompUInt128(1, 0,0).isZero());
+    assertTrue(new CompUInt128(0, 0, 0).isZero());
+    assertFalse(new CompUInt128(0, 0, 1).isZero());
+    assertFalse(new CompUInt128(0, 1, 0).isZero());
+    assertFalse(new CompUInt128(1, 0, 0).isZero());
   }
 
+  @Test
+  public void testTestBit() {
+    assertTrue(new CompUInt128(0, 0, 1).testBit(0));
+    assertFalse(new CompUInt128(0, 0, 0).testBit(0));
+    assertTrue(new CompUInt128(0, 1, 0).testBit(32));
+    assertFalse(new CompUInt128(0, 0, 1).testBit(32));
+    assertTrue(new CompUInt128(1, 0, 0).testBit(64));
+    assertFalse(new CompUInt128(0, 1, 1).testBit(64));
+    assertTrue(new CompUInt128(0, 0, 1 << 14).testBit(14));
+    assertTrue(new CompUInt128(0, 1 << 10, 0).testBit(32 + 10));
+    assertTrue(new CompUInt128(1 << 2, 0, 0).testBit(64 + 2));
+    assertTrue(new CompUInt128(1L << 62, 0, 0).testBit(64 + 62));
+  }
+  
 }

From ed04c05ca836e89083dd11c3e6cc3c9108ee75b2 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 23 Apr 2018 17:28:24 +0200
Subject: [PATCH 059/231] Another testBit test

---
 .../fresco/suite/spdz2k/datatypes/TestCompUInt128.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 438fdab97..11d592f32 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -286,6 +286,7 @@ public void testTestBit() {
     assertTrue(new CompUInt128(0, 1 << 10, 0).testBit(32 + 10));
     assertTrue(new CompUInt128(1 << 2, 0, 0).testBit(64 + 2));
     assertTrue(new CompUInt128(1L << 62, 0, 0).testBit(64 + 62));
+    assertTrue(new CompUInt128(0x8000000000000000L, 0, 0).testBit(64 + 63));
   }
-  
+
 }

From c5006048f178f2974ab1f893a6bf7b418dc52f2a Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 09:51:53 +0200
Subject: [PATCH 060/231] Work on advanced numeric

---
 .../builder/numeric/AdvancedNumeric.java      | 93 ++++++++++++++-----
 .../numeric/DefaultAdvancedNumeric.java       | 12 +++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  1 +
 3 files changed, 85 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
index 15ac29601..a21b006d5 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
 import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.List;
@@ -73,7 +74,7 @@ public interface AdvancedNumeric extends ComputationDirectory {
 
   /**
    * Computes the exponentiation of x^e
-   * 
+   *
    * @param x The base
    * @param e The exponent
    * @param maxExponentLength The maximum length of the exponent.
@@ -83,7 +84,7 @@ public interface AdvancedNumeric extends ComputationDirectory {
 
   /**
    * Computes the exponentiation of x^e
-   * 
+   *
    * @param x The base
    * @param e The exponent
    * @param maxExponentLength The maximum length of the exponent.
@@ -93,7 +94,7 @@ public interface AdvancedNumeric extends ComputationDirectory {
 
   /**
    * Computes the exponentiation of x^e.
-   * 
+   *
    * @param x The base
    * @param e The exponent
    * @return A deferred result computing x^e
@@ -118,30 +119,56 @@ public interface AdvancedNumeric extends ComputationDirectory {
 
   /**
    * Computes the inner product between two vectors.
-   * 
+   *
    * @param vectorA The first vector
    * @param vectorB The second vector
    * @return A deferred result computing the inner product of the two given vectors
+   * @deprecated inputs should be wrapped in {@link DRes}
    */
+  @Deprecated
   DRes<SInt> innerProduct(List<DRes<SInt>> vectorA, List<DRes<SInt>> vectorB);
 
   /**
    * Computes the inner product between a public vector and a secret vector.
-   * 
+   *
    * @param vectorA The public vector
    * @param vectorB The secret vector
    * @return A deferred result computing the inner product of the two given vectors
+   * @deprecated inputs should be wrapped in {@link DRes}, use {@link #innerProductWithPublicPart(DRes,
+   * DRes)} instead
    */
+  @Deprecated()
   DRes<SInt> innerProductWithPublicPart(List<BigInteger> vectorA, List<DRes<SInt>> vectorB);
 
+  /**
+   * Computes the inner product between a public vector and a secret vector.
+   *
+   * @param vectorA The public vector
+   * @param vectorB The secret vector
+   * @return A deferred result computing the inner product of the two given vectors
+   */
+  DRes<SInt> innerProductWithPublicPart(DRes<List<DRes<OInt>>> vectorA,
+      DRes<List<DRes<SInt>>> vectorB);
+
   /**
    * Creates a string of random bits.
-   * 
+   *
    * @param noOfBits The amount of bits to create - i.e. the bit string length.
    * @return A container holding the bit string once evaluated.
+   * @deprecated use {@link #randomBitMask(int)} instead
    */
+  @Deprecated
   DRes<RandomAdditiveMask> additiveMask(int noOfBits);
 
+  /**
+   * Creates a random bit mask [b0, ..., bn] along with an {@link SInt} representing the recombined
+   * bits, i.e., sum(2^{i} * bi).
+   *
+   * @param noOfBits The amount of bits
+   * @return A container holding the bit string once evaluated.
+   */
+  DRes<RandomBitMask> randomBitMask(int noOfBits);
+
   /**
    * @param input input.
    * @return A deferred result computing input >> 1
@@ -157,36 +184,34 @@ public interface AdvancedNumeric extends ComputationDirectory {
 
   /**
    * @param input input
-   * @return A deferred result computing<br>
-   *         result: input >> 1<br>
-   *         remainder: The <code>shifts</code> least significant bits of the input with the least
-   *         significant having index 0.
+   * @return A deferred result computing<br> result: input >> 1<br> remainder: The
+   * <code>shifts</code> least significant bits of the input with the least significant having index
+   * 0.
    */
   DRes<RightShiftResult> rightShiftWithRemainder(DRes<SInt> input);
 
   /**
    * @param input input
    * @param shifts Number of shifts
-   * @return A deferred result computing <br>
-   *         result: input >> shifts<br>
-   *         remainder: The <code>shifts</code> least significant bits of the input with the least
-   *         significant having index 0.
+   * @return A deferred result computing <br> result: input >> shifts<br> remainder: The
+   * <code>shifts</code> least significant bits of the input with the least significant having index
+   * 0.
    */
   DRes<RightShiftResult> rightShiftWithRemainder(DRes<SInt> input, int shifts);
 
   /**
    * Computes the bit length of the input.
-   * 
+   *
    * @param input The number to know the bit length of
    * @param maxBitLength The maximum bit length this number can have (if unknown, set this to the
-   *        modulus bit size)
+   * modulus bit size)
    * @return A deferred result computing the bit length of the input number.
    */
   DRes<SInt> bitLength(DRes<SInt> input, int maxBitLength);
 
   /**
    * Compute the inverse of x within the field of operation
-   * 
+   *
    * @param x The element to take the inverse of
    * @return A deferred result computing x^-1 mod p where p is the modulus of the field.
    */
@@ -196,7 +221,7 @@ public interface AdvancedNumeric extends ComputationDirectory {
    * Selects left or right based on condition.
    *
    * @param condition the Computation holding the condition on which to select. Must be either 0 or
-   *        1.
+   * 1.
    * @param left the Computation holding the left argument.
    * @param right the Computation holding the right argument.
    * @return a computation holding either left or right depending on the condition.
@@ -206,12 +231,12 @@ public interface AdvancedNumeric extends ComputationDirectory {
   /**
    * Swaps <code>left</code> and <code>right</code> if <code>condition</code> is 1, keeps original
    * order otherwise. Returns result as a pair.
-   * 
+   *
    * @param condition must be 0 or 1.
    * @param left The left argument
    * @param right The right argument
    * @return A deferred result computing a pair containing [left, right] if the condition is 0 and
-   *         [right, left] if condition is 1.
+   * [right, left] if condition is 1.
    */
   DRes<Pair<DRes<SInt>, DRes<SInt>>> swapIf(DRes<SInt> condition, DRes<SInt> left,
       DRes<SInt> right);
@@ -239,8 +264,11 @@ public SInt getRemainder() {
   }
 
   /**
-   * Container holding a random bitvector and its SInt representation. 
+   * Container holding a random bitvector and its SInt representation.
+   *
+   * @deprecated values should be wrapped in DRes, use {@link RandomBitMask} instead
    */
+  @Deprecated
   class RandomAdditiveMask {
 
     public final List<DRes<SInt>> bits;
@@ -251,4 +279,27 @@ public RandomAdditiveMask(List<DRes<SInt>> bits, SInt random) {
       this.random = random;
     }
   }
+
+  /**
+   * Represents a random element and its bit decomposition.
+   */
+  class RandomBitMask {
+
+    private final DRes<List<DRes<SInt>>> bits;
+    private final DRes<SInt> value;
+
+    public RandomBitMask(DRes<List<DRes<SInt>>> bits, DRes<SInt> value) {
+      this.bits = bits;
+      this.value = value;
+    }
+
+    public DRes<List<DRes<SInt>>> getBits() {
+      return bits;
+    }
+
+    public DRes<SInt> getValue() {
+      return value;
+    }
+
+  }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
index 45c1c1c2e..1970d188e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelect;
 import dk.alexandra.fresco.lib.conditional.SwapIf;
@@ -110,11 +111,22 @@ public DRes<SInt> innerProductWithPublicPart(List<BigInteger> vectorA, List<DRes
     return builder.seq(new InnerProductOpen(vectorA, vectorB));
   }
 
+  @Override
+  public DRes<SInt> innerProductWithPublicPart(DRes<List<DRes<OInt>>> vectorA,
+      DRes<List<DRes<SInt>>> vectorB) {
+    return null;
+  }
+
   @Override
   public DRes<RandomAdditiveMask> additiveMask(int noOfBits) {
     return builder.seq(new dk.alexandra.fresco.lib.compare.RandomAdditiveMask(noOfBits));
   }
 
+  @Override
+  public DRes<RandomBitMask> randomBitMask(int noOfBits) {
+    return null;
+  }
+
   @Override
   public DRes<SInt> rightShift(DRes<SInt> input) {
     DRes<RightShiftResult> rightShiftResult = builder.seq(
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 15741fbb3..b5c3ca975 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -77,6 +77,7 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
+        // TODO should call .out inside evaluate instead
         return builder.append(
             new Spdz2kSubtractFromKnownProtocol<>(factory.fromOInt(a), b));
       }

From 1a49cf88ce2155faf3fbd5cf97607c764ad6a4cb Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 10:21:23 +0200
Subject: [PATCH 061/231] Corrected inner prod and random bit mask protocols

---
 .../builder/numeric/AdvancedNumeric.java      | 31 ++++---------
 .../numeric/DefaultAdvancedNumeric.java       |  9 ++--
 .../fresco/framework/util/RandomBitMask.java  | 28 ++++++++++++
 .../value/BigIntegerOIntArithmetic.java       |  5 +++
 .../framework/value/OIntArithmetic.java       |  6 +++
 .../integer/binary/GenerateRandomBitMask.java | 39 ++++++++++++++++
 .../integer/linalg/InnerProductWithOInt.java  | 44 +++++++++++++++++++
 .../spdz2k/datatypes/CompUIntArithmetic.java  |  5 +++
 8 files changed, 141 insertions(+), 26 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/util/RandomBitMask.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
index a21b006d5..1132eff7f 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
 import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.RandomBitMask;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
@@ -18,11 +19,17 @@ public interface AdvancedNumeric extends ComputationDirectory {
    *
    * @param elements the elements to sum
    * @return A deferred result computing the sum of the elements
+   * inputs should be wrapped in {@link DRes}, use {@link #sum(DRes)} instead
    */
   @Deprecated
   DRes<SInt> sum(List<DRes<SInt>> elements);
 
-
+  /**
+   * Calculates the sum of all elements in the list.
+   *
+   * @param elements the elements to sum
+   * @return A deferred result computing the sum of the elements
+   */
   DRes<SInt> sum(DRes<List<DRes<SInt>>> elements);
 
   /**
@@ -280,26 +287,4 @@ public RandomAdditiveMask(List<DRes<SInt>> bits, SInt random) {
     }
   }
 
-  /**
-   * Represents a random element and its bit decomposition.
-   */
-  class RandomBitMask {
-
-    private final DRes<List<DRes<SInt>>> bits;
-    private final DRes<SInt> value;
-
-    public RandomBitMask(DRes<List<DRes<SInt>>> bits, DRes<SInt> value) {
-      this.bits = bits;
-      this.value = value;
-    }
-
-    public DRes<List<DRes<SInt>>> getBits() {
-      return bits;
-    }
-
-    public DRes<SInt> getValue() {
-      return value;
-    }
-
-  }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
index 1970d188e..fcf2a1e37 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.RandomBitMask;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelect;
@@ -10,6 +11,7 @@
 import dk.alexandra.fresco.lib.math.integer.ProductSIntList;
 import dk.alexandra.fresco.lib.math.integer.SumSIntList;
 import dk.alexandra.fresco.lib.math.integer.binary.BitLength;
+import dk.alexandra.fresco.lib.math.integer.binary.GenerateRandomBitMask;
 import dk.alexandra.fresco.lib.math.integer.binary.RightShift;
 import dk.alexandra.fresco.lib.math.integer.division.KnownDivisor;
 import dk.alexandra.fresco.lib.math.integer.division.KnownDivisorRemainder;
@@ -20,6 +22,7 @@
 import dk.alexandra.fresco.lib.math.integer.inv.Inversion;
 import dk.alexandra.fresco.lib.math.integer.linalg.InnerProduct;
 import dk.alexandra.fresco.lib.math.integer.linalg.InnerProductOpen;
+import dk.alexandra.fresco.lib.math.integer.linalg.InnerProductWithOInt;
 import dk.alexandra.fresco.lib.math.integer.log.Logarithm;
 import dk.alexandra.fresco.lib.math.integer.sqrt.SquareRoot;
 import java.math.BigInteger;
@@ -114,7 +117,7 @@ public DRes<SInt> innerProductWithPublicPart(List<BigInteger> vectorA, List<DRes
   @Override
   public DRes<SInt> innerProductWithPublicPart(DRes<List<DRes<OInt>>> vectorA,
       DRes<List<DRes<SInt>>> vectorB) {
-    return null;
+    return builder.seq(new InnerProductWithOInt(vectorA, vectorB));
   }
 
   @Override
@@ -123,8 +126,8 @@ public DRes<RandomAdditiveMask> additiveMask(int noOfBits) {
   }
 
   @Override
-  public DRes<RandomBitMask> randomBitMask(int noOfBits) {
-    return null;
+  public DRes<RandomBitMask> randomBitMask(int numBits) {
+    return builder.seq(new GenerateRandomBitMask(numBits));
   }
 
   @Override
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/RandomBitMask.java b/core/src/main/java/dk/alexandra/fresco/framework/util/RandomBitMask.java
new file mode 100644
index 000000000..615c23854
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/RandomBitMask.java
@@ -0,0 +1,28 @@
+package dk.alexandra.fresco.framework.util;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.util.List;
+
+/**
+ * Represents a random element and its bit decomposition.
+ */
+public class RandomBitMask {
+
+  private final DRes<List<DRes<SInt>>> bits;
+  private final DRes<SInt> value;
+
+  public RandomBitMask(DRes<List<DRes<SInt>>> bits, DRes<SInt> value) {
+    this.bits = bits;
+    this.value = value;
+  }
+
+  public DRes<List<DRes<SInt>>> getBits() {
+    return bits;
+  }
+
+  public DRes<SInt> getValue() {
+    return value;
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 1dee906b9..40c9d86aa 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -31,4 +31,9 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
     return bits;
   }
 
+  @Override
+  public List<DRes<OInt>> getPowersOfTwo(int maxPower) {
+    return null;
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index 283963119..03daa0836 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -15,4 +15,10 @@ public interface OIntArithmetic {
    */
   List<DRes<OInt>> toBits(OInt openValue, int numBits);
 
+  /**
+   * Returns a list of powers of two in ascending order, up to maxPower ([2^0, 2^1, ...,
+   * 2^maxPower]).
+   */
+  List<DRes<OInt>> getPowersOfTwo(int maxPower);
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
new file mode 100644
index 000000000..9af746fae
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
@@ -0,0 +1,39 @@
+package dk.alexandra.fresco.lib.math.integer.binary;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.RandomBitMask;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * See {@link dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric#randomBitMask(int)}.
+ */
+public class GenerateRandomBitMask implements Computation<RandomBitMask, ProtocolBuilderNumeric> {
+
+  private final int numBits;
+
+  public GenerateRandomBitMask(int numBits) {
+    this.numBits = numBits;
+  }
+
+  @Override
+  public DRes<RandomBitMask> buildComputation(ProtocolBuilderNumeric builder) {
+    DRes<List<DRes<SInt>>> randomBits = builder.par(par -> {
+      List<DRes<SInt>> innerRandomBits = new ArrayList<>(numBits);
+      for (int i = 0; i < numBits; i++) {
+        innerRandomBits.add(par.numeric().randomBit());
+      }
+      return () -> innerRandomBits;
+    });
+    // TODO should be its own computation, i.e., recombine(bits)
+    List<DRes<OInt>> powersOfTwo = builder.getOIntArithmetic().getPowersOfTwo(numBits);
+    DRes<SInt> recombined = builder.advancedNumeric()
+        .innerProductWithPublicPart(() -> powersOfTwo, randomBits);
+    return () -> new RandomBitMask(randomBits, recombined);
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java
new file mode 100644
index 000000000..dc1e86f99
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java
@@ -0,0 +1,44 @@
+package dk.alexandra.fresco.lib.math.integer.linalg;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Computes the inner product - i.e. <code>Sum(a[0]*b[1], ..., a[n]*b[n])</code> by first computing
+ * all the multiplications in parallel, then summing up.
+ */
+public class InnerProductWithOInt implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<List<DRes<OInt>>> vectorADef;
+  private final DRes<List<DRes<SInt>>> vectorBDef;
+
+  public InnerProductWithOInt(
+      DRes<List<DRes<OInt>>> vectorA,
+      DRes<List<DRes<SInt>>> vectorB) {
+    this.vectorADef = vectorA;
+    this.vectorBDef = vectorB;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    List<DRes<OInt>> vectorA = vectorADef.out();
+    List<DRes<SInt>> vectorB = vectorBDef.out();
+    DRes<List<DRes<SInt>>> product = builder.par(parallel -> {
+      List<DRes<SInt>> result = new ArrayList<>(vectorA.size());
+      Numeric numericBuilder = parallel.numeric();
+      for (int i = 0; i < vectorA.size(); i++) {
+        DRes<OInt> nextA = vectorA.get(i);
+        DRes<SInt> nextB = vectorB.get(i);
+        result.add(numericBuilder.multByOpen(nextA, nextB));
+      }
+      return () -> result;
+    });
+    return builder.advancedNumeric().sum(product);
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index 525f5a079..359373926 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -31,4 +31,9 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
     return bits;
   }
 
+  @Override
+  public List<DRes<OInt>> getPowersOfTwo(int maxPower) {
+    return null;
+  }
+
 }

From 35049205806bf206f79ed969cd2456bcd9ff6e4c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 10:37:53 +0200
Subject: [PATCH 062/231] Two powers list

---
 ...OIntBigInteger.java => BigIntegerOInt.java} |  4 ++--
 .../value/BigIntegerOIntArithmetic.java        | 18 +++++++++++++++++-
 .../framework/value/BigIntegerOIntFactory.java | 10 +++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)
 rename core/src/main/java/dk/alexandra/fresco/framework/value/{OIntBigInteger.java => BigIntegerOInt.java} (77%)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntBigInteger.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOInt.java
similarity index 77%
rename from core/src/main/java/dk/alexandra/fresco/framework/value/OIntBigInteger.java
rename to core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOInt.java
index 94c6f60f6..6e8c340d0 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntBigInteger.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOInt.java
@@ -5,11 +5,11 @@
 /**
  * An open value wrapper for {@link BigInteger}.
  */
-public class OIntBigInteger implements OInt {
+public class BigIntegerOInt implements OInt {
 
   private final BigInteger value;
 
-  public OIntBigInteger(BigInteger value) {
+  public BigIntegerOInt(BigInteger value) {
     this.value = value;
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 40c9d86aa..f0f0e4ecd 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -12,10 +12,13 @@
  */
 public class BigIntegerOIntArithmetic implements OIntArithmetic {
 
+  // TODO wrapping all OInts in DRes seems like a bad idea
+  private List<DRes<OInt>> twoPowersList;
   private final OIntFactory factory;
 
   public BigIntegerOIntArithmetic(OIntFactory factory) {
     this.factory = factory;
+    this.twoPowersList = new ArrayList<>();
   }
 
   @Override
@@ -33,7 +36,20 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
 
   @Override
   public List<DRes<OInt>> getPowersOfTwo(int maxPower) {
-    return null;
+    // TODO taken from MiscBigIntegerGenerators, clean up
+    int currentLength = twoPowersList.size();
+    if (maxPower > currentLength) {
+      ArrayList<DRes<OInt>> newTwoPowersList = new ArrayList<>(maxPower);
+      newTwoPowersList.addAll(twoPowersList);
+      BigInteger currentValue = ((BigIntegerOInt) newTwoPowersList.get(currentLength - 1))
+          .getValue();
+      while (maxPower > newTwoPowersList.size()) {
+        currentValue = currentValue.shiftLeft(1);
+        newTwoPowersList.add(new BigIntegerOInt(currentValue));
+      }
+      twoPowersList = Collections.unmodifiableList(newTwoPowersList);
+    }
+    return twoPowersList.subList(0, maxPower);
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
index 31dff6229..ae1974d52 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
@@ -8,18 +8,18 @@
  */
 public class BigIntegerOIntFactory implements OIntFactory {
 
-  private static final OInt ZERO = new OIntBigInteger(BigInteger.ZERO);
-  private static final OInt ONE = new OIntBigInteger(BigInteger.ONE);
-  private static final OInt TWO = new OIntBigInteger(BigInteger.valueOf(2));
+  private static final OInt ZERO = new BigIntegerOInt(BigInteger.ZERO);
+  private static final OInt ONE = new BigIntegerOInt(BigInteger.ONE);
+  private static final OInt TWO = new BigIntegerOInt(BigInteger.valueOf(2));
 
   @Override
   public BigInteger toBigInteger(OInt value) {
-    return ((OIntBigInteger) value).getValue();
+    return ((BigIntegerOInt) value).getValue();
   }
 
   @Override
   public OInt fromBigInteger(BigInteger value) {
-    return new OIntBigInteger(value);
+    return new BigIntegerOInt(value);
   }
 
   @Override

From 7a0fc3391f36c444a2a1215f43144f39c923a3f1 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 11:05:38 +0200
Subject: [PATCH 063/231] Random bit mask test

---
 .../value/BigIntegerOIntArithmetic.java       |  5 +-
 .../integer/binary/BinaryOperationsTests.java | 48 +++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     | 12 +++++
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index f0f0e4ecd..6878f56fe 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -18,7 +18,8 @@ public class BigIntegerOIntArithmetic implements OIntArithmetic {
 
   public BigIntegerOIntArithmetic(OIntFactory factory) {
     this.factory = factory;
-    this.twoPowersList = new ArrayList<>();
+    twoPowersList = new ArrayList<>(1);
+    twoPowersList.add(() -> new BigIntegerOInt(BigInteger.ONE));
   }
 
   @Override
@@ -41,7 +42,7 @@ public List<DRes<OInt>> getPowersOfTwo(int maxPower) {
     if (maxPower > currentLength) {
       ArrayList<DRes<OInt>> newTwoPowersList = new ArrayList<>(maxPower);
       newTwoPowersList.addAll(twoPowersList);
-      BigInteger currentValue = ((BigIntegerOInt) newTwoPowersList.get(currentLength - 1))
+      BigInteger currentValue = ((BigIntegerOInt) newTwoPowersList.get(currentLength - 1).out())
           .getValue();
       while (maxPower > newTwoPowersList.size()) {
         currentValue = currentValue.shiftLeft(1);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
index 61cb50140..ea0b02b43 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
@@ -6,8 +6,10 @@
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
 import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.RightShiftResult;
+import dk.alexandra.fresco.framework.builder.numeric.NumericResourcePool;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
@@ -208,4 +210,50 @@ public void test() {
       };
     }
   }
+
+  public static class TestGenerateRandomBitMask<ResourcePoolT extends NumericResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        private int numBits = -1;
+        private BigInteger modulus;
+
+        private BigInteger recombine(List<BigInteger> bits) {
+          BigInteger result = BigInteger.ZERO;
+          for (int i = 0; i < bits.size(); i++) {
+            result = result.add(BigInteger.ONE.shiftLeft(i).multiply(bits.get(i)).mod(modulus));
+          }
+          return result.mod(modulus);
+        }
+
+        @Override
+        public void test() {
+          Application<Pair<DRes<BigInteger>, List<DRes<BigInteger>>>, ProtocolBuilderNumeric> app =
+              root -> {
+                numBits = root.getBasicNumericContext().getMaxBitLength() - 1;
+                modulus = root.getBasicNumericContext().getModulus();
+                return root.seq(seq -> seq.advancedNumeric().randomBitMask(numBits))
+                    .seq((seq, mask) -> {
+                      DRes<BigInteger> rec = seq.numeric().open(mask.getValue());
+                      DRes<List<DRes<BigInteger>>> bits = seq.collections()
+                          .openList(mask.getBits());
+                      return () -> new Pair<>(rec, bits.out());
+                    });
+              };
+          Pair<DRes<BigInteger>, List<DRes<BigInteger>>> actual = runApplication(app);
+          BigInteger recombined = actual.getFirst().out();
+          List<BigInteger> bits = actual.getSecond().stream()
+              .map(DRes::out)
+              .collect(Collectors.toList());
+          Assert.assertEquals(numBits, bits.size());
+          Assert.assertEquals(recombine(bits), recombined);
+        }
+      };
+    }
+  }
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 66bfb4668..49162fbee 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -39,6 +39,7 @@
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestArithmeticAndKnownRight;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestArithmeticXorKnownRight;
+import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
 import dk.alexandra.fresco.lib.math.integer.division.DivisionTests;
 import dk.alexandra.fresco.lib.math.integer.exp.ExponentiationTests;
 import dk.alexandra.fresco.lib.math.integer.linalg.LinAlgTests;
@@ -859,4 +860,15 @@ public void testLessThanLogRounds() {
     runTest(new TestLessThanLogRounds<>(modulus, maxBitLength), parameters);
   }
 
+  @Test
+  public void testGenerateRandomBitMask() {
+    BigInteger modulus = ModulusFinder.findSuitableModulus(128);
+    int maxBitLength = 64;
+    TestParameters parameters = new TestParameters()
+        .numParties(2)
+        .modulus(modulus)
+        .maxBitLength(maxBitLength);
+    runTest(new TestGenerateRandomBitMask<>(), parameters);
+  }
+
 }

From f4cfff2af85e220be948d6739541f23fffcf8736 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 11:20:57 +0200
Subject: [PATCH 064/231] Spdz2k random bit mask

---
 .../framework/value/BigIntegerOIntArithmetic.java | 10 +++++-----
 .../fresco/framework/value/OIntArithmetic.java    |  6 +++---
 .../spdz2k/datatypes/CompUIntArithmetic.java      | 15 +++++++++++++--
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java      |  6 ++++++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 6878f56fe..5fe9e4285 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -36,21 +36,21 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
   }
 
   @Override
-  public List<DRes<OInt>> getPowersOfTwo(int maxPower) {
+  public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
     // TODO taken from MiscBigIntegerGenerators, clean up
     int currentLength = twoPowersList.size();
-    if (maxPower > currentLength) {
-      ArrayList<DRes<OInt>> newTwoPowersList = new ArrayList<>(maxPower);
+    if (numPowers > currentLength) {
+      ArrayList<DRes<OInt>> newTwoPowersList = new ArrayList<>(numPowers);
       newTwoPowersList.addAll(twoPowersList);
       BigInteger currentValue = ((BigIntegerOInt) newTwoPowersList.get(currentLength - 1).out())
           .getValue();
-      while (maxPower > newTwoPowersList.size()) {
+      while (numPowers > newTwoPowersList.size()) {
         currentValue = currentValue.shiftLeft(1);
         newTwoPowersList.add(new BigIntegerOInt(currentValue));
       }
       twoPowersList = Collections.unmodifiableList(newTwoPowersList);
     }
-    return twoPowersList.subList(0, maxPower);
+    return twoPowersList.subList(0, numPowers);
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index 03daa0836..26325cb24 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -16,9 +16,9 @@ public interface OIntArithmetic {
   List<DRes<OInt>> toBits(OInt openValue, int numBits);
 
   /**
-   * Returns a list of powers of two in ascending order, up to maxPower ([2^0, 2^1, ...,
-   * 2^maxPower]).
+   * Returns a list of powers of two in ascending order, up to numPowers - 1 ([2^0, 2^1, ...,
+   * 2^{numPowers - 1}]).
    */
-  List<DRes<OInt>> getPowersOfTwo(int maxPower);
+  List<DRes<OInt>> getPowersOfTwo(int numPowers);
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index 359373926..3cdcdcdb3 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -32,8 +32,19 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
   }
 
   @Override
-  public List<DRes<OInt>> getPowersOfTwo(int maxPower) {
-    return null;
+  public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
+    // TODO cache
+    List<DRes<OInt>> powers = new ArrayList<>(numPowers);
+    CompT current = factory.one();
+    final CompT tempOuter = current;
+    powers.add(() -> tempOuter);
+    for (int i = 1; i < numPowers; i++) {
+      // TODO use shift
+      current = current.multiply(factory.two());
+      final CompT temp = current;
+      powers.add(() -> temp);
+    }
+    return powers;
   }
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index d42a1a006..ca78db0a4 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.lib.arithmetic.BasicArithmeticTests;
 import dk.alexandra.fresco.lib.collections.io.CloseListTests.TestCloseAndOpenList;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
+import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import org.junit.Test;
 
@@ -132,4 +133,9 @@ public void testBitLessThanOpen() {
     runTest(new TestBitLessThanOpen<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testGenerateRandomBitMask() {
+    runTest(new TestGenerateRandomBitMask<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
 }

From 1f132a6cdfbbf0638e6c44a3e00d4af14fd0eea0 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 12:41:39 +0200
Subject: [PATCH 065/231] WIP spdz2k most sig bit

---
 .../framework/builder/numeric/Numeric.java    |  7 ++
 .../value/BigIntegerOIntArithmetic.java       |  6 ++
 .../framework/value/OIntArithmetic.java       |  5 ++
 .../spdz2k/datatypes/CompUIntArithmetic.java  |  5 ++
 .../computations/lt/MostSignBitSpdz2k.java    | 82 +++++++++++++++++++
 5 files changed, 105 insertions(+)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
index 5518f254e..6cc2a1f36 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
@@ -146,6 +146,13 @@ public interface Numeric extends ComputationDirectory {
    */
   DRes<BigInteger> open(DRes<SInt> secretShare);
 
+  /**
+   * Opens a value to all MPC parties.
+   */
+  default DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
+    throw new UnsupportedOperationException();
+  }
+
   /**
    * Opens a value to a single given party.
    * @param secretShare The value to open.
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 5fe9e4285..2de764325 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -37,6 +37,7 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
 
   @Override
   public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
+    // TODO do we need modular reduction in here?
     // TODO taken from MiscBigIntegerGenerators, clean up
     int currentLength = twoPowersList.size();
     if (numPowers > currentLength) {
@@ -53,4 +54,9 @@ public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
     return twoPowersList.subList(0, numPowers);
   }
 
+  @Override
+  public DRes<OInt> twoTo(int power) {
+    throw new UnsupportedOperationException();
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index 26325cb24..2e02c22c3 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -21,4 +21,9 @@ public interface OIntArithmetic {
    */
   List<DRes<OInt>> getPowersOfTwo(int numPowers);
 
+  /**
+   * Computes 2^{power}.
+   */
+  DRes<OInt> twoTo(int power);
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index 3cdcdcdb3..f255a0395 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -47,4 +47,9 @@ public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
     return powers;
   }
 
+  @Override
+  public DRes<OInt> twoTo(int power) {
+    throw new UnsupportedOperationException();
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
new file mode 100644
index 000000000..8c8798574
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -0,0 +1,82 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.RandomBitMask;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.List;
+
+/**
+ * Extract the value of the most significant bit of value.
+ */
+public class MostSignBitSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
+    Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<SInt> value;
+  private final Spdz2kResourcePool<PlainT> resourcePool;
+  private final int k;
+
+  public MostSignBitSpdz2k(DRes<SInt> value, Spdz2kResourcePool<PlainT> resourcePool) {
+    this.value = value;
+    this.resourcePool = resourcePool;
+    this.k = resourcePool.getMaxBitLength();
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    OIntArithmetic arithmetic = builder.getOIntArithmetic();
+    DRes<OInt> twoTo2k1 = arithmetic.twoTo(k - 1);
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    return builder.seq(seq -> seq.advancedNumeric().randomBitMask(k - 2))
+        .seq((seq, mask) -> {
+          Numeric numeric = seq.numeric();
+          DRes<SInt> rPrime = mask.getValue();
+          DRes<SInt> kthBit = numeric.randomBit();
+          DRes<SInt> r = numeric.add(rPrime, numeric.multByOpen(twoTo2k1, kthBit));
+          DRes<SInt> c = numeric.add(value, r);
+          DRes<OInt> cOpen = numeric.openAsOInt(c);
+          return () -> new Pair<>(cOpen, mask);
+        }).seq((seq, pair) -> {
+          Numeric nb = seq.numeric();
+          PlainT cOpen = factory.fromOInt(pair.getFirst());
+          PlainT cPrime = null; // mod 2k-1
+          RandomBitMask mask = pair.getSecond();
+          DRes<SInt> rPrime = mask.getValue();
+          List<DRes<SInt>> rPrimeBits = mask.getBits().out();
+          DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrime, rPrimeBits));
+//          5. Parties set [a′] = c′ − [r′] + 2k−1[u] and compute [d] = [a] − [a′].
+//          6. The parties compute and open [e] = [d] + 2k−1[b]. Let ek−1 be the most signif-
+//              icant bit of e.
+//          7. The output of the protocol is computed as ek−1 + [b] − 2ek−1[b].
+          DRes<SInt> aPrime = nb.add(
+              nb.subFromOpen(() -> cPrime, rPrime),
+              nb.multByOpen(twoTo2k1, u)
+          );
+          DRes<SInt> d = nb.sub(value, aPrime);
+          DRes<SInt> b = nb.randomBit();
+          DRes<SInt> e = nb.add(d, nb.multByOpen(twoTo2k1, b));
+          DRes<OInt> eOpen = nb.openAsOInt(e);
+          return () -> new Pair<>(eOpen, b);
+        }).seq((seq, pair) -> {
+          Numeric nb = seq.numeric();
+          PlainT eOpen = factory.fromOInt(pair.getFirst());
+          DRes<SInt> b = pair.getSecond();
+          // TODO move into its own method
+          PlainT eMsb = eOpen.testBit(k - 1) ? factory.one() : factory.zero();
+          PlainT eMsbByTwo = eMsb.multiply(factory.two());
+          return nb.sub(
+              nb.addOpen(() -> eMsb, b),
+              nb.multByOpen(eMsbByTwo, b)
+          );
+        });
+  }
+}

From 902f38090ef2e52c9a4277870c5e722120d5bc32 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 15:16:49 +0200
Subject: [PATCH 066/231] More work on spdz2k most sign bit

---
 .../suite/spdz2k/datatypes/CompUInt.java      |  6 +++++
 .../suite/spdz2k/datatypes/CompUInt128.java   |  6 +++++
 .../suite/spdz2k/datatypes/CompUInt96.java    |  6 +++++
 .../spdz2k/datatypes/CompUIntArithmetic.java  | 26 ++++++++++++++-----
 .../computations/lt/MostSignBitSpdz2k.java    |  2 +-
 .../spdz2k/datatypes/TestCompUInt128.java     | 11 ++++++++
 6 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 748c126e2..385197890 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -33,6 +33,12 @@ public interface CompUInt<
    */
   CompT shiftLowIntoHigh();
 
+  /**
+   * Compute this mod 2^{k-1}.
+   * TODO this should just be a regular mod pow 2 method
+   */
+  CompT modTwoToKMinOne();
+
   /**
    * Get length of least significant bit segment, i.e., k.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 63816ae51..4d1e98b8c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -173,6 +173,12 @@ public CompUInt128 shiftLowIntoHigh() {
     return new CompUInt128(toLong(), 0, 0);
   }
 
+  @Override
+  public CompUInt128 modTwoToKMinOne() {
+    int newMid = (int) (~(1L << 31) & mid);
+    return new CompUInt128(0L, newMid, low);
+  }
+
   @Override
   public int getLowBitLength() {
     return 64;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 0b8883792..596b533bc 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -162,6 +162,12 @@ public CompUInt96 shiftLowIntoHigh() {
     return new CompUInt96(mid, low, 0);
   }
 
+  @Override
+  public CompUInt96 modTwoToKMinOne() {
+    int newLow = (int) (~(1L << 31) & low);
+    return new CompUInt96(0, 0, newLow);
+  }
+
   @Override
   public int getLowBitLength() {
     return 32;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index f255a0395..08a8d2b8e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -13,9 +13,11 @@
 public class CompUIntArithmetic<CompT extends CompUInt<?, ?, CompT>> implements OIntArithmetic {
 
   private final CompUIntFactory<CompT> factory;
+  private final List<DRes<OInt>> powersOfTwo;
 
   public CompUIntArithmetic(CompUIntFactory<CompT> factory) {
     this.factory = factory;
+    this.powersOfTwo = initializePowersOfTwo(factory.getLowBitLength());
   }
 
   @Override
@@ -33,13 +35,28 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
 
   @Override
   public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
-    // TODO cache
+    if (numPowers > factory.getLowBitLength()) {
+      throw new UnsupportedOperationException();
+    } else {
+      return powersOfTwo.subList(0, numPowers);
+    }
+  }
+
+  @Override
+  public DRes<OInt> twoTo(int power) {
+    if (power > factory.getLowBitLength()) {
+      throw new UnsupportedOperationException();
+    } else {
+      return powersOfTwo.get(power);
+    }
+  }
+
+  private List<DRes<OInt>> initializePowersOfTwo(int numPowers) {
     List<DRes<OInt>> powers = new ArrayList<>(numPowers);
     CompT current = factory.one();
     final CompT tempOuter = current;
     powers.add(() -> tempOuter);
     for (int i = 1; i < numPowers; i++) {
-      // TODO use shift
       current = current.multiply(factory.two());
       final CompT temp = current;
       powers.add(() -> temp);
@@ -47,9 +64,4 @@ public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
     return powers;
   }
 
-  @Override
-  public DRes<OInt> twoTo(int power) {
-    throw new UnsupportedOperationException();
-  }
-
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index 8c8798574..834584220 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -48,7 +48,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
         }).seq((seq, pair) -> {
           Numeric nb = seq.numeric();
           PlainT cOpen = factory.fromOInt(pair.getFirst());
-          PlainT cPrime = null; // mod 2k-1
+          PlainT cPrime = cOpen.modTwoToKMinOne();
           RandomBitMask mask = pair.getSecond();
           DRes<SInt> rPrime = mask.getValue();
           List<DRes<SInt>> rPrimeBits = mask.getBits().out();
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 11d592f32..9b6261c92 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -289,4 +289,15 @@ public void testTestBit() {
     assertTrue(new CompUInt128(0x8000000000000000L, 0, 0).testBit(64 + 63));
   }
 
+  @Test
+  public void testModTwoToKMinOne() {
+    assertEquals(new CompUInt128(0, 0, 0).toBigInteger(),
+        new CompUInt128(0, 0, 0).modTwoToKMinOne().toBigInteger());
+    assertEquals(new CompUInt128(0, 0, 123123).toBigInteger(),
+        new CompUInt128(0, 0, 123123).modTwoToKMinOne().toBigInteger());
+    assertEquals(new CompUInt128(0, 0, 123123).toBigInteger(),
+        new CompUInt128(1, 0, 123123).modTwoToKMinOne().toBigInteger());
+    assertEquals(new CompUInt128(0, 0x70001001, 123123).toBigInteger(),
+        new CompUInt128(1, 0xf0001001, 123123).modTwoToKMinOne().toBigInteger());
+  }
 }

From 3a149d4565ebe32e7e0fba2d97fecf23584ff9f7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 15:50:11 +0200
Subject: [PATCH 067/231] Spdzk2 comparison comp dir

---
 .../builder/numeric/DefaultComparison.java    |  6 +-
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 12 ++++
 .../fresco/suite/spdz2k/Spdz2kComparison.java | 37 +++++++++++
 .../computations/lt/MostSignBitSpdz2k.java    | 12 ++--
 .../Spdz2kOutputToAllAsOIntProtocol.java      | 61 +++++++++++++++++++
 .../spdz2k/TestSpdz2kBasicArithmetic128.java  | 10 +++
 6 files changed, 128 insertions(+), 10 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 99296ecff..a909120fd 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -16,9 +16,9 @@
 public class DefaultComparison implements Comparison {
 
   // Security parameter used by protocols using rightshifts and/or additive masks.
-  private final int magicSecureNumber = 60;
-  private final BuilderFactoryNumeric factoryNumeric;
-  private final ProtocolBuilderNumeric builder;
+  protected final int magicSecureNumber = 60;
+  protected final BuilderFactoryNumeric factoryNumeric;
+  protected final ProtocolBuilderNumeric builder;
 
   public DefaultComparison(BuilderFactoryNumeric factoryNumeric,
       ProtocolBuilderNumeric builder) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index b5c3ca975..d969b264e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.Comparison;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.OInt;
@@ -19,6 +20,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultiplyProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputSinglePartyProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAllAsOIntProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAllProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomBitProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomElementProtocol;
@@ -46,6 +48,11 @@ public BasicNumericContext getBasicNumericContext() {
     return numericContext;
   }
 
+  @Override
+  public Comparison createComparison(ProtocolBuilderNumeric builder) {
+    return new Spdz2kComparison<>(this, builder, factory);
+  }
+
   @Override
   public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
@@ -131,6 +138,11 @@ public DRes<SInt> input(BigInteger value, int inputParty) {
         );
       }
 
+      @Override
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
+        return builder.append(new Spdz2kOutputToAllAsOIntProtocol<>(secretShare));
+      }
+
       @Override
       public DRes<BigInteger> open(DRes<SInt> secretShare) {
         return builder.append(new Spdz2kOutputToAllProtocol<>(secretShare));
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
new file mode 100644
index 000000000..951c834ad
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -0,0 +1,37 @@
+package dk.alexandra.fresco.suite.spdz2k;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
+
+/**
+ * Spdz2k optimized protocols for comparison.
+ */
+public class Spdz2kComparison<PlainT extends CompUInt<?, ?, PlainT>> extends DefaultComparison {
+
+  private final CompUIntFactory<PlainT> factory;
+
+  public Spdz2kComparison(
+      BuilderFactoryNumeric factoryNumeric,
+      ProtocolBuilderNumeric builder, CompUIntFactory<PlainT> factory) {
+    super(factoryNumeric, builder);
+    this.factory = factory;
+  }
+
+  @Override
+  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm) {
+    if (algorithm == ComparisonAlgorithm.LT_CONST_ROUNDS) {
+      throw new UnsupportedOperationException(
+          "No constant round comparison protocol implemented for Spdz2k");
+    } else {
+      DRes<SInt> diff = builder.numeric().sub(x1, x2);
+      return builder.seq(new MostSignBitSpdz2k<>(diff, factory));
+    }
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index 834584220..f6b592c2b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -12,7 +12,6 @@
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.List;
 
 /**
@@ -22,20 +21,19 @@ public class MostSignBitSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
     Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<SInt> value;
-  private final Spdz2kResourcePool<PlainT> resourcePool;
+  private final CompUIntFactory<PlainT> factory;
   private final int k;
 
-  public MostSignBitSpdz2k(DRes<SInt> value, Spdz2kResourcePool<PlainT> resourcePool) {
+  public MostSignBitSpdz2k(DRes<SInt> value, CompUIntFactory<PlainT> factory) {
     this.value = value;
-    this.resourcePool = resourcePool;
-    this.k = resourcePool.getMaxBitLength();
+    this.factory = factory;
+    this.k = factory.getLowBitLength();
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     OIntArithmetic arithmetic = builder.getOIntArithmetic();
     DRes<OInt> twoTo2k1 = arithmetic.twoTo(k - 1);
-    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     return builder.seq(seq -> seq.advancedNumeric().randomBitMask(k - 2))
         .seq((seq, mask) -> {
           Numeric numeric = seq.numeric();
@@ -52,7 +50,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           RandomBitMask mask = pair.getSecond();
           DRes<SInt> rPrime = mask.getValue();
           List<DRes<SInt>> rPrimeBits = mask.getBits().out();
-          DRes<SInt> u = seq.seq(new BitLessThanOpen(() -> cPrime, rPrimeBits));
+          DRes<SInt> u = seq.seq(new BitLessThanOpen(cPrime, rPrimeBits));
 //          5. Parties set [a′] = c′ − [r′] + 2k−1[u] and compute [d] = [a] − [a′].
 //          6. The parties compute and open [e] = [d] + 2k−1[b]. Let ek−1 be the most signif-
 //              icant bit of e.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java
new file mode 100644
index 000000000..852e3fd58
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java
@@ -0,0 +1,61 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.List;
+
+/**
+ * Native protocol for opening a secret value to all parties.
+ */
+public class Spdz2kOutputToAllAsOIntProtocol<PlainT extends CompUInt<?, ?, PlainT>>
+    extends Spdz2kNativeProtocol<OInt, PlainT>
+    implements RequiresMacCheck {
+
+  private final DRes<SInt> share;
+  private OInt opened;
+  private Spdz2kSInt<PlainT> authenticatedElement;
+
+  /**
+   * Creates new {@link Spdz2kOutputToAllAsOIntProtocol}.
+   *
+   * @param share value to open
+   */
+  public Spdz2kOutputToAllAsOIntProtocol(DRes<SInt> share) {
+    this.share = share;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> openedValueStore = resourcePool
+        .getOpenedValueStore();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    if (round == 0) {
+      authenticatedElement = factory.toSpdz2kSInt(share);
+      network.sendToAll(authenticatedElement.getShare().getLeastSignificant().toByteArray());
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();
+      List<PlainT> shares = serializer.deserializeList(network.receiveFromAll());
+      PlainT recombined = UInt.sum(shares);
+      openedValueStore.pushOpenedValue(authenticatedElement, recombined);
+      this.opened = recombined;
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  @Override
+  public OInt out() {
+    return opened;
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
index 2cda4ebca..6f9fa5af7 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
@@ -1,7 +1,9 @@
 package dk.alexandra.fresco.suite.spdz2k;
 
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
@@ -10,7 +12,9 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
+import java.math.BigInteger;
 import java.util.function.Supplier;
+import org.junit.Test;
 
 public class TestSpdz2kBasicArithmetic128 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt128>> {
 
@@ -34,4 +38,10 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128();
   }
 
+  @Test
+  public void testLessThanLogRounds() {
+    runTest(new TestLessThanLogRounds<>(BigInteger.ONE.shiftLeft(64), 64),
+        EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
 }

From 6f96a92cd50149772d82732b3aeb5a58ad278ceb Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 16:14:17 +0200
Subject: [PATCH 068/231] Failing comparison tests

---
 .../fresco/lib/compare/CompareTests.java        | 17 ++++++++++++-----
 .../TestDummyArithmeticProtocolSuite.java       |  2 +-
 .../fresco/suite/spdz/TestSpdzComparison.java   |  5 +----
 .../fresco/suite/spdz2k/datatypes/CompUInt.java |  5 +++++
 .../suite/spdz2k/datatypes/CompUInt128.java     |  5 +++++
 .../suite/spdz2k/datatypes/CompUInt96.java      |  5 +++++
 .../Spdz2kOutputToAllAsOIntProtocol.java        |  4 ++--
 .../spdz2k/TestSpdz2kBasicArithmetic128.java    |  3 +--
 8 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index aa7292118..84926251a 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -280,35 +280,42 @@ public static class TestLessThanLogRounds<ResourcePoolT extends ResourcePool>
     private final List<BigInteger> openRight;
     private final List<BigInteger> expected;
 
-    public TestLessThanLogRounds(BigInteger modulus, int maxBitLength) {
+    public TestLessThanLogRounds(int maxBitLength) {
       BigInteger two = BigInteger.valueOf(2);
       this.openLeft = Arrays.asList(
           BigInteger.ZERO,
           BigInteger.ONE,
+          BigInteger.ONE,
           BigInteger.valueOf(-1),
           BigInteger.valueOf(-111111),
           BigInteger.valueOf(-111),
           BigInteger.ONE,
-          modulus,
           two.pow(maxBitLength).subtract(BigInteger.ONE),
-          two.pow(maxBitLength).subtract(two)
+          two.pow(maxBitLength).subtract(two),
+          BigInteger.ONE,
+          two.pow(maxBitLength).subtract(BigInteger.valueOf(10000))
       );
       this.openRight = Arrays.asList(
           BigInteger.ZERO,
           BigInteger.ONE,
+          BigInteger.ZERO,
           BigInteger.valueOf(-1),
           BigInteger.valueOf(-111112),
           BigInteger.valueOf(-110),
           BigInteger.valueOf(5),
-          modulus,
           two.pow(maxBitLength).subtract(two),
-          two.pow(maxBitLength).subtract(BigInteger.ONE)
+          two.pow(maxBitLength).subtract(BigInteger.ONE),
+          BigInteger.valueOf(-1),
+          BigInteger.ONE
       );
       this.expected = computeExpected(openLeft, openRight);
     }
 
     private static List<BigInteger> computeExpected(List<BigInteger> openLeft,
         List<BigInteger> openRight) {
+      if (openLeft.size() != openRight.size()) {
+        throw new IllegalStateException("Incorrect test spec!");
+      }
       List<BigInteger> expected = new ArrayList<>(openLeft.size());
       for (int i = 0; i < openLeft.size(); i++) {
         boolean lessThan = openLeft.get(i).compareTo(openRight.get(i)) < 0;
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 49162fbee..7fee4af75 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -857,7 +857,7 @@ public void testLessThanLogRounds() {
         .numParties(2)
         .modulus(modulus)
         .maxBitLength(maxBitLength);
-    runTest(new TestLessThanLogRounds<>(modulus, maxBitLength), parameters);
+    runTest(new TestLessThanLogRounds<>(maxBitLength), parameters);
   }
 
   @Test
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
index e7bc6aa33..c371ef529 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
@@ -3,13 +3,11 @@
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.sce.resources.storage.FilebasedStreamedStorageImpl;
 import dk.alexandra.fresco.framework.sce.resources.storage.InMemoryStorage;
-import dk.alexandra.fresco.framework.util.ModulusFinder;
 import dk.alexandra.fresco.lib.compare.CompareTests;
 import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.list.EliminateDuplicatesTests.TestFindDuplicatesOne;
 import dk.alexandra.fresco.suite.spdz.configuration.PreprocessingStrategy;
 import dk.alexandra.fresco.suite.spdz.storage.InitializeStorage;
-import java.math.BigInteger;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -71,9 +69,8 @@ public void testCompareLTBatchedMascot() {
 
   @Test
   public void testLessThanLogRounds() {
-    BigInteger modulus = ModulusFinder.findSuitableModulus(128);
     int maxBitLength = 64;
-    runTest(new TestLessThanLogRounds<>(modulus, maxBitLength),
+    runTest(new TestLessThanLogRounds<>(maxBitLength),
         EvaluationStrategy.SEQUENTIAL_BATCHED,
         PreprocessingStrategy.DUMMY,
         2, 128, 64, 32);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 385197890..dd76bc53c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -39,6 +39,11 @@ public interface CompUInt<
    */
   CompT modTwoToKMinOne();
 
+  /**
+   * Sets s most significant bits to 0.
+   */
+  CompT clearHighBits();
+
   /**
    * Get length of least significant bit segment, i.e., k.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 4d1e98b8c..32f9ab15a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -179,6 +179,11 @@ public CompUInt128 modTwoToKMinOne() {
     return new CompUInt128(0L, newMid, low);
   }
 
+  @Override
+  public CompUInt128 clearHighBits() {
+    return new CompUInt128(0, mid, low);
+  }
+
   @Override
   public int getLowBitLength() {
     return 64;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 596b533bc..d9c15a87d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -162,6 +162,11 @@ public CompUInt96 shiftLowIntoHigh() {
     return new CompUInt96(mid, low, 0);
   }
 
+  @Override
+  public CompUInt96 clearHighBits() {
+    return new CompUInt96(0, 0, low);
+  }
+
   @Override
   public CompUInt96 modTwoToKMinOne() {
     int newLow = (int) (~(1L << 31) & low);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java
index 852e3fd58..f0bc5ba49 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java
@@ -21,7 +21,7 @@ public class Spdz2kOutputToAllAsOIntProtocol<PlainT extends CompUInt<?, ?, Plain
     implements RequiresMacCheck {
 
   private final DRes<SInt> share;
-  private OInt opened;
+  private PlainT opened;
   private Spdz2kSInt<PlainT> authenticatedElement;
 
   /**
@@ -48,7 +48,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       List<PlainT> shares = serializer.deserializeList(network.receiveFromAll());
       PlainT recombined = UInt.sum(shares);
       openedValueStore.pushOpenedValue(authenticatedElement, recombined);
-      this.opened = recombined;
+      this.opened = recombined.clearHighBits();
       return EvaluationStatus.IS_DONE;
     }
   }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
index 6f9fa5af7..90aed2896 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
@@ -12,7 +12,6 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
-import java.math.BigInteger;
 import java.util.function.Supplier;
 import org.junit.Test;
 
@@ -40,7 +39,7 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
 
   @Test
   public void testLessThanLogRounds() {
-    runTest(new TestLessThanLogRounds<>(BigInteger.ONE.shiftLeft(64), 64),
+    runTest(new TestLessThanLogRounds<>(64),
         EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 

From d782aa9766bf0d00c53f699b2588af6bb21774f4 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 16:45:44 +0200
Subject: [PATCH 069/231] Correct power in tests

---
 .../fresco/lib/compare/CompareTests.java        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index 84926251a..6a7233d6f 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -290,10 +290,11 @@ public TestLessThanLogRounds(int maxBitLength) {
           BigInteger.valueOf(-111111),
           BigInteger.valueOf(-111),
           BigInteger.ONE,
-          two.pow(maxBitLength).subtract(BigInteger.ONE),
-          two.pow(maxBitLength).subtract(two),
-          BigInteger.ONE,
-          two.pow(maxBitLength).subtract(BigInteger.valueOf(10000))
+          two.pow(maxBitLength - 1).subtract(BigInteger.ONE),
+          two.pow(maxBitLength - 1).subtract(two),
+          BigInteger.TEN,
+          two.pow(maxBitLength - 1).subtract(BigInteger.ONE),
+          two.pow(maxBitLength - 1).subtract(two)
       );
       this.openRight = Arrays.asList(
           BigInteger.ZERO,
@@ -303,10 +304,11 @@ public TestLessThanLogRounds(int maxBitLength) {
           BigInteger.valueOf(-111112),
           BigInteger.valueOf(-110),
           BigInteger.valueOf(5),
-          two.pow(maxBitLength).subtract(two),
-          two.pow(maxBitLength).subtract(BigInteger.ONE),
+          two.pow(maxBitLength - 1).subtract(two),
+          two.pow(maxBitLength - 1).subtract(BigInteger.ONE),
           BigInteger.valueOf(-1),
-          BigInteger.ONE
+          BigInteger.ONE,
+          BigInteger.valueOf(-1)
       );
       this.expected = computeExpected(openLeft, openRight);
     }
@@ -343,6 +345,7 @@ public void test() {
             return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
           };
           List<BigInteger> actual = runApplication(app);
+          System.out.println(expected + " " + actual);
           Assert.assertEquals(expected, actual);
         }
       };

From 3c8cd6c277f1ea3a897ce71509d82294f915a47d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 17:19:28 +0200
Subject: [PATCH 070/231] Correctly handle negative values in comp uint

---
 .../fresco/suite/spdz2k/datatypes/CompUInt128.java |  3 ++-
 .../suite/spdz2k/datatypes/CompUInt128Factory.java | 14 +++++++++++++-
 .../suite/spdz2k/datatypes/TestCompUInt128.java    |  4 ++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 32f9ab15a..8f16046e9 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -48,7 +48,8 @@ public CompUInt128(byte[] bytes, boolean requiresPadding) {
    * Creates new {@link CompUInt128} from {@link BigInteger}.
    */
   public CompUInt128(BigInteger value) {
-    this(value.toByteArray(), true);
+    this(value.shiftRight(64).longValue(), value.shiftRight(32).intValue(), value.intValue());
+//    this(value.toByteArray(), true);
   }
 
   CompUInt128(long high, int mid, int low) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
index 9c7da10ea..8232a7ac5 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
@@ -8,6 +8,8 @@
 public class CompUInt128Factory implements CompUIntFactory<CompUInt128> {
 
   private static final CompUInt128 ZERO = new CompUInt128(new byte[16]);
+  private static final CompUInt128 ONE = new CompUInt128(1);
+  private static final CompUInt128 TWO = new CompUInt128(2);
   private final SecureRandom random = new SecureRandom();
 
   @Override
@@ -39,7 +41,7 @@ public int getHighBitLength() {
 
   @Override
   public CompUInt128 createFromBigInteger(BigInteger value) {
-    return value == null ? null : new CompUInt128(value.toByteArray(), true);
+    return value == null ? null : new CompUInt128(value);
   }
 
   @Override
@@ -47,4 +49,14 @@ public CompUInt128 zero() {
     return ZERO;
   }
 
+  @Override
+  public CompUInt128 one() {
+    return ONE;
+  }
+
+  @Override
+  public CompUInt128 two() {
+    return TWO;
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 9b6261c92..39d43b02b 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -58,6 +58,10 @@ public void testConstruct() {
         twoTo128.subtract(BigInteger.ONE),
         new CompUInt128(twoTo128.subtract(BigInteger.ONE)).toBigInteger()
     );
+    assertEquals(
+        BigInteger.valueOf(-1).mod(twoTo128),
+        new CompUInt128(BigInteger.valueOf(-1)).toBigInteger()
+    );
   }
 
   @Test

From 09e537392bd7bf76f6a22e007da6c48d59bac1c7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 17:24:47 +0200
Subject: [PATCH 071/231] More negative const tests

---
 .../fresco/suite/spdz2k/datatypes/TestCompUInt128.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 39d43b02b..1edba16f4 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -62,6 +62,14 @@ public void testConstruct() {
         BigInteger.valueOf(-1).mod(twoTo128),
         new CompUInt128(BigInteger.valueOf(-1)).toBigInteger()
     );
+    assertEquals(
+        BigInteger.valueOf(-2).mod(twoTo128),
+        new CompUInt128(BigInteger.valueOf(-2)).toBigInteger()
+    );
+    assertEquals(
+        twoTo128.subtract(BigInteger.ONE).negate().mod(twoTo128),
+        new CompUInt128(twoTo128.subtract(BigInteger.ONE).negate()).toBigInteger()
+    );
   }
 
   @Test

From fffbc2b8962ba94740c6850a1698e6e86fb8a9c1 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 17:39:03 +0200
Subject: [PATCH 072/231] Fix up compuin96

---
 .../fresco/suite/spdz2k/datatypes/CompUInt128.java   |  1 -
 .../fresco/suite/spdz2k/datatypes/CompUInt96.java    |  2 +-
 .../suite/spdz2k/datatypes/CompUInt96Factory.java    |  6 ++++++
 .../suite/spdz2k/datatypes/CompUIntFactory.java      |  2 +-
 .../suite/spdz2k/datatypes/TestCompUInt96.java       | 12 ++++++++++++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 8f16046e9..4a69b3589 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -49,7 +49,6 @@ public CompUInt128(byte[] bytes, boolean requiresPadding) {
    */
   public CompUInt128(BigInteger value) {
     this(value.shiftRight(64).longValue(), value.shiftRight(32).intValue(), value.intValue());
-//    this(value.toByteArray(), true);
   }
 
   CompUInt128(long high, int mid, int low) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index d9c15a87d..338f6dc18 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -33,7 +33,7 @@ public CompUInt96(byte[] bytes) {
   }
 
   CompUInt96(BigInteger value) {
-    this(value.toByteArray());
+    this(value.shiftRight(64).intValue(), value.shiftRight(32).intValue(), value.intValue());
   }
 
   CompUInt96(UInt64 value) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java
index 1ae2a2c40..db3eea4c2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
 import dk.alexandra.fresco.suite.spdz2k.util.UIntSerializer;
+import java.math.BigInteger;
 import java.security.SecureRandom;
 
 public class CompUInt96Factory implements CompUIntFactory<CompUInt96> {
@@ -13,6 +14,11 @@ public CompUInt96 createFromBytes(byte[] bytes) {
     return new CompUInt96(bytes);
   }
 
+  @Override
+  public CompUInt96 createFromBigInteger(BigInteger value) {
+    return value == null ? null : new CompUInt96(value);
+  }
+
   @Override
   public CompUInt96 createRandom() {
     byte[] bytes = new byte[12];
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index dae78427e..0bb6c0c10 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -92,7 +92,7 @@ default CompT createFromBigInteger(BigInteger value) {
    * Creates element whose value is zero.
    */
   default CompT zero() {
-    return createFromBytes(new byte[getCompositeBitLength() / Byte.SIZE]);
+    return createFromBigInteger(BigInteger.ZERO);
   }
 
   default CompT one() {
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
index 9698c63d9..d9dbf2d66 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
@@ -58,6 +58,18 @@ public void testConstruct() {
         twoTo96.subtract(BigInteger.ONE),
         new CompUInt96(twoTo96.subtract(BigInteger.ONE)).toBigInteger()
     );
+    assertEquals(
+        BigInteger.valueOf(-1).mod(twoTo96),
+        new CompUInt96(BigInteger.valueOf(-1)).toBigInteger()
+    );
+    assertEquals(
+        BigInteger.valueOf(-2).mod(twoTo96),
+        new CompUInt96(BigInteger.valueOf(-2)).toBigInteger()
+    );
+    assertEquals(
+        twoTo96.subtract(BigInteger.ONE).negate().mod(twoTo96),
+        new CompUInt96(twoTo96.subtract(BigInteger.ONE).negate()).toBigInteger()
+    );
   }
 
   @Test

From d7634533cec4b90829cacad6fd2c9b02c8624672 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 17:47:34 +0200
Subject: [PATCH 073/231] Run less than test for compuint96

---
 .../alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java |  9 +++++++++
 .../suite/spdz2k/TestSpdz2kBasicArithmetic128.java     | 10 +++-------
 .../suite/spdz2k/TestSpdz2kBasicArithmetic96.java      |  5 +++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index ca78db0a4..2628d26cc 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.lib.arithmetic.BasicArithmeticTests;
 import dk.alexandra.fresco.lib.collections.io.CloseListTests.TestCloseAndOpenList;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
@@ -138,4 +139,12 @@ public void testGenerateRandomBitMask() {
     runTest(new TestGenerateRandomBitMask<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testLessThanLogRounds() {
+    runTest(new TestLessThanLogRounds<>(getMaxBitLength()),
+        EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  protected abstract int getMaxBitLength();
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
index 90aed2896..98b0397d8 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
@@ -1,9 +1,7 @@
 package dk.alexandra.fresco.suite.spdz2k;
 
 import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
-import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
@@ -13,7 +11,6 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.util.function.Supplier;
-import org.junit.Test;
 
 public class TestSpdz2kBasicArithmetic128 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt128>> {
 
@@ -37,10 +34,9 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128();
   }
 
-  @Test
-  public void testLessThanLogRounds() {
-    runTest(new TestLessThanLogRounds<>(64),
-        EvaluationStrategy.SEQUENTIAL_BATCHED);
+  @Override
+  protected int getMaxBitLength() {
+    return 64;
   }
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic96.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic96.java
index 6e90e0c6a..a4fa2d211 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic96.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic96.java
@@ -34,4 +34,9 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt96>> createProtocolSui
     return new Spdz2kProtocolSuite96();
   }
 
+  @Override
+  protected int getMaxBitLength() {
+    return 32;
+  }
+
 }

From 3cbc65ab71f2f1a693b54c21b7ef24254311c811 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 24 Apr 2018 18:03:17 +0200
Subject: [PATCH 074/231] Fix up output protocols

---
 .../framework/builder/numeric/Numeric.java    |  7 +++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 23 +++++--
 .../spdz2k/datatypes/CompUIntFactory.java     |  2 +-
 .../Spdz2kOutputSinglePartyProtocol.java      | 10 +--
 ...ntProtocol.java => Spdz2kOutputToAll.java} |  6 +-
 .../natives/Spdz2kOutputToAllProtocol.java    | 61 -------------------
 6 files changed, 34 insertions(+), 75 deletions(-)
 rename suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/{Spdz2kOutputToAllAsOIntProtocol.java => Spdz2kOutputToAll.java} (90%)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
index 6cc2a1f36..39f6810b2 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
@@ -153,6 +153,13 @@ default DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
     throw new UnsupportedOperationException();
   }
 
+  /**
+   * Opens a value to all MPC parties.
+   */
+  default DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
+    throw new UnsupportedOperationException();
+  }
+
   /**
    * Opens a value to a single given party.
    * @param secretShare The value to open.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index d969b264e..f8f9a93f2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -20,8 +20,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultiplyProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputSinglePartyProtocol;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAllAsOIntProtocol;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAllProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomBitProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomElementProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kSubtractFromKnownProtocol;
@@ -140,18 +139,32 @@ public DRes<SInt> input(BigInteger value, int inputParty) {
 
       @Override
       public DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
-        return builder.append(new Spdz2kOutputToAllAsOIntProtocol<>(secretShare));
+        return builder.append(new Spdz2kOutputToAll<>(secretShare));
       }
 
       @Override
       public DRes<BigInteger> open(DRes<SInt> secretShare) {
-        return builder.append(new Spdz2kOutputToAllProtocol<>(secretShare));
+        DRes<OInt> out = openAsOInt(secretShare);
+        return () -> factory.fromOInt(out).toBigInteger();
       }
 
       @Override
-      public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
         return builder.append(new Spdz2kOutputSinglePartyProtocol<>(secretShare, outputParty));
       }
+
+      @Override
+      public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
+        DRes<OInt> out = openAsOInt(secretShare, outputParty);
+        return () -> {
+          OInt res = out.out();
+          if (res == null) {
+            return null;
+          } else {
+            return factory.fromOInt(out).toBigInteger();
+          }
+        };
+      }
     };
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index 0bb6c0c10..c025a7669 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -39,7 +39,7 @@ default OInt fromLong(long value) {
    * Get result from deferred and downcast result to {@link CompT}.
    */
   default CompT fromOInt(DRes<OInt> value) {
-    return (CompT) value.out();
+    return Objects.requireNonNull((CompT) value.out());
   }
 
   /**
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
index d95145d4d..8bf14bf34 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.network.Network;
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
@@ -11,19 +12,18 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
-import java.math.BigInteger;
 import java.util.List;
 
 /**
  * Native protocol for opening a secret value to a single party.
  */
 public class Spdz2kOutputSinglePartyProtocol<PlainT extends CompUInt<?, ?, PlainT>>
-    extends Spdz2kNativeProtocol<BigInteger, PlainT>
+    extends Spdz2kNativeProtocol<OInt, PlainT>
     implements RequiresMacCheck {
 
   private final DRes<SInt> share;
   private final int outputParty;
-  private BigInteger opened;
+  private PlainT opened;
   private Spdz2kInputMask<PlainT> inputMask;
   private Spdz2kSInt<PlainT> inMinusMask;
 
@@ -56,14 +56,14 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       PlainT recombined = UInt.sum(shares);
       openedValueStore.pushOpenedValue(inMinusMask, recombined);
       if (outputParty == resourcePool.getMyId()) {
-        this.opened = resourcePool.convertRepresentation(recombined.add(inputMask.getOpenValue()));
+        this.opened = recombined.add(inputMask.getOpenValue()).clearHighBits();
       }
       return EvaluationStatus.IS_DONE;
     }
   }
 
   @Override
-  public BigInteger out() {
+  public OInt out() {
     return opened;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
similarity index 90%
rename from suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java
rename to suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
index f0bc5ba49..d6be515cd 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllAsOIntProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
@@ -16,7 +16,7 @@
 /**
  * Native protocol for opening a secret value to all parties.
  */
-public class Spdz2kOutputToAllAsOIntProtocol<PlainT extends CompUInt<?, ?, PlainT>>
+public class Spdz2kOutputToAll<PlainT extends CompUInt<?, ?, PlainT>>
     extends Spdz2kNativeProtocol<OInt, PlainT>
     implements RequiresMacCheck {
 
@@ -25,11 +25,11 @@ public class Spdz2kOutputToAllAsOIntProtocol<PlainT extends CompUInt<?, ?, Plain
   private Spdz2kSInt<PlainT> authenticatedElement;
 
   /**
-   * Creates new {@link Spdz2kOutputToAllAsOIntProtocol}.
+   * Creates new {@link Spdz2kOutputToAll}.
    *
    * @param share value to open
    */
-  public Spdz2kOutputToAllAsOIntProtocol(DRes<SInt> share) {
+  public Spdz2kOutputToAll(DRes<SInt> share) {
     this.share = share;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java
deleted file mode 100644
index dcb1053eb..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAllProtocol.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
-import dk.alexandra.fresco.framework.util.OpenedValueStore;
-import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import java.math.BigInteger;
-import java.util.List;
-
-/**
- * Native protocol for opening a secret value to all parties.
- */
-public class Spdz2kOutputToAllProtocol<PlainT extends CompUInt<?, ?, PlainT>>
-    extends Spdz2kNativeProtocol<BigInteger, PlainT>
-    implements RequiresMacCheck {
-
-  private final DRes<SInt> share;
-  private BigInteger opened;
-  private Spdz2kSInt<PlainT> authenticatedElement;
-
-  /**
-   * Creates new {@link Spdz2kOutputToAllProtocol}.
-   *
-   * @param share value to open
-   */
-  public Spdz2kOutputToAllProtocol(DRes<SInt> share) {
-    this.share = share;
-  }
-
-  @Override
-  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
-      Network network) {
-    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> openedValueStore = resourcePool
-        .getOpenedValueStore();
-    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    if (round == 0) {
-      authenticatedElement = factory.toSpdz2kSInt(share);
-      network.sendToAll(authenticatedElement.getShare().getLeastSignificant().toByteArray());
-      return EvaluationStatus.HAS_MORE_ROUNDS;
-    } else {
-      ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();
-      List<PlainT> shares = serializer.deserializeList(network.receiveFromAll());
-      PlainT recombined = UInt.sum(shares);
-      openedValueStore.pushOpenedValue(authenticatedElement, recombined);
-      this.opened = resourcePool.convertRepresentation(recombined);
-      return EvaluationStatus.IS_DONE;
-    }
-  }
-
-  @Override
-  public BigInteger out() {
-    return opened;
-  }
-
-}

From c584125b304e455008424490f7f57e88c65f80c9 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 25 Apr 2018 09:44:42 +0200
Subject: [PATCH 075/231] Typo

---
 .../protocols/natives/Spdz2kSubtractFromKnownProtocol.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
index 8ba441403..87caceb48 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
@@ -9,7 +9,7 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 
 /**
- * Native protocol for subtracting a secret value from a known public values. <p>Note that the
+ * Native protocol for subtracting a secret value from a known public value. <p>Note that the
  * result is a secret value.</p>
  */
 public class Spdz2kSubtractFromKnownProtocol<PlainT extends CompUInt<?, ?, PlainT>>

From 88e220eba2fb1bad6d8ac3767ff41df2de24e102 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 25 Apr 2018 14:54:14 +0200
Subject: [PATCH 076/231] Remove big int references

---
 .../fresco/lib/compare/lt/BitLessThanOpen.java     |  6 +++---
 .../alexandra/fresco/lib/compare/lt/CarryOut.java  | 14 +++-----------
 .../fresco/lib/compare/lt/CarryOutTests.java       |  3 ++-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index 98b20bb42..442de65cb 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -6,7 +6,6 @@
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -37,13 +36,14 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<OInt>> openBits = builder.getOIntArithmetic().toBits(openValueA, numBits);
     DRes<List<DRes<SInt>>> secretBitsNegated = builder.par(par -> {
       List<DRes<SInt>> negatedBits = new ArrayList<>(numBits);
+      // negate
       for (DRes<SInt> secretBit : secretBits) {
-        negatedBits.add(par.numeric().sub(BigInteger.ONE, secretBit));
+        negatedBits.add(par.numeric().subFromOpen(oIntFactory.one(), secretBit));
       }
       Collections.reverse(negatedBits);
       return () -> negatedBits;
     });
-    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, BigInteger.ONE));
+    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, oIntFactory.one()));
     return builder.numeric().subFromOpen(oIntFactory.one(), gt);
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index e377e7a44..4a8800540 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -9,7 +9,6 @@
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticAndKnownRight;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -22,7 +21,7 @@ public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<OInt>>> openBitsDef;
   private final DRes<List<DRes<SInt>>> secretBitsDef;
-  private final BigInteger carryIn;
+  private final DRes<OInt> carryIn;
 
   /**
    * Constructs new {@link CarryOut}.
@@ -33,19 +32,12 @@ public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
    * inputs
    */
   public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
-      BigInteger carryIn) {
+      DRes<OInt> carryIn) {
     this.secretBitsDef = secretBits;
     this.openBitsDef = clearBits;
     this.carryIn = carryIn;
   }
 
-  /**
-   * Default call to {@link #CarryOut(DRes, DRes, BigInteger)} without a carry-in.
-   */
-  public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretBits) {
-    this(clearBits, secretBits, BigInteger.ZERO);
-  }
-
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     OIntFactory oIntFactory = builder.getOIntFactory();
@@ -79,7 +71,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           SIntPair lastPair = pairs.get(lastIdx).out();
           DRes<SInt> lastCarryPropagator = seq.numeric().add(
               lastPair.getSecond(),
-              seq.numeric().multByOpen(oIntFactory.fromBigInteger(carryIn), lastPair.getFirst()));
+              seq.numeric().multByOpen(carryIn, lastPair.getFirst()));
           pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
           Collections.reverse(pairs);
           return seq.seq(new PreCarryBits(() -> pairs));
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
index f72c64837..f6b012fe1 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/CarryOutTests.java
@@ -42,7 +42,8 @@ public void test() {
                 List<DRes<SInt>> leftClosed = root.numeric().known(right);
                 OIntFactory oIntFactory = root.getOIntFactory();
                 DRes<SInt> carry = root
-                    .seq(new CarryOut(() -> oIntFactory.fromBigInteger(right), () -> leftClosed));
+                    .seq(new CarryOut(() -> oIntFactory.fromBigInteger(right), () -> leftClosed,
+                        oIntFactory.zero()));
                 return root.numeric().open(carry);
               };
           BigInteger actual = runApplication(app);

From aca095fd64012cdae28cec0ac3b0b8036adc8fe4 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 25 Apr 2018 18:07:25 +0200
Subject: [PATCH 077/231] WIP clear above bit

---
 .../suite/spdz2k/datatypes/CompUInt.java      |  6 ++---
 .../suite/spdz2k/datatypes/CompUInt128.java   | 14 +++++++++---
 .../suite/spdz2k/datatypes/CompUInt96.java    | 22 ++++++++++++++-----
 .../computations/lt/MostSignBitSpdz2k.java    |  6 +----
 .../spdz2k/datatypes/TestCompUInt128.java     |  8 +++----
 5 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index dd76bc53c..78064b348 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -34,10 +34,10 @@ public interface CompUInt<
   CompT shiftLowIntoHigh();
 
   /**
-   * Compute this mod 2^{k-1}.
-   * TODO this should just be a regular mod pow 2 method
+   * Clears all bits above bitPos, i.e., (k + s) - bitPos most significant bits. <p>Analogous to
+   * computing this mod 2^{numBits}.</p>
    */
-  CompT modTwoToKMinOne();
+  CompT clearAboveBitAt(int bitPos);
 
   /**
    * Sets s most significant bits to 0.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 4a69b3589..56cb777a6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -174,9 +174,17 @@ public CompUInt128 shiftLowIntoHigh() {
   }
 
   @Override
-  public CompUInt128 modTwoToKMinOne() {
-    int newMid = (int) (~(1L << 31) & mid);
-    return new CompUInt128(0L, newMid, low);
+  public CompUInt128 clearAboveBitAt(int bitPos) {
+    if (bitPos < Integer.SIZE) {
+      int mask = ~(0x80000000 >> (31 - bitPos));
+      return new CompUInt128(0L, 0, low & mask);
+    } else if (bitPos < Long.SIZE) {
+      int mask = ~(0x80000000 >> (63 - bitPos));
+      return new CompUInt128(0L, mid & mask, low);
+    } else {
+      long mask = ~(0x8000000000000000L >> (127 - bitPos));
+      return new CompUInt128(high & mask, mid, low);
+    }
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 338f6dc18..9775db4af 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -167,12 +167,6 @@ public CompUInt96 clearHighBits() {
     return new CompUInt96(0, 0, low);
   }
 
-  @Override
-  public CompUInt96 modTwoToKMinOne() {
-    int newLow = (int) (~(1L << 31) & low);
-    return new CompUInt96(0, 0, newLow);
-  }
-
   @Override
   public int getLowBitLength() {
     return 32;
@@ -193,6 +187,22 @@ public int getBitLength() {
     return 96;
   }
 
+  @Override
+  public CompUInt96 clearAboveBitAt(int bitPos) {
+    // TODO
+    throw new UnsupportedOperationException();
+//    if (bitPos < Integer.SIZE) {
+//      int mask = ~(0x80000000 >> (31 - bitPos));
+//      return new CompUInt96(0, 0, low & mask);
+//    } else if (bitPos < Long.SIZE) {
+//      int mask = ~(0x80000000 >> (63 - bitPos));
+//      return new CompUInt96(0, mid & mask, low);
+//    } else {
+//      int mask = ~(0x80000000 >> (96 - bitPos));
+//      return new CompUInt96(high & mask, mid, low);
+//    }
+  }
+
   @Override
   public byte[] toByteArray() {
     ByteBuffer buffer = ByteBuffer.allocate(getBitLength() / 8);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index f6b592c2b..b2eac9cf1 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -46,15 +46,11 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
         }).seq((seq, pair) -> {
           Numeric nb = seq.numeric();
           PlainT cOpen = factory.fromOInt(pair.getFirst());
-          PlainT cPrime = cOpen.modTwoToKMinOne();
+          PlainT cPrime = cOpen.clearAboveBitAt(k - 1);
           RandomBitMask mask = pair.getSecond();
           DRes<SInt> rPrime = mask.getValue();
           List<DRes<SInt>> rPrimeBits = mask.getBits().out();
           DRes<SInt> u = seq.seq(new BitLessThanOpen(cPrime, rPrimeBits));
-//          5. Parties set [a′] = c′ − [r′] + 2k−1[u] and compute [d] = [a] − [a′].
-//          6. The parties compute and open [e] = [d] + 2k−1[b]. Let ek−1 be the most signif-
-//              icant bit of e.
-//          7. The output of the protocol is computed as ek−1 + [b] − 2ek−1[b].
           DRes<SInt> aPrime = nb.add(
               nb.subFromOpen(() -> cPrime, rPrime),
               nb.multByOpen(twoTo2k1, u)
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 1edba16f4..464fa9dfe 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -304,12 +304,12 @@ public void testTestBit() {
   @Test
   public void testModTwoToKMinOne() {
     assertEquals(new CompUInt128(0, 0, 0).toBigInteger(),
-        new CompUInt128(0, 0, 0).modTwoToKMinOne().toBigInteger());
+        new CompUInt128(0, 0, 0).clearAboveBitAt(63).toBigInteger());
     assertEquals(new CompUInt128(0, 0, 123123).toBigInteger(),
-        new CompUInt128(0, 0, 123123).modTwoToKMinOne().toBigInteger());
+        new CompUInt128(0, 0, 123123).clearAboveBitAt(63).toBigInteger());
     assertEquals(new CompUInt128(0, 0, 123123).toBigInteger(),
-        new CompUInt128(1, 0, 123123).modTwoToKMinOne().toBigInteger());
+        new CompUInt128(1, 0, 123123).clearAboveBitAt(63).toBigInteger());
     assertEquals(new CompUInt128(0, 0x70001001, 123123).toBigInteger(),
-        new CompUInt128(1, 0xf0001001, 123123).modTwoToKMinOne().toBigInteger());
+        new CompUInt128(1, 0xf0001001, 123123).clearAboveBitAt(63).toBigInteger());
   }
 }

From 920a1e365989f044a563a154bbd85d5e556f4e82 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 25 Apr 2018 18:16:05 +0200
Subject: [PATCH 078/231] Add clear bit tests 128

---
 .../fresco/suite/spdz2k/datatypes/TestCompUInt128.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 464fa9dfe..73e76f8e1 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -302,7 +302,7 @@ public void testTestBit() {
   }
 
   @Test
-  public void testModTwoToKMinOne() {
+  public void testClearAboveBitAt() {
     assertEquals(new CompUInt128(0, 0, 0).toBigInteger(),
         new CompUInt128(0, 0, 0).clearAboveBitAt(63).toBigInteger());
     assertEquals(new CompUInt128(0, 0, 123123).toBigInteger(),
@@ -311,5 +311,12 @@ public void testModTwoToKMinOne() {
         new CompUInt128(1, 0, 123123).clearAboveBitAt(63).toBigInteger());
     assertEquals(new CompUInt128(0, 0x70001001, 123123).toBigInteger(),
         new CompUInt128(1, 0xf0001001, 123123).clearAboveBitAt(63).toBigInteger());
+    assertEquals(new CompUInt128(0, 0x00000021, 123123).toBigInteger(),
+        new CompUInt128(1, 0xf0001021, 123123).clearAboveBitAt(44).toBigInteger());
+    assertEquals(new CompUInt128(0x7000100100000000L, 0x70001001, 123123).toBigInteger(),
+        new CompUInt128(0xf000100100000000L, 0x70001001, 123123).clearAboveBitAt(127)
+            .toBigInteger());
+    assertEquals(new CompUInt128(0, 0, 0x00000001).toBigInteger(),
+        new CompUInt128(1, 1, 0xff001021).clearAboveBitAt(5).toBigInteger());
   }
 }

From 3b4b18d8f30845657268b0c6c2dd0360bc432d46 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 09:54:43 +0200
Subject: [PATCH 079/231] uint96 clear above

---
 .../suite/spdz2k/datatypes/CompUInt96.java    | 22 +++++++++----------
 .../spdz2k/datatypes/TestCompUInt96.java      | 19 ++++++++++++++++
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 9775db4af..ac315774f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -189,18 +189,16 @@ public int getBitLength() {
 
   @Override
   public CompUInt96 clearAboveBitAt(int bitPos) {
-    // TODO
-    throw new UnsupportedOperationException();
-//    if (bitPos < Integer.SIZE) {
-//      int mask = ~(0x80000000 >> (31 - bitPos));
-//      return new CompUInt96(0, 0, low & mask);
-//    } else if (bitPos < Long.SIZE) {
-//      int mask = ~(0x80000000 >> (63 - bitPos));
-//      return new CompUInt96(0, mid & mask, low);
-//    } else {
-//      int mask = ~(0x80000000 >> (96 - bitPos));
-//      return new CompUInt96(high & mask, mid, low);
-//    }
+    if (bitPos < Integer.SIZE) {
+      int mask = ~(0x80000000 >> (31 - bitPos));
+      return new CompUInt96(0, 0, low & mask);
+    } else if (bitPos < Long.SIZE) {
+      int mask = ~(0x80000000 >> (63 - bitPos));
+      return new CompUInt96(0, mid & mask, low);
+    } else {
+      int mask = ~(0x80000000 >> (95 - bitPos));
+      return new CompUInt96(high & mask, mid, low);
+    }
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
index d9dbf2d66..0441a3615 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
@@ -294,4 +294,23 @@ public void testIsZero() {
     assertFalse(new CompUInt96(1, 0,0).isZero());
   }
 
+  @Test
+  public void testClearAboveBitAt() {
+    assertEquals(new CompUInt96(0, 0, 0).toBigInteger(),
+        new CompUInt96(0, 0, 0).clearAboveBitAt(63).toBigInteger());
+    assertEquals(new CompUInt96(0, 0, 123123).toBigInteger(),
+        new CompUInt96(0, 0, 123123).clearAboveBitAt(63).toBigInteger());
+    assertEquals(new CompUInt96(0, 0, 123123).toBigInteger(),
+        new CompUInt96(1, 0, 123123).clearAboveBitAt(63).toBigInteger());
+    assertEquals(new CompUInt96(0, 0x70001001, 123123).toBigInteger(),
+        new CompUInt96(1, 0xf0001001, 123123).clearAboveBitAt(63).toBigInteger());
+    assertEquals(new CompUInt96(0, 0x00000021, 123123).toBigInteger(),
+        new CompUInt96(1, 0xf0001021, 123123).clearAboveBitAt(44).toBigInteger());
+    assertEquals(new CompUInt96(0x70001001, 0x70001001, 123123).toBigInteger(),
+        new CompUInt96(0xf0001001, 0x70001001, 123123).clearAboveBitAt(95)
+            .toBigInteger());
+    assertEquals(new CompUInt96(0, 0, 0x00000001).toBigInteger(),
+        new CompUInt96(1, 1, 0xff001021).clearAboveBitAt(5).toBigInteger());
+  }
+
 }

From e4f4969fcdf03b722522fa5b1f83e7f3379c27cb Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 11:08:09 +0200
Subject: [PATCH 080/231] Logical comp directory

---
 .../builder/numeric/DefaultLogical.java       | 61 +++++++++++++++++++
 .../framework/builder/numeric/Logical.java    | 40 ++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
new file mode 100644
index 000000000..5b7f8f2f8
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -0,0 +1,61 @@
+package dk.alexandra.fresco.framework.builder.numeric;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+
+/**
+ * Default implementation of {@link Logical}, expressing logical operations via arithmetic.
+ */
+public class DefaultLogical implements Logical {
+
+  protected final ProtocolBuilderNumeric builder;
+
+  protected DefaultLogical(ProtocolBuilderNumeric builder) {
+    this.builder = builder;
+  }
+
+  @Override
+  public DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB) {
+    return builder.seq(seq -> seq.numeric().mult(bitA, bitB));
+  }
+
+  @Override
+  public DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB) {
+    // bitA + bitB - bitA * bitB
+    return builder.seq(seq -> {
+      // mult and add could be in parallel
+      DRes<SInt> sum = seq.numeric().add(bitA, bitB);
+      DRes<SInt> prod = seq.numeric().mult(bitA, bitB);
+      return seq.numeric().sub(sum, prod);
+    });
+  }
+
+  @Override
+  public DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
+    return builder.seq(seq -> seq.numeric().multByOpen(knownBit, secretBit));
+  }
+
+  @Override
+  public DRes<SInt> xorKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
+    // knownBit + secretBit - 2 * knownBit * secretBit
+    return builder.seq(seq -> {
+      // mult and add could be in parallel
+      OInt two = seq.getOIntFactory().two();
+      DRes<SInt> sum = seq.numeric().addOpen(knownBit, secretBit);
+      DRes<SInt> prod = seq.numeric()
+          .multByOpen(two, seq.numeric().multByOpen(knownBit, secretBit));
+      return seq.numeric().sub(sum, prod);
+    });
+  }
+
+  @Override
+  public DRes<SInt> not(DRes<SInt> secretBit) {
+    // 1 - secretBit
+    return builder.seq(seq -> {
+      OInt one = seq.getOIntFactory().one();
+      return seq.numeric().subFromOpen(one, secretBit);
+    });
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
new file mode 100644
index 000000000..4d8f727fa
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -0,0 +1,40 @@
+package dk.alexandra.fresco.framework.builder.numeric;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+
+/**
+ * Logical operators on secret arithmetic representations of boolean values. <p>NOTE: all inputs are
+ * assumed to represent 0 or 1 values only. The result is undefined if other values are passed
+ * in.</p>
+ */
+public interface Logical extends ComputationDirectory {
+
+  /**
+   * Computes logical AND of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
+   */
+  DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB);
+
+  /**
+   * Computes logical OR of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
+   */
+  DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB);
+
+  /**
+   * Computes logical AND of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
+   */
+  DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit);
+
+  /**
+   * Computes logical XOR of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
+   */
+  DRes<SInt> xorKnown(DRes<OInt> knownBit, DRes<SInt> secretBit);
+
+  /**
+   * Computes logical NOT of input. <p>NOTE: Input must represent 0 or 1 values only.</p>
+   */
+  DRes<SInt> not(DRes<SInt> secretBit);
+
+}

From 6e65e852c29c028ecc4dda735984a2903d5848b7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 11:34:12 +0200
Subject: [PATCH 081/231] Update known and/ xor tests

---
 .../numeric/BuilderFactoryNumeric.java        |  3 +++
 .../numeric/ProtocolBuilderNumeric.java       | 14 +++++++++++++
 .../binary/ArithmeticAndKnownRight.java       |  3 +--
 .../binary/ArithmeticXorKnownRight.java       | 21 ++++++-------------
 .../integer/binary/BinaryOperationsTests.java | 19 +++++++----------
 5 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
index ea2c7c0e0..672446304 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
@@ -73,6 +73,9 @@ default RealLinearAlgebra createRealLinearAlgebra(ProtocolBuilderNumeric builder
     return new FixedLinearAlgebra(builder);
   }
 
+  default Logical createLogical(ProtocolBuilderNumeric builder) {
+    return new DefaultLogical(builder);
+  }
 
   /**
    * Returns a builder which can be helpful while developing a new protocol. Be very careful though,
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
index 43a839fab..1a1580fe9 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
@@ -28,6 +28,7 @@ public class ProtocolBuilderNumeric extends ProtocolBuilderImpl<ProtocolBuilderN
   private RealNumeric realNumeric;
   private AdvancedRealNumeric advancedRealNumeric;
   private RealLinearAlgebra realLinearAlgebra;
+  private Logical logical;
   private RealNumericContext realNumericContext;
 
   ProtocolBuilderNumeric(BuilderFactoryNumeric factory, boolean parallel) {
@@ -103,6 +104,19 @@ public Collections collections() {
     return collections;
   }
 
+  /**
+   * Creates a {@link Logical} computation directory for this instance - i.e. this intended
+   * producer. Contains logical operations on arithmetic value.
+   *
+   * @return The collections computation directory.
+   */
+  public Logical logical() {
+    if (logical == null) {
+      logical = factory.createLogical(this);
+    }
+    return logical;
+  }
+
   /**
    * Creates a {@link PreprocessedValues} computation directory for this instance - i.e. this
    * intended producer. Contains elements which, if created prior to this evaluation, would save
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
index 7d14f1055..e33ae2196 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
@@ -39,8 +39,7 @@ public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
     for (int i = 0; i < leftOut.size(); i++) {
       DRes<SInt> leftBit = leftOut.get(i);
       DRes<OInt> rightBit = rightOut.get(i);
-      // logical and of two bits can be computed as product
-      DRes<SInt> andedBit = builder.seq(seq -> seq.numeric().multByOpen(rightBit, leftBit));
+      DRes<SInt> andedBit = builder.logical().andKnown(rightBit, leftBit);
       andedBits.add(andedBit);
     }
     return () -> andedBits;
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
index 148188bd9..fe1314792 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
@@ -2,10 +2,9 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationParallel;
-import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,9 +15,8 @@
 public class ArithmeticXorKnownRight implements
     ComputationParallel<List<DRes<SInt>>, ProtocolBuilderNumeric> {
 
-  private static final BigInteger TWO = BigInteger.valueOf(2);
   private final DRes<List<DRes<SInt>>> leftBits;
-  private final DRes<List<DRes<BigInteger>>> rightBits;
+  private final DRes<List<DRes<OInt>>> rightBits;
 
   /**
    * Constructs new {@link ArithmeticXorKnownRight}.
@@ -28,7 +26,7 @@ public class ArithmeticXorKnownRight implements
    */
   public ArithmeticXorKnownRight(
       DRes<List<DRes<SInt>>> leftBits,
-      DRes<List<DRes<BigInteger>>> rightBits) {
+      DRes<List<DRes<OInt>>> rightBits) {
     this.leftBits = leftBits;
     this.rightBits = rightBits;
   }
@@ -36,19 +34,12 @@ public ArithmeticXorKnownRight(
   @Override
   public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> leftOut = leftBits.out();
-    List<DRes<BigInteger>> rightOut = rightBits.out();
+    List<DRes<OInt>> rightOut = rightBits.out();
     List<DRes<SInt>> xoredBits = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       DRes<SInt> leftBit = leftOut.get(i);
-      BigInteger rightBit = rightOut.get(i).out();
-      // logical xor of two bits can be computed as leftBit + rightBit - 2 * leftBit * rightBit
-      DRes<SInt> xoredBit = builder.seq(seq -> {
-        Numeric nb = seq.numeric();
-        return nb.sub(
-            nb.add(rightBit, leftBit),
-            nb.mult(TWO, nb.mult(rightBit, leftBit))
-        );
-      });
+      DRes<OInt> rightBit = rightOut.get(i).out();
+      DRes<SInt> xoredBit = builder.logical().xorKnown(rightBit, leftBit);
       xoredBits.add(xoredBit);
     }
     return () -> xoredBits;
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
index ea0b02b43..f03724a6a 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
@@ -178,23 +178,20 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
             BigInteger.ZERO,
             BigInteger.ONE,
             BigInteger.ZERO);
-        private final List<DRes<BigInteger>> right = Arrays.asList(
-            () -> BigInteger.ONE,
-            () -> BigInteger.ONE,
-            () -> BigInteger.ZERO,
-            () -> BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
 
         @Override
         public void test() {
           Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
               root -> {
-                int myId = root.getBasicNumericContext().getMyId();
-                DRes<List<DRes<SInt>>> leftClosed =
-                    (myId == 1) ?
-                        root.collections().closeList(left, 1)
-                        : root.collections().closeList(left.size(), 1);
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
                 DRes<List<DRes<SInt>>> anded = root
-                    .par(new ArithmeticXorKnownRight(leftClosed, () -> right));
+                    .par(new ArithmeticXorKnownRight(leftClosed, () -> rightOInts));
                 return root.collections().openList(anded);
               };
           List<BigInteger> actual = runApplication(app).stream().map(DRes::out)

From 4cc20c55e54f2956c749052b9aee7ca29454e385 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 11:36:33 +0200
Subject: [PATCH 082/231] Stray sout

---
 .../test/java/dk/alexandra/fresco/lib/compare/CompareTests.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index 6a7233d6f..4a6bafff1 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -345,7 +345,6 @@ public void test() {
             return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
           };
           List<BigInteger> actual = runApplication(app);
-          System.out.println(expected + " " + actual);
           Assert.assertEquals(expected, actual);
         }
       };

From 0d27ceeaca500b8af44b94e63b1094adfb77c8ad Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 11:46:01 +0200
Subject: [PATCH 083/231] WIP use logical ops in bit less than

---
 .../lib/compare/lt/BitLessThanOpen.java       |  5 +-
 .../fresco/lib/compare/lt/CarryOut.java       | 62 +++++++++----------
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index 442de65cb..0422e914c 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -36,15 +36,14 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<OInt>> openBits = builder.getOIntArithmetic().toBits(openValueA, numBits);
     DRes<List<DRes<SInt>>> secretBitsNegated = builder.par(par -> {
       List<DRes<SInt>> negatedBits = new ArrayList<>(numBits);
-      // negate
       for (DRes<SInt> secretBit : secretBits) {
-        negatedBits.add(par.numeric().subFromOpen(oIntFactory.one(), secretBit));
+        negatedBits.add(par.logical().not(secretBit));
       }
       Collections.reverse(negatedBits);
       return () -> negatedBits;
     });
     DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, oIntFactory.one()));
-    return builder.numeric().subFromOpen(oIntFactory.one(), gt);
+    return builder.logical().not(gt);
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 4a8800540..5b740ed22 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -2,13 +2,13 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
-import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticAndKnownRight;
+import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticXorKnownRight;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -40,42 +40,38 @@ public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretB
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    OIntFactory oIntFactory = builder.getOIntFactory();
     List<DRes<SInt>> secretBits = secretBitsDef.out();
     List<DRes<OInt>> openBits = openBitsDef.out();
     if (secretBits.size() != openBits.size()) {
       throw new IllegalArgumentException("Number of bits must be the same");
     }
-    return builder.par(new ArithmeticAndKnownRight(secretBitsDef, openBitsDef))
-        .par((par, andedBits) -> {
-          List<DRes<SIntPair>> pairs = new ArrayList<>(andedBits.size());
-          for (int i = 0; i < secretBits.size(); i++) {
-            DRes<SInt> leftBit = secretBits.get(i);
-            DRes<OInt> rightBit = openBits.get(i);
-            DRes<SInt> andedBit = andedBits.get(i);
-            // TODO we need a logical computation directory for logical ops on arithmetic values
-            // logical xor of two bits is leftBit + rightBit - 2 * leftBit * rightBit
-            DRes<SInt> xoredBit = par.seq(seq -> {
-              Numeric nb = seq.numeric();
-              return nb.sub(
-                  nb.addOpen(rightBit, leftBit),
-                  nb.multByOpen(oIntFactory.two(), andedBit)
-              );
-            });
-            pairs.add(() -> new SIntPair(xoredBit, andedBit));
-          }
-          return () -> pairs;
-        }).seq((seq, pairs) -> {
-          // need to account for carry-in bit
-          int lastIdx = pairs.size() - 1;
-          SIntPair lastPair = pairs.get(lastIdx).out();
-          DRes<SInt> lastCarryPropagator = seq.numeric().add(
-              lastPair.getSecond(),
-              seq.numeric().multByOpen(carryIn, lastPair.getFirst()));
-          pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
-          Collections.reverse(pairs);
-          return seq.seq(new PreCarryBits(() -> pairs));
-        });
+    return builder.par(par -> {
+      DRes<List<DRes<SInt>>> xored = new ArithmeticXorKnownRight(secretBitsDef, openBitsDef)
+          .buildComputation(par);
+      DRes<List<DRes<SInt>>> anded = new ArithmeticAndKnownRight(secretBitsDef, openBitsDef)
+          .buildComputation(par);
+      return () -> new Pair<>(xored.out(), anded.out());
+    }).par((par, pair) -> {
+      List<DRes<SInt>> xoredBits = pair.getFirst();
+      List<DRes<SInt>> andedBits = pair.getSecond();
+      List<DRes<SIntPair>> pairs = new ArrayList<>(andedBits.size());
+      for (int i = 0; i < secretBits.size(); i++) {
+        DRes<SInt> xoredBit = xoredBits.get(i);
+        DRes<SInt> andedBit = andedBits.get(i);
+        pairs.add(() -> new SIntPair(xoredBit, andedBit));
+      }
+      return () -> pairs;
+    }).seq((seq, pairs) -> {
+      // need to account for carry-in bit
+      int lastIdx = pairs.size() - 1;
+      SIntPair lastPair = pairs.get(lastIdx).out();
+      DRes<SInt> lastCarryPropagator = seq.numeric().add(
+          lastPair.getSecond(),
+          seq.logical().andKnown(carryIn, lastPair.getFirst()));
+      pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
+      Collections.reverse(pairs);
+      return seq.seq(new PreCarryBits(() -> pairs));
+    });
   }
 
 }

From 3e1f2cca78235628c6724a16511cfd29acac29dd Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 12:50:13 +0200
Subject: [PATCH 084/231] Missing open as oint methods

---
 .../framework/builder/numeric/Numeric.java    |  8 ++------
 .../fresco/lib/compare/lt/CarryHelper.java    |  8 +++-----
 .../arithmetic/NumericLoggingDecorator.java   | 10 ++++++++++
 .../DummyArithmeticBuilderFactory.java        | 19 ++++++++++++++++++
 .../fresco/suite/spdz/SpdzBuilder.java        | 20 +++++++++++++++++++
 .../suite/spdz/MaliciousSpdzBuilder.java      | 10 ++++++++++
 6 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
index 39f6810b2..65649659e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Numeric.java
@@ -149,16 +149,12 @@ public interface Numeric extends ComputationDirectory {
   /**
    * Opens a value to all MPC parties.
    */
-  default DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
-    throw new UnsupportedOperationException();
-  }
+  DRes<OInt> openAsOInt(DRes<SInt> secretShare);
 
   /**
    * Opens a value to all MPC parties.
    */
-  default DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
-    throw new UnsupportedOperationException();
-  }
+  DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty);
 
   /**
    * Opens a value to a single given party.
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
index 3f4e9e122..795c4c1f9 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
@@ -2,7 +2,6 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -36,11 +35,10 @@ public DRes<SIntPair> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<SInt> p2 = right.getFirst();
     DRes<SInt> g2 = right.getSecond();
     return builder.par(par -> {
-      Numeric numeric = par.numeric();
-      DRes<SInt> p = numeric.mult(p1, p2);
+      DRes<SInt> p = par.logical().and(p1, p2);
       DRes<SInt> q = par.seq(seq -> {
-        DRes<SInt> temp = seq.numeric().mult(p2, g1);
-        return seq.numeric().add(temp, g2);
+        DRes<SInt> temp = seq.logical().and(p2, g1);
+        return seq.logical().or(temp, g2);
       });
       return () -> new SIntPair(p, q);
     });
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java
index 1cd8fc53e..5b2cb393a 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/NumericLoggingDecorator.java
@@ -113,6 +113,16 @@ public DRes<BigInteger> open(DRes<SInt> secretShare) {
     return this.delegate.open(secretShare);
   }
 
+  @Override
+  public DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
+    return delegate.openAsOInt(secretShare);
+  }
+
+  @Override
+  public DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
+    return delegate.openAsOInt(secretShare, outputParty);
+  }
+
   @Override
   public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
     return this.delegate.open(secretShare, outputParty);
diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index 61238b247..de99f0d5c 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -140,6 +140,25 @@ public DRes<BigInteger> open(DRes<SInt> secretShare) {
         return builder.append(c);
       }
 
+      @Override
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
+        DRes<BigInteger> value = open(secretShare);
+        return () -> oIntFactory.fromBigInteger(value.out());
+      }
+
+      @Override
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
+        DRes<BigInteger> out = open(secretShare, outputParty);
+        return () -> {
+          BigInteger res = out.out();
+          if (res == null) {
+            return null;
+          } else {
+            return oIntFactory.fromBigInteger(res);
+          }
+        };
+      }
+
       @Override
       public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
         DummyArithmeticOpenProtocol c = new DummyArithmeticOpenProtocol(secretShare, outputParty);
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 6f6630618..9a0b22ed2 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -166,6 +166,26 @@ public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
             outputParty);
         return protocolBuilder.append(openProtocol);
       }
+
+      @Override
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
+        DRes<BigInteger> value = open(secretShare);
+        return () -> oIntFactory.fromBigInteger(value.out());
+      }
+
+      @Override
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
+        DRes<BigInteger> out = open(secretShare, outputParty);
+        return () -> {
+          BigInteger res = out.out();
+          if (res == null) {
+            return null;
+          } else {
+            return oIntFactory.fromBigInteger(res);
+          }
+        };
+      }
+
     };
   }
 
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java
index d34722f03..c699ba6f1 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/MaliciousSpdzBuilder.java
@@ -121,6 +121,16 @@ public DRes<BigInteger> open(DRes<SInt> secretShare) {
         return protocolBuilder.append(openProtocol);
       }
 
+      @Override
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare) {
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
+        throw new UnsupportedOperationException();
+      }
+
       @Override
       public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
         SpdzOutputSingleProtocol openProtocol =

From 83feebb71ccb22fd29f2d538652a83a2e4769296 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 13:03:38 +0200
Subject: [PATCH 085/231] Fix comment

---
 .../java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
index 795c4c1f9..a0454a001 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
@@ -8,7 +8,7 @@
 
 /**
  * Corresponds to circle operator in paper. <p>Given (p_{2}, g_{2}) and (p_{1}, g_{1}) computes (p,
- * g) where p = p_{2} * p_{1} and g = g_{2} + (p_{1} * g_{1}).</p>
+ * g) where p = p_{2} AND p_{1} and g = g_{2} OR (p_{2} AND g_{1}).</p>
  */
 public class CarryHelper implements Computation<SIntPair, ProtocolBuilderNumeric> {
 

From 060e50435d83b429fa6c2fadcf9dab49fe7cbb73 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 13:17:46 +0200
Subject: [PATCH 086/231] Add xor/ and on lists to logical builder

---
 .../builder/numeric/DefaultLogical.java       | 36 ++++++++++++++
 .../framework/builder/numeric/Logical.java    | 15 ++++++
 .../fresco/lib/compare/lt/CarryOut.java       |  8 +---
 .../binary/ArithmeticAndKnownRight.java       | 48 -------------------
 .../binary/ArithmeticXorKnownRight.java       | 48 -------------------
 .../integer/binary/BinaryOperationsTests.java | 10 ++--
 6 files changed, 58 insertions(+), 107 deletions(-)
 delete mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
 delete mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 5b7f8f2f8..d1a36867e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -3,6 +3,8 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Default implementation of {@link Logical}, expressing logical operations via arithmetic.
@@ -58,4 +60,38 @@ public DRes<SInt> not(DRes<SInt> secretBit) {
     });
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits) {
+    return builder.par(par -> {
+      List<DRes<SInt>> leftOut = secretBits.out();
+      List<DRes<OInt>> rightOut = knownBits.out();
+      List<DRes<SInt>> andedBits = new ArrayList<>(leftOut.size());
+      for (int i = 0; i < leftOut.size(); i++) {
+        DRes<SInt> leftBit = leftOut.get(i);
+        DRes<OInt> rightBit = rightOut.get(i);
+        DRes<SInt> andedBit = par.logical().andKnown(rightBit, leftBit);
+        andedBits.add(andedBit);
+      }
+      return () -> andedBits;
+    });
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits) {
+    return builder.par(par -> {
+      List<DRes<SInt>> leftOut = secretBits.out();
+      List<DRes<OInt>> rightOut = knownBits.out();
+      List<DRes<SInt>> xoredBits = new ArrayList<>(leftOut.size());
+      for (int i = 0; i < leftOut.size(); i++) {
+        DRes<SInt> leftBit = leftOut.get(i);
+        DRes<OInt> rightBit = rightOut.get(i);
+        DRes<SInt> andedBit = par.logical().xorKnown(rightBit, leftBit);
+        xoredBits.add(andedBit);
+      }
+      return () -> xoredBits;
+    });
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index 4d8f727fa..3f27efc63 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
+import java.util.List;
 
 /**
  * Logical operators on secret arithmetic representations of boolean values. <p>NOTE: all inputs are
@@ -37,4 +38,18 @@ public interface Logical extends ComputationDirectory {
    */
   DRes<SInt> not(DRes<SInt> secretBit);
 
+  /**
+   * Computes pairwise logical AND of input bits. <p>NOTE: Inputs must represent 0 or 1 values
+   * only.</p>
+   */
+  DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits);
+
+  /**
+   * Computes pairwise logical XOR of input bits. <p>NOTE: Inputs must represent 0 or 1 values
+   * only.</p>
+   */
+  DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits);
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 5b740ed22..ddf56ec94 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -7,8 +7,6 @@
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticAndKnownRight;
-import dk.alexandra.fresco.lib.math.integer.binary.ArithmeticXorKnownRight;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -46,10 +44,8 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       throw new IllegalArgumentException("Number of bits must be the same");
     }
     return builder.par(par -> {
-      DRes<List<DRes<SInt>>> xored = new ArithmeticXorKnownRight(secretBitsDef, openBitsDef)
-          .buildComputation(par);
-      DRes<List<DRes<SInt>>> anded = new ArithmeticAndKnownRight(secretBitsDef, openBitsDef)
-          .buildComputation(par);
+      DRes<List<DRes<SInt>>> xored = par.logical().pairWiseXorKnown(openBitsDef, secretBitsDef);
+      DRes<List<DRes<SInt>>> anded = par.logical().pairWiseAndKnown(openBitsDef, secretBitsDef);
       return () -> new Pair<>(xored.out(), anded.out());
     }).par((par, pair) -> {
       List<DRes<SInt>> xoredBits = pair.getFirst();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
deleted file mode 100644
index e33ae2196..000000000
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticAndKnownRight.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package dk.alexandra.fresco.lib.math.integer.binary;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.ComputationParallel;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.OInt;
-import dk.alexandra.fresco.framework.value.SInt;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Computes logical AND for each bit in the two lists. <p>Bits are represented as arithmetic
- * elements. The AND operation is expressed via an arithmetic gate.</p>
- */
-public class ArithmeticAndKnownRight implements
-    ComputationParallel<List<DRes<SInt>>, ProtocolBuilderNumeric> {
-
-  private final DRes<List<DRes<SInt>>> leftBits;
-  private final DRes<List<DRes<OInt>>> rightBits;
-
-  /**
-   * Constructs new {@link ArithmeticAndKnownRight}.
-   *
-   * @param leftBits secret bits represented as arithmetic elements
-   * @param rightBits open bits represented as arithmetic elements
-   */
-  public ArithmeticAndKnownRight(
-      DRes<List<DRes<SInt>>> leftBits,
-      DRes<List<DRes<OInt>>> rightBits) {
-    this.leftBits = leftBits;
-    this.rightBits = rightBits;
-  }
-
-  @Override
-  public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
-    List<DRes<SInt>> leftOut = leftBits.out();
-    List<DRes<OInt>> rightOut = rightBits.out();
-    List<DRes<SInt>> andedBits = new ArrayList<>(leftOut.size());
-    for (int i = 0; i < leftOut.size(); i++) {
-      DRes<SInt> leftBit = leftOut.get(i);
-      DRes<OInt> rightBit = rightOut.get(i);
-      DRes<SInt> andedBit = builder.logical().andKnown(rightBit, leftBit);
-      andedBits.add(andedBit);
-    }
-    return () -> andedBits;
-  }
-
-}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
deleted file mode 100644
index fe1314792..000000000
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/ArithmeticXorKnownRight.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package dk.alexandra.fresco.lib.math.integer.binary;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.ComputationParallel;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.OInt;
-import dk.alexandra.fresco.framework.value.SInt;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Computes logical XOR for each bit in the two lists. <p>Bits are represented as represented as
- * arithmetic elements. The XOR operation is expressed via an arithmetic gate.</p>
- */
-public class ArithmeticXorKnownRight implements
-    ComputationParallel<List<DRes<SInt>>, ProtocolBuilderNumeric> {
-
-  private final DRes<List<DRes<SInt>>> leftBits;
-  private final DRes<List<DRes<OInt>>> rightBits;
-
-  /**
-   * Constructs new {@link ArithmeticXorKnownRight}.
-   *
-   * @param leftBits secret bits represented as arithmetic elements
-   * @param rightBits open bits represented as arithmetic elements
-   */
-  public ArithmeticXorKnownRight(
-      DRes<List<DRes<SInt>>> leftBits,
-      DRes<List<DRes<OInt>>> rightBits) {
-    this.leftBits = leftBits;
-    this.rightBits = rightBits;
-  }
-
-  @Override
-  public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
-    List<DRes<SInt>> leftOut = leftBits.out();
-    List<DRes<OInt>> rightOut = rightBits.out();
-    List<DRes<SInt>> xoredBits = new ArrayList<>(leftOut.size());
-    for (int i = 0; i < leftOut.size(); i++) {
-      DRes<SInt> leftBit = leftOut.get(i);
-      DRes<OInt> rightBit = rightOut.get(i).out();
-      DRes<SInt> xoredBit = builder.logical().xorKnown(rightBit, leftBit);
-      xoredBits.add(xoredBit);
-    }
-    return () -> xoredBits;
-  }
-
-}
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
index f03724a6a..192069410 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
@@ -148,8 +148,8 @@ public void test() {
               root -> {
                 DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
                 List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
-                DRes<List<DRes<SInt>>> anded = root
-                    .par(new ArithmeticAndKnownRight(leftClosed, () -> rightOInts));
+                DRes<List<DRes<SInt>>> anded = root.logical()
+                    .pairWiseAndKnown(() -> rightOInts, leftClosed);
                 return root.collections().openList(anded);
               };
           List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
@@ -190,9 +190,9 @@ public void test() {
               root -> {
                 DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
                 List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
-                DRes<List<DRes<SInt>>> anded = root
-                    .par(new ArithmeticXorKnownRight(leftClosed, () -> rightOInts));
-                return root.collections().openList(anded);
+                DRes<List<DRes<SInt>>> xored = root.logical()
+                    .pairWiseXorKnown(() -> rightOInts, leftClosed);
+                return root.collections().openList(xored);
               };
           List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
               .collect(Collectors.toList());

From c4ac8fa5d396b53a6b07160ea6abf80923ab5e2d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 13:27:13 +0200
Subject: [PATCH 087/231] Add or of list stub

---
 .../fresco/framework/builder/numeric/DefaultLogical.java    | 6 ++++++
 .../alexandra/fresco/framework/builder/numeric/Logical.java | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index d1a36867e..13a786ff1 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -94,4 +94,10 @@ public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
     });
   }
 
+  @Override
+  public DRes<SInt> orOfList(DRes<List<DRes<OInt>>> bits) {
+    // TODO implement
+    throw new UnsupportedOperationException();
+  }
+  
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index 3f27efc63..f3f6b767a 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -52,4 +52,9 @@ DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
   DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
       DRes<List<DRes<SInt>>> secretBits);
 
+  /**
+   * Computes logical OR of all input bits. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
+   */
+  DRes<SInt> orOfList(DRes<List<DRes<OInt>>> bits);
+
 }

From 49f84cb03df2460c3f1ef0830fe204bd3f771fa6 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 13:33:13 +0200
Subject: [PATCH 088/231] Moved logical tests to a logical place

---
 .../builder/numeric/DefaultLogical.java       |   2 +-
 .../integer/binary/BinaryOperationsTests.java |  85 ---------------
 .../logical/LogicalOperationsTests.java       | 103 ++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     |  12 +-
 4 files changed, 110 insertions(+), 92 deletions(-)
 create mode 100644 core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 13a786ff1..5d5008e91 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -99,5 +99,5 @@ public DRes<SInt> orOfList(DRes<List<DRes<OInt>>> bits) {
     // TODO implement
     throw new UnsupportedOperationException();
   }
-  
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
index 192069410..f8bdb317e 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/binary/BinaryOperationsTests.java
@@ -10,7 +10,6 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.Pair;
-import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -124,90 +123,6 @@ public void test() {
     }
   }
 
-  public static class TestArithmeticAndKnownRight<ResourcePoolT extends ResourcePool>
-      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
-
-    @Override
-    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
-
-      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
-        private final List<BigInteger> left = Arrays.asList(
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ONE,
-            BigInteger.ZERO);
-        private final List<BigInteger> right = Arrays.asList(
-            BigInteger.ONE,
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ZERO);
-
-        @Override
-        public void test() {
-          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
-              root -> {
-                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
-                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
-                DRes<List<DRes<SInt>>> anded = root.logical()
-                    .pairWiseAndKnown(() -> rightOInts, leftClosed);
-                return root.collections().openList(anded);
-              };
-          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
-              .collect(Collectors.toList());
-          List<BigInteger> expected = Arrays.asList(
-              BigInteger.ONE,
-              BigInteger.ZERO,
-              BigInteger.ZERO,
-              BigInteger.ZERO
-          );
-          Assert.assertEquals(expected, actual);
-        }
-      };
-    }
-  }
-
-  public static class TestArithmeticXorKnownRight<ResourcePoolT extends ResourcePool>
-      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
-
-    @Override
-    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
-
-      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
-        private final List<BigInteger> left = Arrays.asList(
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ONE,
-            BigInteger.ZERO);
-        private final List<BigInteger> right = Arrays.asList(
-            BigInteger.ONE,
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ZERO);
-
-        @Override
-        public void test() {
-          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
-              root -> {
-                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
-                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
-                DRes<List<DRes<SInt>>> xored = root.logical()
-                    .pairWiseXorKnown(() -> rightOInts, leftClosed);
-                return root.collections().openList(xored);
-              };
-          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
-              .collect(Collectors.toList());
-          List<BigInteger> expected = Arrays.asList(
-              BigInteger.ZERO,
-              BigInteger.ONE,
-              BigInteger.ONE,
-              BigInteger.ZERO
-          );
-          Assert.assertEquals(expected, actual);
-        }
-      };
-    }
-  }
-
   public static class TestGenerateRandomBitMask<ResourcePoolT extends NumericResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
new file mode 100644
index 000000000..72bcc625f
--- /dev/null
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
@@ -0,0 +1,103 @@
+package dk.alexandra.fresco.lib.math.integer.logical;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.Assert;
+
+public class LogicalOperationsTests {
+
+  public static class TestXorKnown<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
+                DRes<List<DRes<SInt>>> xored = root.logical()
+                    .pairWiseXorKnown(() -> rightOInts, leftClosed);
+                return root.collections().openList(xored);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ZERO,
+              BigInteger.ONE,
+              BigInteger.ONE,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestAndKnown<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
+                DRes<List<DRes<SInt>>> anded = root.logical()
+                    .pairWiseAndKnown(() -> rightOInts, leftClosed);
+                return root.collections().openList(anded);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.ZERO,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 7fee4af75..d2339fa16 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -37,13 +37,13 @@
 import dk.alexandra.fresco.lib.lp.LPSolver;
 import dk.alexandra.fresco.lib.lp.LpBuildingBlockTests;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests;
-import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestArithmeticAndKnownRight;
-import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestArithmeticXorKnownRight;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
 import dk.alexandra.fresco.lib.math.integer.division.DivisionTests;
 import dk.alexandra.fresco.lib.math.integer.exp.ExponentiationTests;
 import dk.alexandra.fresco.lib.math.integer.linalg.LinAlgTests;
 import dk.alexandra.fresco.lib.math.integer.log.LogTests;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAndKnown;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestXorKnown;
 import dk.alexandra.fresco.lib.math.integer.min.MinTests;
 import dk.alexandra.fresco.lib.math.integer.mod.Mod2mTests.TestMod2mBaseCase;
 import dk.alexandra.fresco.lib.math.integer.sqrt.SqrtTests;
@@ -782,13 +782,13 @@ public void test_trunctation() {
   }
 
   @Test
-  public void testArithmeticAndKnownRight() {
-    runTest(new TestArithmeticAndKnownRight<>(), new TestParameters());
+  public void testAndKnown() {
+    runTest(new TestAndKnown<>(), new TestParameters());
   }
 
   @Test
-  public void testArithmeticXorKnownRight() {
-    runTest(new TestArithmeticXorKnownRight<>(), new TestParameters());
+  public void testXorKnown() {
+    runTest(new TestXorKnown<>(), new TestParameters());
   }
 
   @Test

From 2b41ddcbac7b51a35573a928f0f72e7657417d96 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 26 Apr 2018 14:05:13 +0200
Subject: [PATCH 089/231] Refactored mod2m and added modulus operations to
 opened values

---
 .../builder/numeric/AdvancedNumeric.java      | 13 ++++-
 .../numeric/DefaultAdvancedNumeric.java       |  7 ++-
 .../value/BigIntegerOIntArithmetic.java       | 10 +++-
 .../framework/value/OIntArithmetic.java       | 11 ++++
 .../integer/binary/GenerateRandomBitMask.java | 28 ++++++----
 .../math/integer/binary}/RandomBitMask.java   |  4 +-
 .../fresco/lib/math/integer/mod/Mod2m.java    | 53 +++++++------------
 .../spdz2k/datatypes/CompUIntArithmetic.java  | 10 ++++
 .../computations/lt/MostSignBitSpdz2k.java    |  2 +-
 9 files changed, 86 insertions(+), 52 deletions(-)
 rename core/src/main/java/dk/alexandra/fresco/{framework/util => lib/math/integer/binary}/RandomBitMask.java (79%)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
index 1132eff7f..63e7f55ea 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
@@ -3,9 +3,10 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
 import dk.alexandra.fresco.framework.util.Pair;
-import dk.alexandra.fresco.framework.util.RandomBitMask;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
+
 import java.math.BigInteger;
 import java.util.List;
 
@@ -176,6 +177,16 @@ DRes<SInt> innerProductWithPublicPart(DRes<List<DRes<OInt>>> vectorA,
    */
   DRes<RandomBitMask> randomBitMask(int noOfBits);
 
+  /**
+   * Takes a list of random bits [b0, ..., bn] and generates a random bit mask along with a
+   * {@link SInt} representing the recombined bits, i.e., sum(2^{i} * bi).
+   *
+   * @param randomBits
+   *          The bits to use for the bit mask
+   * @return A container holding the bit mask
+   */
+  DRes<RandomBitMask> randomBitMask(DRes<List<DRes<SInt>>> randomBits);
+
   /**
    * @param input input.
    * @return A deferred result computing input >> 1
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
index fcf2a1e37..6e26bffe5 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
@@ -2,7 +2,6 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.util.Pair;
-import dk.alexandra.fresco.framework.util.RandomBitMask;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelect;
@@ -12,6 +11,7 @@
 import dk.alexandra.fresco.lib.math.integer.SumSIntList;
 import dk.alexandra.fresco.lib.math.integer.binary.BitLength;
 import dk.alexandra.fresco.lib.math.integer.binary.GenerateRandomBitMask;
+import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 import dk.alexandra.fresco.lib.math.integer.binary.RightShift;
 import dk.alexandra.fresco.lib.math.integer.division.KnownDivisor;
 import dk.alexandra.fresco.lib.math.integer.division.KnownDivisorRemainder;
@@ -130,6 +130,11 @@ public DRes<RandomBitMask> randomBitMask(int numBits) {
     return builder.seq(new GenerateRandomBitMask(numBits));
   }
 
+  @Override
+  public DRes<RandomBitMask> randomBitMask(DRes<List<DRes<SInt>>> randomBits) {
+    return builder.seq(new GenerateRandomBitMask(randomBits));
+  }
+
   @Override
   public DRes<SInt> rightShift(DRes<SInt> input) {
     DRes<RightShiftResult> rightShiftResult = builder.seq(
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 2de764325..8f041c035 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -11,7 +11,7 @@
  * via {@link BigInteger}.
  */
 public class BigIntegerOIntArithmetic implements OIntArithmetic {
-
+  private static final BigInteger TWO = new BigInteger("2");
   // TODO wrapping all OInts in DRes seems like a bad idea
   private List<DRes<OInt>> twoPowersList;
   private final OIntFactory factory;
@@ -56,7 +56,13 @@ public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
 
   @Override
   public DRes<OInt> twoTo(int power) {
-    throw new UnsupportedOperationException();
+    return factory.fromBigInteger(TWO.pow(power));
+  }
+
+  @Override
+  public DRes<OInt> modTwoTo(OInt input, int power) {
+    return factory.fromBigInteger(factory.toBigInteger(input).mod(TWO.pow(
+        power)));
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index 2e02c22c3..64a080ddb 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -26,4 +26,15 @@ public interface OIntArithmetic {
    */
   DRes<OInt> twoTo(int power);
 
+  /**
+   * Reduces {@link input} modulo 2^{power}.
+   *
+   * @param input
+   *          the input to reduce
+   * @param power
+   *          the two-power to reduce against
+   * @return the reduced input modulo the two-power
+   */
+  DRes<OInt> modTwoTo(OInt input, int power);
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
index 9af746fae..3217b5cf1 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
@@ -3,7 +3,6 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.util.RandomBitMask;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.ArrayList;
@@ -15,22 +14,31 @@
 public class GenerateRandomBitMask implements Computation<RandomBitMask, ProtocolBuilderNumeric> {
 
   private final int numBits;
+  private DRes<List<DRes<SInt>>> randomBits;
 
   public GenerateRandomBitMask(int numBits) {
     this.numBits = numBits;
   }
 
+  public GenerateRandomBitMask(DRes<List<DRes<SInt>>> randomBits) {
+    this.randomBits = randomBits;
+    this.numBits = this.randomBits.out().size();
+  }
+
   @Override
   public DRes<RandomBitMask> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<List<DRes<SInt>>> randomBits = builder.par(par -> {
-      List<DRes<SInt>> innerRandomBits = new ArrayList<>(numBits);
-      for (int i = 0; i < numBits; i++) {
-        innerRandomBits.add(par.numeric().randomBit());
-      }
-      return () -> innerRandomBits;
-    });
-    // TODO should be its own computation, i.e., recombine(bits)
-    List<DRes<OInt>> powersOfTwo = builder.getOIntArithmetic().getPowersOfTwo(numBits);
+    if (randomBits == null) {
+      randomBits = builder.par(par -> {
+        List<DRes<SInt>> innerRandomBits = new ArrayList<>(numBits);
+        for (int i = 0; i < numBits; i++) {
+          innerRandomBits.add(par.numeric().randomBit());
+        }
+        return () -> innerRandomBits;
+      });
+    }
+
+    List<DRes<OInt>> powersOfTwo = builder.getOIntArithmetic().getPowersOfTwo(
+        numBits);
     DRes<SInt> recombined = builder.advancedNumeric()
         .innerProductWithPublicPart(() -> powersOfTwo, randomBits);
     return () -> new RandomBitMask(randomBits, recombined);
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/RandomBitMask.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/RandomBitMask.java
similarity index 79%
rename from core/src/main/java/dk/alexandra/fresco/framework/util/RandomBitMask.java
rename to core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/RandomBitMask.java
index 615c23854..af94aae19 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/RandomBitMask.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/RandomBitMask.java
@@ -1,4 +1,4 @@
-package dk.alexandra.fresco.framework.util;
+package dk.alexandra.fresco.lib.math.integer.binary;
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -12,7 +12,7 @@ public class RandomBitMask {
   private final DRes<List<DRes<SInt>>> bits;
   private final DRes<SInt> value;
 
-  public RandomBitMask(DRes<List<DRes<SInt>>> bits, DRes<SInt> value) {
+  RandomBitMask(DRes<List<DRes<SInt>>> bits, DRes<SInt> value) {
     this.bits = bits;
     this.value = value;
   }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index 123aa4f3e..1adde9962 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -1,24 +1,18 @@
 package dk.alexandra.fresco.lib.math.integer.mod;
 
 import dk.alexandra.fresco.framework.value.OInt;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
+import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 
 /**
  * Computes modular reduction of value mod 2^m.
  */
 public class Mod2m implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private static final BigInteger TWO = new BigInteger("2");
   private final DRes<SInt> input;
   private final int m;
   private final int k;
@@ -39,41 +33,30 @@ public Mod2m(DRes<SInt> input, int m, int k, int kappa) {
     this.kappa = kappa;
   }
 
-  private static DRes<List<DRes<SInt>>> getDeferedList(
-      ProtocolBuilderNumeric builder, List<DRes<SInt>> baseList, int amount) {
-    BigInteger two = new BigInteger("2");
-    return builder.par(par -> {
-      List<DRes<SInt>> list = new ArrayList<>(amount);
-      for (int i = 0; i < amount; i++) {
-        list.add(par.numeric().mult(two.pow(i), baseList.get(i)));
-      }
-      return () -> list;
-    });
-  }
-
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     if (m >= k) {
       return input;
     }
-    List<DRes<SInt>> randomBits = Stream.generate(() -> builder.numeric()
-        .randomBit()).limit(k + kappa).collect(Collectors.toList());
-    DRes<List<DRes<SInt>>> rList = getDeferedList(builder, randomBits, k
-        + kappa);
-    DRes<SInt> r = builder.advancedNumeric().sum(rList);
-
-    DRes<List<DRes<SInt>>> rPrimeList = getDeferedList(builder, randomBits, m);
-    DRes<SInt> rPrime = builder.advancedNumeric().sum(rPrimeList);
+    DRes<RandomBitMask> r = builder.advancedNumeric().randomBitMask(k + kappa);
+    // Construct a new RandomBitMask consisting of the first m bits of r
+    DRes<RandomBitMask> rPrime = builder.seq(seq -> seq.advancedNumeric()
+        .randomBitMask(() -> r.out().getBits().out().subList(0, m)));
 
-    DRes<SInt> temp = builder.numeric().add(input, r);
-    DRes<BigInteger> c = builder.numeric().open(builder.numeric().add(TWO.pow(k
-        - 1), temp));
     return builder.seq(seq -> {
-      BigInteger cPrime = c.out().mod(TWO.pow(m));
-      OInt cPrimeOInt = seq.getOIntFactory().fromBigInteger(cPrime);
-      DRes<SInt> u = seq.seq(new BitLessThanOpen(cPrimeOInt, () -> randomBits.subList(0, m)));
-      return seq.numeric().add(seq.numeric().mult(TWO.pow(m), u),
-          seq.numeric().sub(cPrime, rPrime));
+      // Use the integer interpretation of r to compute c = 2^{k-1}+(input + r)
+      DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
+          .getOIntArithmetic().twoTo(k - 1), seq.numeric().add(input, r.out()
+              .getValue())));
+      return c;
+    }).seq((seq, c) -> {
+      DRes<OInt> cPrime = seq.getOIntArithmetic().modTwoTo(c, m);
+      DRes<SInt> u = seq.seq(new BitLessThanOpen(cPrime.out(), rPrime.out()
+          .getBits()));
+      // Return cPrime - 2^m * u
+      return seq.numeric().add(seq.numeric().multByOpen(seq.getOIntArithmetic()
+          .twoTo(m), u),
+          seq.numeric().subFromOpen(cPrime, rPrime.out().getValue()));
     });
 
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index 08a8d2b8e..fe178deda 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -51,6 +51,16 @@ public DRes<OInt> twoTo(int power) {
     }
   }
 
+  @Override
+  public DRes<OInt> modTwoTo(OInt input, int power) {
+    if (power > factory.getLowBitLength()) {
+      throw new UnsupportedOperationException();
+    } else {
+      return factory.fromOInt(input).clearAboveBitAt(power);
+    }
+  }
+
+
   private List<DRes<OInt>> initializePowersOfTwo(int numPowers) {
     List<DRes<OInt>> powers = new ArrayList<>(numPowers);
     CompT current = factory.one();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index b2eac9cf1..556b43b17 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -5,11 +5,11 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.Pair;
-import dk.alexandra.fresco.framework.util.RandomBitMask;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
+import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import java.util.List;

From 146f70bc327e7f01e12f7e6ebe4b6d3daf0659b9 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 14:07:24 +0200
Subject: [PATCH 090/231] More logical ops and tests

---
 .../builder/numeric/DefaultLogical.java       |  83 +++++++++----
 .../framework/builder/numeric/Logical.java    |  14 +++
 .../logical/LogicalOperationsTests.java       | 112 ++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     |  18 +++
 4 files changed, 205 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 5d5008e91..52817e214 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -5,6 +5,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.BiFunction;
 
 /**
  * Default implementation of {@link Logical}, expressing logical operations via arithmetic.
@@ -60,40 +61,78 @@ public DRes<SInt> not(DRes<SInt> secretBit) {
     });
   }
 
+  private DRes<List<DRes<SInt>>> pairWise(
+      DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB,
+      BiFunction<DRes<SInt>, DRes<SInt>, DRes<SInt>> op) {
+    List<DRes<SInt>> leftOut = bitsB.out();
+    List<DRes<SInt>> rightOut = bitsA.out();
+    List<DRes<SInt>> resultBits = new ArrayList<>(leftOut.size());
+    for (int i = 0; i < leftOut.size(); i++) {
+      DRes<SInt> leftBit = leftOut.get(i);
+      DRes<SInt> rightBit = rightOut.get(i);
+      DRes<SInt> resultBit = op.apply(leftBit, rightBit);
+      resultBits.add(resultBit);
+    }
+    return () -> resultBits;
+  }
+
+  private DRes<List<DRes<SInt>>> pairWiseKnown(
+      DRes<List<DRes<OInt>>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits,
+      BiFunction<DRes<OInt>, DRes<SInt>, DRes<SInt>> op) {
+    List<DRes<OInt>> knownOut = knownBits.out();
+    List<DRes<SInt>> secretOut = secretBits.out();
+    List<DRes<SInt>> resultBits = new ArrayList<>(secretOut.size());
+    for (int i = 0; i < secretOut.size(); i++) {
+      DRes<SInt> secretBit = secretOut.get(i);
+      DRes<OInt> knownBit = knownOut.get(i);
+      DRes<SInt> resultBit = op.apply(knownBit, secretBit);
+      resultBits.add(resultBit);
+    }
+    return () -> resultBits;
+  }
+
   @Override
-  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
+  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
       DRes<List<DRes<SInt>>> secretBits) {
     return builder.par(par -> {
-      List<DRes<SInt>> leftOut = secretBits.out();
-      List<DRes<OInt>> rightOut = knownBits.out();
-      List<DRes<SInt>> andedBits = new ArrayList<>(leftOut.size());
-      for (int i = 0; i < leftOut.size(); i++) {
-        DRes<SInt> leftBit = leftOut.get(i);
-        DRes<OInt> rightBit = rightOut.get(i);
-        DRes<SInt> andedBit = par.logical().andKnown(rightBit, leftBit);
-        andedBits.add(andedBit);
-      }
-      return () -> andedBits;
+      BiFunction<DRes<OInt>, DRes<SInt>, DRes<SInt>> f = (left, right) -> par.logical()
+          .xorKnown(left, right);
+      return pairWiseKnown(knownBits, secretBits, f);
     });
   }
 
   @Override
-  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
+  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
       DRes<List<DRes<SInt>>> secretBits) {
     return builder.par(par -> {
-      List<DRes<SInt>> leftOut = secretBits.out();
-      List<DRes<OInt>> rightOut = knownBits.out();
-      List<DRes<SInt>> xoredBits = new ArrayList<>(leftOut.size());
-      for (int i = 0; i < leftOut.size(); i++) {
-        DRes<SInt> leftBit = leftOut.get(i);
-        DRes<OInt> rightBit = rightOut.get(i);
-        DRes<SInt> andedBit = par.logical().xorKnown(rightBit, leftBit);
-        xoredBits.add(andedBit);
-      }
-      return () -> xoredBits;
+      BiFunction<DRes<OInt>, DRes<SInt>, DRes<SInt>> f = (left, right) -> par.logical()
+          .andKnown(left, right);
+      return pairWiseKnown(knownBits, secretBits, f);
     });
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    return builder.par(par -> {
+      BiFunction<DRes<SInt>, DRes<SInt>, DRes<SInt>> f = (left, right) -> par.logical()
+          .and(left, right);
+      return pairWise(bitsA, bitsB, f);
+    });
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    return builder.par(par -> {
+      BiFunction<DRes<SInt>, DRes<SInt>, DRes<SInt>> f = (left, right) -> par.logical()
+          .or(left, right);
+      return pairWise(bitsA, bitsB, f);
+    });
+  }
+  
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<OInt>>> bits) {
     // TODO implement
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index f3f6b767a..c8fc929cf 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -45,6 +45,20 @@ public interface Logical extends ComputationDirectory {
   DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
       DRes<List<DRes<SInt>>> secretBits);
 
+  /**
+   * Computes pairwise logical AND of input bits. <p>NOTE: Inputs must represent 0 or 1 values
+   * only.</p>
+   */
+  DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB);
+
+  /**
+   * Computes pairwise logical OR of input bits. <p>NOTE: Inputs must represent 0 or 1 values
+   * only.</p>
+   */
+  DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB);
+
   /**
    * Computes pairwise logical XOR of input bits. <p>NOTE: Inputs must represent 0 or 1 values
    * only.</p>
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
index 72bcc625f..f4b178e5c 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
@@ -100,4 +100,116 @@ public void test() {
     }
   }
 
+  public static class TestAnd<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                DRes<List<DRes<SInt>>> rightClosed = root.numeric().knownAsDRes(right);
+                DRes<List<DRes<SInt>>> anded = root.logical()
+                    .pairWiseAnd(leftClosed, rightClosed);
+                return root.collections().openList(anded);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.ZERO,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestOr<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                DRes<List<DRes<SInt>>> rightClosed = root.numeric().knownAsDRes(right);
+                DRes<List<DRes<SInt>>> anded = root.logical().pairWiseOr(leftClosed, rightClosed);
+                return root.collections().openList(anded);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ONE,
+              BigInteger.ONE,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestNot<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<SInt> notOne = root.logical().not(root.numeric().known(BigInteger.ONE));
+                DRes<SInt> notZero = root.logical().not(root.numeric().known(BigInteger.ZERO));
+                List<DRes<SInt>> notted = Arrays.asList(notOne, notZero);
+                return root.collections().openList(() -> notted);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ZERO,
+              BigInteger.ONE
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index d2339fa16..cbb94876d 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -42,7 +42,10 @@
 import dk.alexandra.fresco.lib.math.integer.exp.ExponentiationTests;
 import dk.alexandra.fresco.lib.math.integer.linalg.LinAlgTests;
 import dk.alexandra.fresco.lib.math.integer.log.LogTests;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAnd;
 import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAndKnown;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestNot;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestOr;
 import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestXorKnown;
 import dk.alexandra.fresco.lib.math.integer.min.MinTests;
 import dk.alexandra.fresco.lib.math.integer.mod.Mod2mTests.TestMod2mBaseCase;
@@ -786,6 +789,21 @@ public void testAndKnown() {
     runTest(new TestAndKnown<>(), new TestParameters());
   }
 
+  @Test
+  public void testAnd() {
+    runTest(new TestAnd<>(), new TestParameters());
+  }
+
+  @Test
+  public void testOr() {
+    runTest(new TestOr<>(), new TestParameters());
+  }
+
+  @Test
+  public void testNot() {
+    runTest(new TestNot<>(), new TestParameters());
+  }
+
   @Test
   public void testXorKnown() {
     runTest(new TestXorKnown<>(), new TestParameters());

From 4b700afcad7ee3cc239c22290821ccf4810009ca Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 26 Apr 2018 14:51:29 +0200
Subject: [PATCH 091/231] Add logical op tests to spdz2k

---
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 2628d26cc..038c0f9c3 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -6,6 +6,11 @@
 import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAnd;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAndKnown;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestNot;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestOr;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestXorKnown;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import org.junit.Test;
 
@@ -145,6 +150,31 @@ public void testLessThanLogRounds() {
         EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testAndKnown() {
+    runTest(new TestAndKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testAnd() {
+    runTest(new TestAnd<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testOr() {
+    runTest(new TestOr<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testNot() {
+    runTest(new TestNot<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testXorKnown() {
+    runTest(new TestXorKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
   protected abstract int getMaxBitLength();
 
 }

From eac970e446d9e981c37643bdb2e4cddc65449312 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 26 Apr 2018 19:54:25 +0200
Subject: [PATCH 092/231] Implemented draft of EQZ from Peters thesis

---
 .../framework/builder/numeric/Comparison.java | 50 +++++++++++++++----
 .../builder/numeric/DefaultComparison.java    | 50 +++++++++++++++----
 .../builder/numeric/DefaultLogical.java       |  8 ++-
 .../framework/builder/numeric/Logical.java    | 15 +++++-
 ...Equality.java => EqualityConstRounds.java} | 21 +++++---
 ...ZeroTest.java => ZeroTestConstRounds.java} |  4 +-
 .../arithmetic/ComparisonLoggerDecorator.java | 16 ++++--
 7 files changed, 129 insertions(+), 35 deletions(-)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/eq/{Equality.java => EqualityConstRounds.java} (56%)
 rename core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/{ZeroTest.java => ZeroTestConstRounds.java} (82%)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 4fc037309..484686f3b 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -9,6 +9,14 @@
  */
 public interface Comparison extends ComputationDirectory {
 
+  /**
+   * The different algorithms supported by Fresco.
+   */
+  public enum EqualityAlgorithm {
+    EQ_LOG_ROUNDS,
+    EQ_CONST_ROUNDS
+  }
+
   /**
    * The different algorithms supported by Fresco.
    */
@@ -20,9 +28,12 @@ enum ComparisonAlgorithm {
   /**
    * Compares two values and return x == y
    *
-   * @param bitLength The maximum bit-length of the numbers to compare.
-   * @param x The first number
-   * @param y The second number
+   * @param bitLength
+   *          The maximum bit-length of the numbers to compare.
+   * @param x
+   *          The first number
+   * @param y
+   *          The second number
    * @return A deferred result computing x == y
    */
   DRes<SInt> equals(int bitLength, DRes<SInt> x, DRes<SInt> y);
@@ -34,13 +45,22 @@ enum ComparisonAlgorithm {
    * @param y input
    * @return A deferred result computing x == y. Result will be either [1] (true) or [0] (false).
    */
-  DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y);
+  DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, EqualityAlgorithm algorithm);
+
+  /**
+   * Call to {@link #equals(DRes, DRes, ComparisonAlgorithm)} with default comparison algorithm.
+   */
+  default DRes<SInt> equals(DRes<SInt> x1, DRes<SInt> x2) {
+    return equals(x1, x2, EqualityAlgorithm.EQ_LOG_ROUNDS);
+  }
 
   /**
    * Computes if x1 <= x2.
    *
-   * @param x1 input
-   * @param x2 input
+   * @param x1
+   *          input
+   * @param x2
+   *          input
    * @return A deferred result computing x1 <= x2. Result will be either [1] (true) or [0] (false).
    */
   DRes<SInt> compareLEQ(DRes<SInt> x1, DRes<SInt> x2);
@@ -85,9 +105,21 @@ default DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2) {
   /**
    * Test for equality with zero for a bitLength-bit number (positive or negative)
    *
-   * @param x the value to test against zero
-   * @param bitLength bitlength
+   * @param x
+   *          the value to test against zero
+   * @param bitLength
+   *          bitlength including the sign bit
+   * @param algorithm
+   *          the algorithm to use for zero-equality test
    * @return A deferred result computing x == 0. Result will be either [1] (true) or [0] (false)
    */
-  DRes<SInt> compareZero(DRes<SInt> x, int bitLength);
+  DRes<SInt> compareZero(DRes<SInt> x, int bitLength,
+      EqualityAlgorithm algorithm);
+
+  /**
+   * Call to {@link #compareZero(DRes, int, ComparisonAlgorithm)} with default comparison algorithm.
+   */
+  default DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
+    return compareZero(x, bitlength, EqualityAlgorithm.EQ_LOG_ROUNDS);
+  }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index a909120fd..29d8d613e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -2,10 +2,13 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.compare.eq.Equality;
+import dk.alexandra.fresco.lib.compare.eq.EqualityConstRounds;
+import dk.alexandra.fresco.lib.compare.eq.EqualityLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.LessThanLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.LessThanOrEquals;
-import dk.alexandra.fresco.lib.compare.zerotest.ZeroTest;
+import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestConstRounds;
+import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestLogRounds;
+
 import java.math.BigInteger;
 
 /**
@@ -36,14 +39,28 @@ public DRes<SInt> compareLEQLong(DRes<SInt> x, DRes<SInt> y) {
   }
 
   @Override
-  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y) {
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y,
+      EqualityAlgorithm algorithm) {
     int maxBitLength = builder.getBasicNumericContext().getMaxBitLength();
-    return equals(maxBitLength, x, y);
+    switch (algorithm) {
+    case EQ_CONST_ROUNDS:
+      return equalsConstRounds(maxBitLength, x, y);
+    case EQ_LOG_ROUNDS:
+      return equals(maxBitLength, x, y);
+    default:
+      throw new UnsupportedOperationException("Not implemented yet");
+    }
   }
 
   @Override
   public DRes<SInt> equals(int bitLength, DRes<SInt> x, DRes<SInt> y) {
-    return builder.seq(new Equality(bitLength, x, y));
+    // TODO throw if maxBitLength + securityParameter > mod bit length
+    return builder.seq(new EqualityLogRounds(bitLength, x, y));
+  }
+
+  public DRes<SInt> equalsConstRounds(int bitLength, DRes<SInt> x,
+      DRes<SInt> y) {
+    return builder.seq(new EqualityConstRounds(bitLength, x, y));
   }
 
   @Override
@@ -57,10 +74,8 @@ public DRes<SInt> compareLEQ(DRes<SInt> x, DRes<SInt> y) {
   public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm) {
     if (algorithm == ComparisonAlgorithm.LT_LOG_ROUNDS) {
       int k = builder.getBasicNumericContext().getMaxBitLength();
-      // TODO this belongs somewhere else
-      int kappa = 40;
       // TODO throw if k + kappa > mod bit length
-      return builder.seq(new LessThanLogRounds(x1, x2, k, kappa));
+      return builder.seq(new LessThanLogRounds(x1, x2, k, magicSecureNumber));
     } else {
       throw new UnsupportedOperationException("Not implemented yet");
     }
@@ -80,7 +95,24 @@ public DRes<SInt> sign(DRes<SInt> x) {
 
   @Override
   public DRes<SInt> compareZero(DRes<SInt> x, int bitLength) {
-    return builder.seq(new ZeroTest(bitLength, x, magicSecureNumber));
+    return builder.seq(new ZeroTestLogRounds(bitLength, x, magicSecureNumber));
   }
 
+  public DRes<SInt> compareZeroConstRounds(DRes<SInt> x, int bitLength) {
+    return builder.seq(new ZeroTestConstRounds(bitLength, x, magicSecureNumber));
+  }
+
+  @Override
+  public DRes<SInt> compareZero(DRes<SInt> x, int bitLength,
+      EqualityAlgorithm algorithm) {
+    // int maxBitLength = builder.getBasicNumericContext().getMaxBitLength();
+    switch (algorithm) {
+    case EQ_CONST_ROUNDS:
+      return compareZeroConstRounds(x, bitLength);
+    case EQ_LOG_ROUNDS:
+      return compareZero(x, bitLength);
+    default:
+      throw new UnsupportedOperationException("Not implemented yet");
+    }
+  }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 5d5008e91..3ac973e06 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -95,7 +95,13 @@ public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
   }
 
   @Override
-  public DRes<SInt> orOfList(DRes<List<DRes<OInt>>> bits) {
+  public DRes<SInt> orOfKnownList(DRes<List<DRes<OInt>>> bits) {
+    // TODO implement
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
     // TODO implement
     throw new UnsupportedOperationException();
   }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index f3f6b767a..7def27af7 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -53,8 +53,19 @@ DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
       DRes<List<DRes<SInt>>> secretBits);
 
   /**
-   * Computes logical OR of all input bits. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
+   * Computes logical OR of all known input bits.
+   * <p>
+   * NOTE: Inputs must represent 0 or 1 values only.
+   * </p>
    */
-  DRes<SInt> orOfList(DRes<List<DRes<OInt>>> bits);
+  DRes<SInt> orOfKnownList(DRes<List<DRes<OInt>>> bits);
+
+  /**
+   * Computes logical OR of all input bits.
+   * <p>
+   * NOTE: Inputs must represent 0 or 1 values only.
+   * </p>
+   */
+  DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits);
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/Equality.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityConstRounds.java
similarity index 56%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/eq/Equality.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityConstRounds.java
index 5d327bff8..e376b0012 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/Equality.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityConstRounds.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Comparison.EqualityAlgorithm;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
 
@@ -9,7 +10,7 @@
  * Implements an equality protocol -- given inputs x, y set output to x==y.
  *
  */
-public class Equality implements Computation<SInt, ProtocolBuilderNumeric> {
+public class EqualityConstRounds implements Computation<SInt, ProtocolBuilderNumeric> {
 
   // params
   private final int bitLength;
@@ -17,13 +18,16 @@ public class Equality implements Computation<SInt, ProtocolBuilderNumeric> {
   private final DRes<SInt> right;
 
   /**
-   * Constructs an instance of the Equality computation.
-   * 
-   * @param bitLength The maximum bit length of the inputs.
-   * @param left The first element to compare.
-   * @param right The second element to compare.
+   * Constructs an instance of the Equality computation in a constant amount of rounds.
+   *
+   * @param bitLength
+   *          The maximum bit length of the inputs.
+   * @param left
+   *          The first element to compare.
+   * @param right
+   *          The second element to compare.
    */
-  public Equality(
+  public EqualityConstRounds(
       int bitLength, DRes<SInt> left, DRes<SInt> right) {
     super();
     this.bitLength = bitLength;
@@ -34,6 +38,7 @@ public Equality(
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<SInt> diff = builder.numeric().sub(left, right);
-    return builder.comparison().compareZero(diff, bitLength);
+    return builder.comparison().compareZero(diff, bitLength,
+        EqualityAlgorithm.EQ_CONST_ROUNDS);
   }
 }
\ No newline at end of file
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTest.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestConstRounds.java
similarity index 82%
rename from core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTest.java
rename to core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestConstRounds.java
index 65fe3acc6..fb18e7bd3 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTest.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestConstRounds.java
@@ -9,13 +9,13 @@
  * testing for equality with zero for a bitLength-bit number (positive or negative).
  *
  */
-public class ZeroTest implements Computation<SInt, ProtocolBuilderNumeric> {
+public class ZeroTestConstRounds implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final int securityParameter;
   private final int bitLength;
   private final DRes<SInt> input;
 
-  public ZeroTest(int bitLength, DRes<SInt> input, int securityParameter) {
+  public ZeroTestConstRounds(int bitLength, DRes<SInt> input, int securityParameter) {
     this.bitLength = bitLength;
     this.input = input;
     this.securityParameter = securityParameter;
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 190314123..3478b9035 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -20,18 +20,19 @@ public class ComparisonLoggerDecorator implements Comparison, PerformanceLogger
   private long ltCount;
   private long signCount;
   private long comp0Count;
-  
+
   public ComparisonLoggerDecorator(Comparison delegate) {
     super();
     this.delegate = delegate;
   }
 
   @Override
-  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y) {
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y,
+      EqualityAlgorithm algorithm) {
     eqCount++;
-    return this.delegate.equals(x, y);
+    return this.delegate.equals(x, y, algorithm);
   }
-  
+
   @Override
   public DRes<SInt> equals(int bitLength, DRes<SInt> x, DRes<SInt> y) {
     eqCount++;
@@ -68,6 +69,13 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitLength) {
     return this.delegate.compareZero(x, bitLength);
   }
 
+  @Override
+  public DRes<SInt> compareZero(DRes<SInt> x, int bitLength,
+      EqualityAlgorithm algorithm) {
+    comp0Count++;
+    return this.delegate.compareZero(x, bitLength);
+  }
+
   @Override
   public void reset() {
     eqCount = 0;

From ca7fab3a1a85a340df314c5734b54f5f69b87859 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Mon, 30 Apr 2018 08:47:02 +0200
Subject: [PATCH 093/231] Implemented draft of OR protocol

---
 .../builder/numeric/DefaultLogical.java       | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 3ac973e06..639266e66 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -102,8 +102,38 @@ public DRes<SInt> orOfKnownList(DRes<List<DRes<OInt>>> bits) {
 
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
-    // TODO implement
-    throw new UnsupportedOperationException();
+    // int currentSize = bits.out().size();
+    // DRes<List<DRes<SInt>>> partialRes = bits;
+    // while (currentSize > 1) {
+    // partialRes = builder.par(par -> {
+    // List<DRes<SInt>> list = new ArrayList<>();
+    // for (int i = 0; i + 1 < partialRes.out().size(); i = i + 2) {
+    // DRes<SInt> currentOr = or(partialRes.out().get(i), partialRes.out()
+    // .get(i + 1));
+    // list.add(currentOr);
+    // }
+    // if (partialRes.out().size() % 2 == 1) {
+    // list.add(partialRes.out().get(partialRes.out().size() - 1));
+    // }
+    // return () -> list;
+    // });
+    // currentSize = partialRes.out().size();
+    // }
+    // return partialRes.out().get(0);
+    return null;
   }
 
+  private DRes<List<DRes<SInt>>> partialOr(DRes<List<DRes<SInt>>> bits) {
+    return builder.par(par -> {
+      List<DRes<SInt>> list = new ArrayList<>();
+      for (int i = 0; i + 1 < bits.out().size(); i = i + 2) {
+        DRes<SInt> currentOr = or(bits.out().get(i), bits.out().get(i + 1));
+        list.add(currentOr);
+      }
+      if (bits.out().size() % 2 == 1) {
+        list.add(bits.out().get(bits.out().size() - 1));
+      }
+      return () -> list;
+    });
+  }
 }

From ec17316fc57799165e615f4ffc92eed9949a002b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 10:04:54 +0200
Subject: [PATCH 094/231] WIP spdz2k boolean mode

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 23 +++++++++++++++-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 26 +++++++++++++++++++
 .../suite/spdz2k/Spdz2kProtocolSuite.java     | 14 +++++++---
 .../suite/spdz2k/Spdz2kProtocolSuite128.java  |  6 ++++-
 .../suite/spdz2k/Spdz2kProtocolSuite96.java   |  8 ++++--
 .../resource/Spdz2kResourcePoolImpl.java      |  2 +-
 .../Spdz2kRoundSynchronization.java           |  2 +-
 .../suite/spdz2k/TestSpdz2kBuilder.java       |  2 +-
 8 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index f8f9a93f2..f72a777a1 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -3,6 +3,8 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
+import dk.alexandra.fresco.framework.builder.numeric.Logical;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.OInt;
@@ -36,10 +38,13 @@ public class Spdz2kBuilder<PlainT extends CompUInt<?, ?, PlainT>> implements
 
   private final CompUIntFactory<PlainT> factory;
   private final BasicNumericContext numericContext;
+  private final boolean useBooleanMode;
 
-  public Spdz2kBuilder(CompUIntFactory<PlainT> factory, BasicNumericContext numericContext) {
+  public Spdz2kBuilder(CompUIntFactory<PlainT> factory, BasicNumericContext numericContext,
+      boolean useBooleanMode) {
     this.factory = factory;
     this.numericContext = numericContext;
+    this.useBooleanMode = useBooleanMode;
   }
 
   @Override
@@ -52,6 +57,15 @@ public Comparison createComparison(ProtocolBuilderNumeric builder) {
     return new Spdz2kComparison<>(this, builder, factory);
   }
 
+  @Override
+  public Logical createLogical(ProtocolBuilderNumeric builder) {
+    if (useBooleanMode) {
+      return new Spdz2kLogicalBooleanMode(builder);
+    } else {
+      return new Spdz2kLogical(builder);
+    }
+  }
+
   @Override
   public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
@@ -189,4 +203,11 @@ public RealNumericContext getRealNumericContext() {
     return null;
   }
 
+  class Spdz2kLogical extends DefaultLogical {
+    protected Spdz2kLogical(
+        ProtocolBuilderNumeric builder) {
+      super(builder);
+    }
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
new file mode 100644
index 000000000..6858666fc
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -0,0 +1,26 @@
+package dk.alexandra.fresco.suite.spdz2k;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+
+/**
+ * Logical operators for Spdz2k on boolean shares. <p>NOTE: requires that inputs have previously
+ * been converted to boolean shares!</p>
+ */
+public class Spdz2kLogicalBooleanMode<PlainT extends CompUInt<?, ?, PlainT>> extends
+    DefaultLogical {
+
+  protected Spdz2kLogicalBooleanMode(
+      ProtocolBuilderNumeric builder) {
+    super(builder);
+  }
+
+  @Override
+  public DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB) {
+    return super.and(bitA, bitB);
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
index 6a5904e56..3e3bd35e2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
@@ -30,6 +30,7 @@ public abstract class Spdz2kProtocolSuite<
     implements ProtocolSuiteNumeric<Spdz2kResourcePool<PlainT>> {
 
   private final CompUIntConverter<HighT, LowT, PlainT> converter;
+  private final boolean useBooleanMode;
 
   /**
    * Constructs new {@link Spdz2kProtocolSuite}.
@@ -37,14 +38,21 @@ public abstract class Spdz2kProtocolSuite<
    * @param converter helper which allows converting {@link HighT}, and {@link LowT} instances to
    * {@link PlainT}. This is necessary for the mac-check protocol where we perform arithmetic
    * between these different types.
+   * @param useBooleanMode flag for switching to boolean shares for logical operations
    */
-  Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter) {
+  Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter, boolean useBooleanMode) {
     this.converter = converter;
+    this.useBooleanMode = useBooleanMode;
+  }
+
+  Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter) {
+    this(converter, false);
   }
 
   @Override
   public BuilderFactoryNumeric init(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
-    return new Spdz2kBuilder<>(resourcePool.getFactory(), createBasicNumericContext(resourcePool));
+    return new Spdz2kBuilder<>(resourcePool.getFactory(), createBasicNumericContext(resourcePool),
+        useBooleanMode);
   }
 
   @Override
@@ -57,5 +65,5 @@ public BasicNumericContext createBasicNumericContext(Spdz2kResourcePool<PlainT>
         resourcePool.getMaxBitLength(), resourcePool.getModulus(), resourcePool.getMyId(),
         resourcePool.getNoOfParties());
   }
-
+  
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite128.java
index fa33f4376..93d9a2b0b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite128.java
@@ -9,8 +9,12 @@
  */
 public class Spdz2kProtocolSuite128 extends Spdz2kProtocolSuite<UInt64, UInt64, CompUInt128> {
 
+  public Spdz2kProtocolSuite128(boolean useBooleanMode) {
+    super(new CompUIntConverter128(), useBooleanMode);
+  }
+
   public Spdz2kProtocolSuite128() {
-    super(new CompUIntConverter128());
+    this(false);
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java
index d4adc0d6c..b1782ede3 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java
@@ -10,8 +10,12 @@
  */
 public class Spdz2kProtocolSuite96 extends Spdz2kProtocolSuite<UInt64, UInt32, CompUInt96> {
 
-  Spdz2kProtocolSuite96() {
-    super(new CompUIntConverter96());
+  public Spdz2kProtocolSuite96(boolean useBooleanMode) {
+    super(new CompUIntConverter96(), useBooleanMode);
+  }
+
+  public Spdz2kProtocolSuite96() {
+    this(false);
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
index 0e3542956..ff60f7e9c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
@@ -141,7 +141,7 @@ private byte[] runCoinTossing(Computation<byte[], ProtocolBuilderNumeric> coinTo
             network);
     BuilderFactoryNumeric builderFactory = new Spdz2kBuilder<>(factory,
         new BasicNumericContext(effectiveBitLength, modulus,
-            getMyId(), getNoOfParties()));
+            getMyId(), getNoOfParties()), false);
     ProtocolBuilderNumeric root = builderFactory.createSequential();
     DRes<byte[]> jointSeed = coinTossing
         .buildComputation(root);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 2260965e3..47e1a036a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -53,7 +53,7 @@ public Spdz2kRoundSynchronization(Spdz2kProtocolSuite<HighT, LowT, PlainT> proto
 
   private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
     Spdz2kBuilder<PlainT> builder = new Spdz2kBuilder<>(resourcePool.getFactory(),
-        protocolSuite.createBasicNumericContext(resourcePool));
+        protocolSuite.createBasicNumericContext(resourcePool), false);
     BatchEvaluationStrategy<Spdz2kResourcePool<PlainT>> batchStrategy = new BatchedStrategy<>();
     BatchedProtocolEvaluator<Spdz2kResourcePool<PlainT>> evaluator = new BatchedProtocolEvaluator<>(
         batchStrategy,
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
index ec8dd5231..7ca102063 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
@@ -7,7 +7,7 @@ public class TestSpdz2kBuilder {
 
   @Test(expected = UnsupportedOperationException.class)
   public void getBigIntegerHelper() {
-    new Spdz2kBuilder<CompUInt128>(null, null).getBigIntegerHelper();
+    new Spdz2kBuilder<CompUInt128>(null, null, false).getBigIntegerHelper();
   }
 
 }

From d5eaef21447b9302469a786369418ffa60e8cd41 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 10:47:37 +0200
Subject: [PATCH 095/231] Add bit comparison to comp dir

---
 .../framework/builder/numeric/Comparison.java    | 16 ++++++++++++++++
 .../builder/numeric/DefaultComparison.java       | 13 +++++++++++++
 .../fresco/lib/math/integer/mod/Mod2m.java       |  6 ++----
 .../arithmetic/ComparisonLoggerDecorator.java    | 14 ++++++++++++++
 .../computations/lt/MostSignBitSpdz2k.java       |  3 +--
 5 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 4fc037309..9eb99ae07 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -2,7 +2,9 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
+import java.util.List;
 
 /**
  * Interface for comparing numeric values.
@@ -62,6 +64,20 @@ default DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2) {
     return compareLT(x1, x2, ComparisonAlgorithm.LT_LOG_ROUNDS);
   }
 
+  /**
+   * Computes if the bit decomposition of an open value is less than the bit decomposition of a
+   * secret value.
+   *
+   * @param openValue open value which will be decomposed into bits and compared to secretBits
+   * @param secretBits secret value decomposed into bits
+   */
+  DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits);
+
+  /**
+   * Default call to {@link #compareLTBits(DRes, DRes)} with unwrapped arguments.
+   */
+  DRes<SInt> compareLTBits(OInt openValue, List<DRes<SInt>> secretBits);
+
   /**
    * Compares if x1 <= x2, but with twice the possible bit-length. Requires that the maximum bit
    * length is set to something that can handle this scenario. It has to be at least less than half
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index a909120fd..64a224e3d 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -1,12 +1,15 @@
 package dk.alexandra.fresco.framework.builder.numeric;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.eq.Equality;
+import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
 import dk.alexandra.fresco.lib.compare.lt.LessThanLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.LessThanOrEquals;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTest;
 import java.math.BigInteger;
+import java.util.List;
 
 /**
  * Default way of producing the protocols within the interface. This default class can be
@@ -66,6 +69,16 @@ public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm al
     }
   }
 
+  @Override
+  public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits) {
+    return builder.seq(new BitLessThanOpen(openValue, secretBits));
+  }
+
+  @Override
+  public DRes<SInt> compareLTBits(OInt openValue, List<DRes<SInt>> secretBits) {
+    return builder.seq(new BitLessThanOpen(openValue, secretBits));
+  }
+
   @Override
   public DRes<SInt> sign(DRes<SInt> x) {
     Numeric input = builder.numeric();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index 1adde9962..f857fe7ca 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -1,11 +1,10 @@
 package dk.alexandra.fresco.lib.math.integer.mod;
 
-import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
 import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 
 /**
@@ -51,8 +50,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       return c;
     }).seq((seq, c) -> {
       DRes<OInt> cPrime = seq.getOIntArithmetic().modTwoTo(c, m);
-      DRes<SInt> u = seq.seq(new BitLessThanOpen(cPrime.out(), rPrime.out()
-          .getBits()));
+      DRes<SInt> u = seq.comparison().compareLTBits(cPrime, rPrime.out().getBits());
       // Return cPrime - 2^m * u
       return seq.numeric().add(seq.numeric().multByOpen(seq.getOIntArithmetic()
           .twoTo(m), u),
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 190314123..215549a3f 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -2,9 +2,11 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.logging.PerformanceLogger;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class ComparisonLoggerDecorator implements Comparison, PerformanceLogger {
@@ -18,6 +20,7 @@ public class ComparisonLoggerDecorator implements Comparison, PerformanceLogger
   private long eqCount;
   private long leqCount;
   private long ltCount;
+  private long ltBitsCount;
   private long signCount;
   private long comp0Count;
   
@@ -50,6 +53,17 @@ public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm al
     return this.delegate.compareLT(x1, x2, algorithm);
   }
 
+  @Override
+  public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits) {
+    ltBitsCount++;
+    return this.delegate.compareLTBits(openValue, secretBits);
+  }
+
+  @Override
+  public DRes<SInt> compareLTBits(OInt openValue, List<DRes<SInt>> secretBits) {
+    return this.compareLTBits(() -> openValue, () -> secretBits);
+  }
+
   @Override
   public DRes<SInt> compareLEQLong(DRes<SInt> x1, DRes<SInt> x2) {
     leqCount++;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index 556b43b17..864c14aae 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -8,7 +8,6 @@
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
 import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
@@ -50,7 +49,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           RandomBitMask mask = pair.getSecond();
           DRes<SInt> rPrime = mask.getValue();
           List<DRes<SInt>> rPrimeBits = mask.getBits().out();
-          DRes<SInt> u = seq.seq(new BitLessThanOpen(cPrime, rPrimeBits));
+          DRes<SInt> u = seq.comparison().compareLTBits(cPrime, rPrimeBits);
           DRes<SInt> aPrime = nb.add(
               nb.subFromOpen(() -> cPrime, rPrime),
               nb.multByOpen(twoTo2k1, u)

From 0a449f049ec269deebd4e6b9c487383bbd138e74 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 11:10:57 +0200
Subject: [PATCH 096/231] Add conversion comp dir

---
 .../numeric/BuilderFactoryNumeric.java        |  2 ++
 .../framework/builder/numeric/Conversion.java | 25 +++++++++++++++++
 .../numeric/ProtocolBuilderNumeric.java       | 27 +++++++++++++------
 .../fresco/logging/NumericSuiteLogging.java   |  6 +++++
 .../DummyArithmeticBuilderFactory.java        |  7 +++++
 .../fresco/suite/spdz/SpdzBuilder.java        |  7 +++++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  7 +++++
 7 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
index 672446304..2e08bceff 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
@@ -32,6 +32,8 @@ public interface BuilderFactoryNumeric extends BuilderFactory<ProtocolBuilderNum
 
   Numeric createNumeric(ProtocolBuilderNumeric builder);
 
+  Conversion createConversion(ProtocolBuilderNumeric builder);
+
   MiscBigIntegerGenerators getBigIntegerHelper();
 
   /**
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java
new file mode 100644
index 000000000..bd43cc1ee
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java
@@ -0,0 +1,25 @@
+package dk.alexandra.fresco.framework.builder.numeric;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.value.SInt;
+
+/**
+ * Operators for converting between different representations of secret values (for instance between
+ * an arithmetic representation and boolean representation). <p>NOTE: this is only experimental and
+ * will change in the feature. Furthermore, this is currently only supported by Spdz2k, not
+ * Spdz.</p>
+ */
+public interface Conversion extends ComputationDirectory {
+
+  /**
+   * Convert from arithmetic representation to boolean representation.
+   */
+  DRes<SInt> toBoolean(DRes<SInt> arithmeticValue);
+
+  /**
+   * Convert from boolean representation to arithmetic representation.
+   */
+  DRes<SInt> toArithmetic(DRes<SInt> booleanValue);
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
index 1a1580fe9..bc414473f 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
@@ -29,6 +29,7 @@ public class ProtocolBuilderNumeric extends ProtocolBuilderImpl<ProtocolBuilderN
   private AdvancedRealNumeric advancedRealNumeric;
   private RealLinearAlgebra realLinearAlgebra;
   private Logical logical;
+  private Conversion conversion;
   private RealNumericContext realNumericContext;
 
   ProtocolBuilderNumeric(BuilderFactoryNumeric factory, boolean parallel) {
@@ -40,13 +41,13 @@ public class ProtocolBuilderNumeric extends ProtocolBuilderImpl<ProtocolBuilderN
 
   /**
    * Returns the container for information about the field of operation.
-   * 
+   *
    * @return The {@link BasicNumericContext} used within this protocol builder.
    */
   public BasicNumericContext getBasicNumericContext() {
     return basicNumericContext;
   }
-  
+
   public RealNumericContext getRealNumericContext() {
     return realNumericContext;
   }
@@ -55,7 +56,7 @@ public RealNumericContext getRealNumericContext() {
    * Creates a {@link Numeric} computation directory for this instance - i.e. this intended
    * producer. Contains only protocol suite native basic operations such as Addition and
    * multiplication.
-   * 
+   *
    * @return The {@link Numeric} computation directory.
    */
   public Numeric numeric() {
@@ -107,8 +108,6 @@ public Collections collections() {
   /**
    * Creates a {@link Logical} computation directory for this instance - i.e. this intended
    * producer. Contains logical operations on arithmetic value.
-   *
-   * @return The collections computation directory.
    */
   public Logical logical() {
     if (logical == null) {
@@ -117,12 +116,24 @@ public Logical logical() {
     return logical;
   }
 
+  /**
+   * Creates a {@link Conversion} computation directory for this instance - i.e. this intended
+   * producer. Contains operations for converting between arithmetic and boolean representations of
+   * secret values.
+   */
+  public Conversion conversion() {
+    if (conversion == null) {
+      conversion = factory.createConversion(this);
+    }
+    return conversion;
+  }
+
   /**
    * Creates a {@link PreprocessedValues} computation directory for this instance - i.e. this
    * intended producer. Contains elements which, if created prior to this evaluation, would save
    * computation and network. Preprocessed values does not depend on the input of the function to
    * evaluate.
-   * 
+   *
    * @return The preprocessed values computation directory.
    */
   public PreprocessedValues preprocessedValues() {
@@ -136,7 +147,7 @@ public PreprocessedValues preprocessedValues() {
    * Creates a {@link Debug} computation directory for this instance - i.e. this intended producer.
    * Contains debugging protocols for use during application development. <b>WARNING: Do not use in
    * production code as most methods within this builder reveals values to all parties.</b>
-   * 
+   *
    * @return The debug computation directory.
    */
   public Debug debug() {
@@ -149,7 +160,7 @@ public Debug debug() {
   /**
    * Mostly for use within internal FRESCO protocols. Contains methods helpful for working with the
    * BigInteger class.
-   * 
+   *
    * @return The {@link MiscBigIntegerGenerators} used within the builder.
    */
   public MiscBigIntegerGenerators getBigIntegerHelper() {
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java b/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
index 759c03652..44f7b21a2 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/NumericSuiteLogging.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.builder.numeric.Conversion;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.NumericResourcePool;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
@@ -56,6 +57,11 @@ public Numeric createNumeric(ProtocolBuilderNumeric builder) {
         return numericLoggingDecorator;
       }
 
+      @Override
+      public Conversion createConversion(ProtocolBuilderNumeric builder) {
+        return delegateFactory.createConversion(builder);
+      }
+
       @Override
       public MiscBigIntegerGenerators getBigIntegerHelper() {
         return delegateFactory.getBigIntegerHelper();
diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index de99f0d5c..7f358bfef 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.Conversion;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
@@ -231,6 +232,12 @@ public DRes<SInt> add(DRes<SInt> a, DRes<SInt> b) {
     };
   }
 
+  @Override
+  public Conversion createConversion(ProtocolBuilderNumeric builder) {
+    throw new UnsupportedOperationException(
+        "This protocol suite does not currently support conversion");
+  }
+
   @Override
   public MiscBigIntegerGenerators getBigIntegerHelper() {
     if (mog == null) {
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 9a0b22ed2..c89cb536e 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.Conversion;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.PreprocessedValues;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
@@ -189,6 +190,12 @@ public DRes<OInt> openAsOInt(DRes<SInt> secretShare, int outputParty) {
     };
   }
 
+  @Override
+  public Conversion createConversion(ProtocolBuilderNumeric builder) {
+    throw new UnsupportedOperationException(
+        "This protocol suite does not currently support conversion");
+  }
+
   @Override
   public MiscBigIntegerGenerators getBigIntegerHelper() {
     if (miscOIntGenerators == null) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index f72a777a1..f1ebab348 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.builder.numeric.Conversion;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
 import dk.alexandra.fresco.framework.builder.numeric.Logical;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
@@ -182,6 +183,12 @@ public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
     };
   }
 
+  @Override
+  public Conversion createConversion(ProtocolBuilderNumeric builder) {
+    // TODO implement
+    return null;
+  }
+
   @Override
   public MiscBigIntegerGenerators getBigIntegerHelper() {
     throw new UnsupportedOperationException();

From 24d800f48d8e0b7552844c85430a4819fe106cf8 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 11:46:50 +0200
Subject: [PATCH 097/231] Separate arithmetic and boolean spdz2ksints

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 26 +++++++---
 .../suite/spdz2k/datatypes/CompUInt.java      |  7 ++-
 .../suite/spdz2k/datatypes/CompUInt128.java   |  6 +++
 .../suite/spdz2k/datatypes/CompUInt96.java    |  6 +++
 .../spdz2k/datatypes/CompUIntFactory.java     |  6 +--
 .../spdz2k/datatypes/Spdz2kInputMask.java     |  8 ++--
 .../suite/spdz2k/datatypes/Spdz2kSInt.java    | 47 +++++++------------
 .../datatypes/Spdz2kSIntArithmetic.java       | 32 +++++++++++++
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   | 32 +++++++++++++
 .../suite/spdz2k/datatypes/Spdz2kTriple.java  | 16 +++----
 .../Spdz2kMacCheckComputation.java            | 18 +++----
 .../natives/Spdz2kAddKnownProtocol.java       |  2 +-
 .../natives/Spdz2kInputOnlyProtocol.java      |  6 +--
 .../natives/Spdz2kKnownSIntProtocol.java      |  4 +-
 .../natives/Spdz2kMultiplyProtocol.java       | 16 +++----
 .../Spdz2kOutputSinglePartyProtocol.java      |  8 ++--
 .../protocols/natives/Spdz2kOutputToAll.java  |  8 ++--
 .../Spdz2kSubtractFromKnownProtocol.java      |  6 +--
 .../spdz2k/resource/Spdz2kResourcePool.java   |  4 +-
 .../resource/Spdz2kResourcePoolImpl.java      |  8 ++--
 .../resource/storage/Spdz2kDataSupplier.java  |  6 +--
 .../storage/Spdz2kDummyDataSupplier.java      | 10 ++--
 .../storage/Spdz2kOpenedValueStoreImpl.java   |  4 +-
 .../Spdz2kRoundSynchronization.java           | 10 ++--
 .../spdz2k/datatypes/TestCompUInt128.java     | 11 +++++
 .../spdz2k/datatypes/TestCompUInt96.java      | 11 +++++
 .../spdz2k/datatypes/TestSpdz2kSInt.java      |  2 +-
 .../TestSpdz2kMacCheckComputation.java        |  4 +-
 .../storage/TestSpdz2kDummyDataSupplier.java  | 28 +++++------
 29 files changed, 228 insertions(+), 124 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index f1ebab348..9ff09b65a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -18,6 +18,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
@@ -72,7 +73,7 @@ public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
       @Override
       public DRes<SInt> add(DRes<SInt> a, DRes<SInt> b) {
-        return () -> factory.toSpdz2kSInt(a).add(factory.toSpdz2kSInt(b));
+        return () -> factory.toSpdz2kSIntArithmetic(a).add(factory.toSpdz2kSIntArithmetic(b));
       }
 
       @Override
@@ -87,7 +88,7 @@ public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
-        return () -> (factory.toSpdz2kSInt(a)).subtract(factory.toSpdz2kSInt(b));
+        return () -> (factory.toSpdz2kSIntArithmetic(a)).subtract(factory.toSpdz2kSIntArithmetic(b));
       }
 
       @Override
@@ -122,12 +123,12 @@ public DRes<SInt> mult(DRes<SInt> a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
-        return () -> factory.toSpdz2kSInt(b).multiply(factory.createFromBigInteger(a));
+        return () -> factory.toSpdz2kSIntArithmetic(b).multiply(factory.createFromBigInteger(a));
       }
 
       @Override
       public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
-        return () -> factory.toSpdz2kSInt(b).multiply(factory.fromOInt(a));
+        return () -> factory.toSpdz2kSIntArithmetic(b).multiply(factory.fromOInt(a));
       }
 
       @Override
@@ -185,8 +186,21 @@ public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
 
   @Override
   public Conversion createConversion(ProtocolBuilderNumeric builder) {
-    // TODO implement
-    return null;
+    return new Conversion() {
+      @Override
+      public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
+        return () -> {
+          Spdz2kSIntArithmetic<PlainT> value = factory.toSpdz2kSIntArithmetic(arithmeticValue);
+
+          return value;
+        };
+      }
+
+      @Override
+      public DRes<SInt> toArithmetic(DRes<SInt> booleanValue) {
+        throw new UnsupportedOperationException();
+      }
+    };
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 78064b348..e4b4aea09 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -28,6 +28,11 @@ public interface CompUInt<
    */
   HighT getLeastSignificantAsHigh();
 
+  /**
+   * Shift left by n bits.
+   */
+  CompT shiftLeft(int n);
+
   /**
    * Left-shift the k least significant bits by k.
    */
@@ -35,7 +40,7 @@ public interface CompUInt<
 
   /**
    * Clears all bits above bitPos, i.e., (k + s) - bitPos most significant bits. <p>Analogous to
-   * computing this mod 2^{numBits}.</p>
+   * computing this mod 2^{bitPos}.</p>
    */
   CompT clearAboveBitAt(int bitPos);
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 56cb777a6..975ca3580 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -158,6 +158,12 @@ public UInt64 getLeastSignificantAsHigh() {
     return getLeastSignificant();
   }
 
+  @Override
+  public CompUInt128 shiftLeft(int n) {
+    // TODO hack hack hack
+    return new CompUInt128(high, low << 31, 0);
+  }
+
   @Override
   public long toLong() {
     return (UInt.toUnLong(this.mid) << 32) + UInt.toUnLong(this.low);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index ac315774f..1ef15e081 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -147,6 +147,12 @@ public UInt64 getLeastSignificantAsHigh() {
     return new UInt64(toLong());
   }
 
+  @Override
+  public CompUInt96 shiftLeft(int n) {
+    // TODO hack hack hack
+    return new CompUInt96(high, mid, low << 31);
+  }
+
   @Override
   public long toLong() {
     return (UInt.toUnLong(mid) << 32) + (UInt.toUnLong(this.low));
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index c025a7669..4f5a23f4a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -43,10 +43,10 @@ default CompT fromOInt(DRes<OInt> value) {
   }
 
   /**
-   * Get result from deferred and downcast result to {@link Spdz2kSInt<CompT>}.
+   * Get result from deferred and downcast result to {@link Spdz2kSIntArithmetic <CompT>}.
    */
-  default Spdz2kSInt<CompT> toSpdz2kSInt(DRes<SInt> value) {
-    return Objects.requireNonNull((Spdz2kSInt<CompT>) value.out());
+  default Spdz2kSIntArithmetic<CompT> toSpdz2kSIntArithmetic(DRes<SInt> value) {
+    return Objects.requireNonNull((Spdz2kSIntArithmetic<CompT>) value.out());
   }
 
   /**
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kInputMask.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kInputMask.java
index 0afaccbc5..e01c01912 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kInputMask.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kInputMask.java
@@ -2,19 +2,19 @@
 
 public class Spdz2kInputMask<PlainT extends CompUInt<?, ?, PlainT>> {
 
-  private final Spdz2kSInt<PlainT> maskShare;
+  private final Spdz2kSIntArithmetic<PlainT> maskShare;
   private final PlainT openValue;
 
-  public Spdz2kInputMask(Spdz2kSInt<PlainT> maskShare) {
+  public Spdz2kInputMask(Spdz2kSIntArithmetic<PlainT> maskShare) {
     this(maskShare, null);
   }
 
-  public Spdz2kInputMask(Spdz2kSInt<PlainT> maskShare, PlainT openValue) {
+  public Spdz2kInputMask(Spdz2kSIntArithmetic<PlainT> maskShare, PlainT openValue) {
     this.maskShare = maskShare;
     this.openValue = openValue;
   }
 
-  public Spdz2kSInt<PlainT> getMaskShare() {
+  public Spdz2kSIntArithmetic<PlainT> getMaskShare() {
     return maskShare;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
index 22a56a11d..2c4e17231 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
@@ -2,52 +2,36 @@
 
 import dk.alexandra.fresco.framework.value.SInt;
 
-/**
- * Represents an authenticated, secret-share element.
- *
- * @param <PlainT> type of underlying plain value, i.e., the value type we use for arithmetic.
- */
-public class Spdz2kSInt<PlainT extends CompUInt<?, ?, PlainT>> implements SInt {
+public abstract class Spdz2kSInt<PlainT extends CompUInt<?, ?, PlainT>> implements SInt {
 
-  private final PlainT share;
-  private final PlainT macShare;
+  protected final PlainT share;
+  protected final PlainT macShare;
 
-  /**
-   * Creates a {@link Spdz2kSInt}.
-   */
-  public Spdz2kSInt(PlainT share, PlainT macShare) {
-    this.share = share;
+  public Spdz2kSInt(PlainT macShare, PlainT share) {
     this.macShare = macShare;
-  }
-
-  /**
-   * Creates a {@link Spdz2kSInt} from a public value. <p>All parties compute the mac share of the
-   * value but only party one (by convention) stores the public value as the share, the others store
-   * 0.</p>
-   */
-  public Spdz2kSInt(PlainT share, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-    this(isPartyOne ? share : zero, share.multiply(macKeyShare));
+    this.share = share;
   }
 
   /**
    * Compute sum of this and other.
    */
-  public Spdz2kSInt<PlainT> add(Spdz2kSInt<PlainT> other) {
-    return new Spdz2kSInt<>(share.add(other.share), macShare.add(other.macShare));
+  public Spdz2kSIntArithmetic<PlainT> add(Spdz2kSIntArithmetic<PlainT> other) {
+    return new Spdz2kSIntArithmetic<>(share.add(other.share), macShare.add(other.macShare));
   }
 
   /**
    * Compute difference of this and other.
    */
-  public Spdz2kSInt<PlainT> subtract(Spdz2kSInt<PlainT> other) {
-    return new Spdz2kSInt<>(share.subtract(other.share), macShare.subtract(other.macShare));
+  public Spdz2kSIntArithmetic<PlainT> subtract(Spdz2kSIntArithmetic<PlainT> other) {
+    return new Spdz2kSIntArithmetic<>(share.subtract(other.share),
+        macShare.subtract(other.macShare));
   }
 
   /**
    * Compute product of this and constant (open) value.
    */
-  public Spdz2kSInt<PlainT> multiply(PlainT other) {
-    return new Spdz2kSInt<>(share.multiply(other), macShare.multiply(other));
+  public Spdz2kSIntArithmetic<PlainT> multiply(PlainT other) {
+    return new Spdz2kSIntArithmetic<>(share.multiply(other), macShare.multiply(other));
   }
 
   @Override
@@ -69,9 +53,10 @@ public String toString() {
    * @param isPartyOne used to ensure that only one party adds value to share
    * @return result of sum
    */
-  public Spdz2kSInt<PlainT> addConstant(
+  public Spdz2kSIntArithmetic<PlainT> addConstant(
       PlainT other, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-    Spdz2kSInt<PlainT> wrapped = new Spdz2kSInt<>(other, macKeyShare, zero, isPartyOne);
+    Spdz2kSIntArithmetic<PlainT> wrapped = new Spdz2kSIntArithmetic<>(other, macKeyShare, zero,
+        isPartyOne);
     return add(wrapped);
   }
 
@@ -89,6 +74,8 @@ public PlainT getMacShare() {
     return macShare;
   }
 
+  public abstract byte[] serializeShare();
+
   @Override
   public SInt out() {
     return this;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
new file mode 100644
index 000000000..c0bbaa0ee
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -0,0 +1,32 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+/**
+ * Represents an authenticated, secret-share element.
+ *
+ * @param <PlainT> type of underlying plain value, i.e., the value type we use for arithmetic.
+ */
+public class Spdz2kSIntArithmetic<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kSInt<PlainT> {
+
+  /**
+   * Creates a {@link Spdz2kSIntArithmetic}.
+   */
+  public Spdz2kSIntArithmetic(PlainT share, PlainT macShare) {
+    super(macShare, share);
+  }
+  
+  /**
+   * Creates a {@link Spdz2kSIntArithmetic} from a public value. <p>All parties compute the mac
+   * share of the value but only party one (by convention) stores the public value as the share, the
+   * others store 0.</p>
+   */
+  public Spdz2kSIntArithmetic(PlainT share, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
+    this(isPartyOne ? share : zero, share.multiply(macKeyShare));
+  }
+
+  @Override
+  public byte[] serializeShare() {
+    return share.getLeastSignificant().toByteArray();
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
new file mode 100644
index 000000000..8cff8c3b1
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -0,0 +1,32 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+/**
+ * Represents an authenticated, secret-share element.
+ *
+ * @param <PlainT> type of underlying plain value, i.e., the value type we use for arithmetic.
+ */
+public class Spdz2kSIntBoolean<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kSInt<PlainT> {
+
+  /**
+   * Creates a {@link Spdz2kSIntBoolean}.
+   */
+  public Spdz2kSIntBoolean(PlainT share, PlainT macShare) {
+    super(macShare, share);
+  }
+
+  /**
+   * Creates a {@link Spdz2kSIntBoolean} from a public value. <p>All parties compute the mac
+   * share of the value but only party one (by convention) stores the public value as the share, the
+   * others store 0.</p>
+   */
+  public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
+    this(isPartyOne ? share : zero, share.multiply(macKeyShare));
+  }
+
+  @Override
+  public byte[] serializeShare() {
+    return share.getLeastSignificant().toByteArray();
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
index f46456d40..e77a5291e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
@@ -2,26 +2,26 @@
 
 public class Spdz2kTriple<PlainT extends CompUInt<?, ?, PlainT>> {
 
-  private final Spdz2kSInt<PlainT> left;
-  private final Spdz2kSInt<PlainT> right;
-  private final Spdz2kSInt<PlainT> product;
+  private final Spdz2kSIntArithmetic<PlainT> left;
+  private final Spdz2kSIntArithmetic<PlainT> right;
+  private final Spdz2kSIntArithmetic<PlainT> product;
 
-  public Spdz2kTriple(Spdz2kSInt<PlainT> left, Spdz2kSInt<PlainT> right,
-      Spdz2kSInt<PlainT> product) {
+  public Spdz2kTriple(Spdz2kSIntArithmetic<PlainT> left, Spdz2kSIntArithmetic<PlainT> right,
+      Spdz2kSIntArithmetic<PlainT> product) {
     this.left = left;
     this.right = right;
     this.product = product;
   }
 
-  public Spdz2kSInt<PlainT> getLeft() {
+  public Spdz2kSIntArithmetic<PlainT> getLeft() {
     return left;
   }
 
-  public Spdz2kSInt<PlainT> getRight() {
+  public Spdz2kSIntArithmetic<PlainT> getRight() {
     return right;
   }
 
-  public Spdz2kSInt<PlainT> getProduct() {
+  public Spdz2kSIntArithmetic<PlainT> getProduct() {
     return product;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
index 364bab571..02691d701 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
@@ -11,7 +11,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
@@ -31,7 +31,7 @@ public class Spdz2kMacCheckComputation<
   private final CompUIntConverter<HighT, LowT, PlainT> converter;
   private final ByteSerializer<PlainT> serializer;
   private final Spdz2kDataSupplier<PlainT> supplier;
-  private final List<Spdz2kSInt<PlainT>> authenticatedElements;
+  private final List<Spdz2kSIntArithmetic<PlainT>> authenticatedElements;
   private final List<PlainT> openValues;
   private final List<PlainT> randomCoefficients;
   private ByteSerializer<HashBasedCommitment> commitmentSerializer;
@@ -46,7 +46,7 @@ public class Spdz2kMacCheckComputation<
    * @param converter utility class for converting between {@link HighT} and {@link PlainT}, {@link
    * LowT} and {@link PlainT}
    */
-  public Spdz2kMacCheckComputation(Pair<List<Spdz2kSInt<PlainT>>, List<PlainT>> toCheck,
+  public Spdz2kMacCheckComputation(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<PlainT>> toCheck,
       Spdz2kResourcePool<PlainT> resourcePool,
       CompUIntConverter<HighT, LowT, PlainT> converter) {
     this.authenticatedElements = toCheck.getFirst();
@@ -67,7 +67,7 @@ public Spdz2kMacCheckComputation(Pair<List<Spdz2kSInt<PlainT>>, List<PlainT>> to
   public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
     PlainT macKeyShare = supplier.getSecretSharedKey();
     PlainT y = UInt.innerProduct(openValues, randomCoefficients);
-    Spdz2kSInt<PlainT> r = supplier.getNextRandomElementShare();
+    Spdz2kSIntArithmetic<PlainT> r = supplier.getNextRandomElementShare();
     return builder
         .seq(seq -> {
           if (noOfParties > 2) {
@@ -100,8 +100,8 @@ private HighT computePj(PlainT originalShare, PlainT randomCoefficient) {
   }
 
   private DRes<List<byte[]>> computePValues(ProtocolBuilderNumeric builder,
-      List<Spdz2kSInt<PlainT>> authenticatedElements,
-      Spdz2kSInt<PlainT> r) {
+      List<Spdz2kSIntArithmetic<PlainT>> authenticatedElements,
+      Spdz2kSIntArithmetic<PlainT> r) {
     HighT pj = computePj(authenticatedElements.get(0).getShare(), randomCoefficients.get(0));
     for (int i = 1; i < authenticatedElements.size(); i++) {
       PlainT share = authenticatedElements.get(i).getShare();
@@ -113,15 +113,15 @@ private DRes<List<byte[]>> computePValues(ProtocolBuilderNumeric builder,
   }
 
   private DRes<List<byte[]>> computeZValues(ProtocolBuilderNumeric builder,
-      List<Spdz2kSInt<PlainT>> authenticatedElements,
-      PlainT macKeyShare, PlainT y, Spdz2kSInt<PlainT> r,
+      List<Spdz2kSIntArithmetic<PlainT>> authenticatedElements,
+      PlainT macKeyShare, PlainT y, Spdz2kSIntArithmetic<PlainT> r,
       List<byte[]> broadcastPjs) {
     List<PlainT> pjList = serializer.deserializeList(broadcastPjs);
     HighT pLow = UInt.sum(
         pjList.stream().map(PlainT::getLeastSignificantAsHigh).collect(Collectors.toList()));
     PlainT p = converter.createFromHigh(pLow);
     List<PlainT> macShares = authenticatedElements.stream()
-        .map(Spdz2kSInt::getMacShare)
+        .map(Spdz2kSIntArithmetic::getMacShare)
         .collect(Collectors.toList());
     PlainT mj = UInt.innerProduct(macShares, randomCoefficients);
     PlainT zj = macKeyShare.multiply(y)
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java
index cb618f9c2..bb822cfec 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddKnownProtocol.java
@@ -34,7 +34,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Network network) {
     Spdz2kDataSupplier<PlainT> dataSupplier = resourcePool.getDataSupplier();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    out = factory.toSpdz2kSInt(right).addConstant(left,
+    out = factory.toSpdz2kSIntArithmetic(right).addConstant(left,
         dataSupplier.getSecretSharedKey(),
         factory.zero(),
         resourcePool.getMyId() == 1);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java
index 11a59a8bb..6c4f56228 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java
@@ -8,7 +8,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
 
@@ -54,8 +54,8 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     } else {
       byte[] inputMaskBytes = network.receive(inputPartyId);
       PlainT macKeyShare = dataSupplier.getSecretSharedKey();
-      Spdz2kSInt<PlainT> maskShare = inputMask.getMaskShare();
-      Spdz2kSInt<PlainT> out = maskShare.addConstant(
+      Spdz2kSIntArithmetic<PlainT> maskShare = inputMask.getMaskShare();
+      Spdz2kSIntArithmetic<PlainT> out = maskShare.addConstant(
           serializer.deserialize(inputMaskBytes),
           macKeyShare,
           factory.zero(),
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kKnownSIntProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kKnownSIntProtocol.java
index 607b7fa86..f6efc5aac 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kKnownSIntProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kKnownSIntProtocol.java
@@ -4,7 +4,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
 
@@ -32,7 +32,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     Spdz2kDataSupplier<PlainT> dataSupplier = resourcePool.getDataSupplier();
     boolean isPartyOne = (resourcePool.getMyId() == 1);
-    out = new Spdz2kSInt<>(input, dataSupplier.getSecretSharedKey(), factory.zero(), isPartyOne);
+    out = new Spdz2kSIntArithmetic<>(input, dataSupplier.getSecretSharedKey(), factory.zero(), isPartyOne);
     return EvaluationStatus.IS_DONE;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
index f65eae90b..44cf0719f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
@@ -7,7 +7,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.Arrays;
@@ -21,8 +21,8 @@ public class Spdz2kMultiplyProtocol<PlainT extends CompUInt<?, ?, PlainT>> exten
   private final DRes<SInt> left;
   private final DRes<SInt> right;
   private Spdz2kTriple<PlainT> triple;
-  private Spdz2kSInt<PlainT> epsilon;
-  private Spdz2kSInt<PlainT> delta;
+  private Spdz2kSIntArithmetic<PlainT> epsilon;
+  private Spdz2kSIntArithmetic<PlainT> delta;
   private SInt product;
 
   /**
@@ -44,8 +44,8 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
       triple = resourcePool.getDataSupplier().getNextTripleShares();
-      epsilon = factory.toSpdz2kSInt(left).subtract(triple.getLeft());
-      delta = factory.toSpdz2kSInt(right).subtract(triple.getRight());
+      epsilon = factory.toSpdz2kSIntArithmetic(left).subtract(triple.getLeft());
+      delta = factory.toSpdz2kSIntArithmetic(right).subtract(triple.getRight());
       network.sendToAll(epsilon.getShare().getLeastSignificant().toByteArray());
       network.sendToAll(delta.getShare().getLeastSignificant().toByteArray());
       return EvaluationStatus.HAS_MORE_ROUNDS;
@@ -58,9 +58,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       PlainT e = epsilonAndDelta.getFirst();
       PlainT d = epsilonAndDelta.getSecond();
       PlainT ed = e.multiply(d);
-      Spdz2kSInt<PlainT> tripleRight = triple.getRight();
-      Spdz2kSInt<PlainT> tripleLeft = triple.getLeft();
-      Spdz2kSInt<PlainT> tripleProduct = triple.getProduct();
+      Spdz2kSIntArithmetic<PlainT> tripleRight = triple.getRight();
+      Spdz2kSIntArithmetic<PlainT> tripleLeft = triple.getLeft();
+      Spdz2kSIntArithmetic<PlainT> tripleProduct = triple.getProduct();
       this.product = tripleProduct
           .add(tripleRight.multiply(e))
           .add(tripleLeft.multiply(d))
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
index 8bf14bf34..31aa7d94f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
@@ -8,7 +8,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
@@ -25,7 +25,7 @@ public class Spdz2kOutputSinglePartyProtocol<PlainT extends CompUInt<?, ?, Plain
   private final int outputParty;
   private PlainT opened;
   private Spdz2kInputMask<PlainT> inputMask;
-  private Spdz2kSInt<PlainT> inMinusMask;
+  private Spdz2kSIntArithmetic<PlainT> inMinusMask;
 
   /**
    * Creates new {@link Spdz2kOutputSinglePartyProtocol}.
@@ -41,13 +41,13 @@ public Spdz2kOutputSinglePartyProtocol(DRes<SInt> share, int outputParty) {
   @Override
   public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
       Network network) {
-    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> openedValueStore = resourcePool
+    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
         .getOpenedValueStore();
     Spdz2kDataSupplier<PlainT> supplier = resourcePool.getDataSupplier();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
       this.inputMask = supplier.getNextInputMask(outputParty);
-      inMinusMask = factory.toSpdz2kSInt(share).subtract(this.inputMask.getMaskShare());
+      inMinusMask = factory.toSpdz2kSIntArithmetic(share).subtract(this.inputMask.getMaskShare());
       network.sendToAll(inMinusMask.getShare().getLeastSignificant().toByteArray());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
index d6be515cd..3688cfc8a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
@@ -8,7 +8,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.List;
@@ -22,7 +22,7 @@ public class Spdz2kOutputToAll<PlainT extends CompUInt<?, ?, PlainT>>
 
   private final DRes<SInt> share;
   private PlainT opened;
-  private Spdz2kSInt<PlainT> authenticatedElement;
+  private Spdz2kSIntArithmetic<PlainT> authenticatedElement;
 
   /**
    * Creates new {@link Spdz2kOutputToAll}.
@@ -36,11 +36,11 @@ public Spdz2kOutputToAll(DRes<SInt> share) {
   @Override
   public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
       Network network) {
-    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> openedValueStore = resourcePool
+    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
         .getOpenedValueStore();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
-      authenticatedElement = factory.toSpdz2kSInt(share);
+      authenticatedElement = factory.toSpdz2kSIntArithmetic(share);
       network.sendToAll(authenticatedElement.getShare().getLeastSignificant().toByteArray());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
index 87caceb48..7621db9da 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
@@ -5,7 +5,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 
 /**
@@ -36,9 +36,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
     PlainT zero = resourcePool.getFactory().zero();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    Spdz2kSInt<PlainT> leftSInt = new Spdz2kSInt<>(left, secretSharedKey, zero,
+    Spdz2kSIntArithmetic<PlainT> leftSInt = new Spdz2kSIntArithmetic<>(left, secretSharedKey, zero,
         resourcePool.getMyId() == 1);
-    difference = leftSInt.subtract(factory.toSpdz2kSInt(right));
+    difference = leftSInt.subtract(factory.toSpdz2kSIntArithmetic(right));
     return EvaluationStatus.IS_DONE;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePool.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePool.java
index 551bea63f..c25138d3c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePool.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePool.java
@@ -10,7 +10,7 @@
 import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
 import java.math.BigInteger;
 import java.util.function.Function;
@@ -28,7 +28,7 @@ public interface Spdz2kResourcePool<PlainT extends CompUInt<?, ?, PlainT>>
   /**
    * Returns instance of {@link OpenedValueStore} which tracks all opened, unchecked values.
    */
-  OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> getOpenedValueStore();
+  OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> getOpenedValueStore();
 
   /**
    * Returns instance of {@link Spdz2kDataSupplier} which provides pre-processed material such as
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
index ff60f7e9c..79beb5b1e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
@@ -20,7 +20,7 @@
 import dk.alexandra.fresco.suite.spdz2k.Spdz2kBuilder;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.CoinTossingComputation;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
 import java.io.Closeable;
@@ -40,7 +40,7 @@ public class Spdz2kResourcePoolImpl<PlainT extends CompUInt<?, ?, PlainT>>
 
   private final int effectiveBitLength;
   private final BigInteger modulus;
-  private final OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> storage;
+  private final OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> storage;
   private final Spdz2kDataSupplier<PlainT> supplier;
   private final CompUIntFactory<PlainT> factory;
   private final ByteSerializer<PlainT> rawSerializer;
@@ -51,7 +51,7 @@ public class Spdz2kResourcePoolImpl<PlainT extends CompUInt<?, ?, PlainT>>
    * Creates new {@link Spdz2kResourcePoolImpl}.
    */
   public Spdz2kResourcePoolImpl(int myId, int noOfPlayers, Drbg drbg,
-      OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> storage,
+      OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> storage,
       Spdz2kDataSupplier<PlainT> supplier, CompUIntFactory<PlainT> factory) {
     super(myId, noOfPlayers);
     Objects.requireNonNull(storage);
@@ -73,7 +73,7 @@ public int getMaxBitLength() {
   }
 
   @Override
-  public OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> getOpenedValueStore() {
+  public OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> getOpenedValueStore() {
     return storage;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
index 7091a0f04..90bbf623a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
@@ -2,7 +2,7 @@
 
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 
 /**
@@ -29,7 +29,7 @@ public interface Spdz2kDataSupplier<T extends CompUInt<?, ?, T>> {
   /**
    * Supplies the next bit (SInt representing value in {0, 1}).
    */
-  Spdz2kSInt<T> getNextBitShare();
+  Spdz2kSIntArithmetic<T> getNextBitShare();
 
   /**
    * Returns the player's share of the mac key.
@@ -39,6 +39,6 @@ public interface Spdz2kDataSupplier<T extends CompUInt<?, ?, T>> {
   /**
    * Returns the next random field element.
    */
-  Spdz2kSInt<T> getNextRandomElementShare();
+  Spdz2kSIntArithmetic<T> getNextRandomElementShare();
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index 1ee9a9139..5453e4f9c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -6,7 +6,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 import java.math.BigInteger;
 
@@ -53,7 +53,7 @@ public Spdz2kInputMask<PlainT> getNextInputMask(int towardPlayerId) {
   }
 
   @Override
-  public Spdz2kSInt<PlainT> getNextBitShare() {
+  public Spdz2kSIntArithmetic<PlainT> getNextBitShare() {
     return toSpdz2kSInt(supplier.getRandomBitShare());
   }
 
@@ -63,15 +63,15 @@ public PlainT getSecretSharedKey() {
   }
 
   @Override
-  public Spdz2kSInt<PlainT> getNextRandomElementShare() {
+  public Spdz2kSIntArithmetic<PlainT> getNextRandomElementShare() {
     return toSpdz2kSInt(supplier.getRandomElementShare());
   }
 
-  private Spdz2kSInt<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> raw) {
+  private Spdz2kSIntArithmetic<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> raw) {
     PlainT openValue = factory.createFromBigInteger(raw.getFirst());
     PlainT share = factory.createFromBigInteger(raw.getSecond());
     PlainT macShare = openValue.multiply(secretSharedKey);
-    return new Spdz2kSInt<>(share, macShare);
+    return new Spdz2kSIntArithmetic<>(share, macShare);
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kOpenedValueStoreImpl.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kOpenedValueStoreImpl.java
index dbce73e9f..c0dc18a6d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kOpenedValueStoreImpl.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kOpenedValueStoreImpl.java
@@ -3,12 +3,12 @@
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
 import dk.alexandra.fresco.framework.util.OpenedValueStoreImpl;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 
 /**
  * Spdz2k-specific instantiation of {@link OpenedValueStore}.
  */
 public class Spdz2kOpenedValueStoreImpl<PlainT extends CompUInt<?, ?, PlainT>>
-    extends OpenedValueStoreImpl<Spdz2kSInt<PlainT>, PlainT> {
+    extends OpenedValueStoreImpl<Spdz2kSIntArithmetic<PlainT>, PlainT> {
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 47e1a036a..83fbe28ee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -12,7 +12,7 @@
 import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.RequiresMacCheck;
@@ -59,7 +59,7 @@ private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network
         batchStrategy,
         protocolSuite,
         batchSize);
-    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
+    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
     Spdz2kMacCheckComputation<HighT, LowT, PlainT> macCheck = new Spdz2kMacCheckComputation<>(
         store.popValues(),
         resourcePool, converter);
@@ -71,7 +71,7 @@ private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network
   @Override
   public void finishedBatch(int gatesEvaluated, Spdz2kResourcePool<PlainT> resourcePool,
       Network network) {
-    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
+    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
     if (isCheckRequired || store.exceedsThreshold(openValueThreshold)) {
       doMacCheck(resourcePool, network);
       isCheckRequired = false;
@@ -80,7 +80,7 @@ public void finishedBatch(int gatesEvaluated, Spdz2kResourcePool<PlainT> resourc
 
   @Override
   public void finishedEval(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
-    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
+    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
     if (store.hasPendingValues()) {
       doMacCheck(resourcePool, network);
     }
@@ -92,7 +92,7 @@ public void beforeBatch(
       Spdz2kResourcePool<PlainT> resourcePool, Network network) {
     isCheckRequired = StreamSupport.stream(nativeProtocols.spliterator(), false)
         .anyMatch(p -> p instanceof RequiresMacCheck);
-    OpenedValueStore<Spdz2kSInt<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
+    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
     if (store.hasPendingValues() && isCheckRequired) {
       doMacCheck(resourcePool, network);
     }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 73e76f8e1..c9b562311 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -319,4 +319,15 @@ public void testClearAboveBitAt() {
     assertEquals(new CompUInt128(0, 0, 0x00000001).toBigInteger(),
         new CompUInt128(1, 1, 0xff001021).clearAboveBitAt(5).toBigInteger());
   }
+
+  @Test
+  public void testShiftLeft() {
+    // TODO more tests
+    assertEquals(new BigInteger("0").shiftLeft(63),
+        new CompUInt128(new BigInteger("0")).shiftLeft(63).toBigInteger());
+    assertEquals(new BigInteger("1").shiftLeft(63),
+        new CompUInt128(new BigInteger("1")).shiftLeft(63).toBigInteger());
+    assertEquals(new BigInteger("12312").shiftLeft(12),
+        new CompUInt128(new BigInteger("12312")).shiftLeft(12).toBigInteger());
+  }
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
index 0441a3615..07792123c 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
@@ -313,4 +313,15 @@ public void testClearAboveBitAt() {
         new CompUInt96(1, 1, 0xff001021).clearAboveBitAt(5).toBigInteger());
   }
 
+  @Test
+  public void testShiftLeft() {
+    // TODO more tests
+    assertEquals(new BigInteger("0").shiftLeft(31),
+        new CompUInt96(new BigInteger("0")).shiftLeft(31).toBigInteger());
+    assertEquals(new BigInteger("1").shiftLeft(31),
+        new CompUInt96(new BigInteger("1")).shiftLeft(31).toBigInteger());
+    assertEquals(new BigInteger("12312").shiftLeft(12),
+        new CompUInt96(new BigInteger("12312")).shiftLeft(12).toBigInteger());
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSInt.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSInt.java
index c7858c61d..fa3c7a02c 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSInt.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSInt.java
@@ -7,7 +7,7 @@
 public class TestSpdz2kSInt {
   @Test
   public void testToString() {
-    Spdz2kSInt<CompUInt128> sint = new Spdz2kSInt<>(
+    Spdz2kSIntArithmetic<CompUInt128> sint = new Spdz2kSIntArithmetic<>(
         new CompUInt128(BigInteger.ONE),
         new CompUInt128(BigInteger.ONE)
     );
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kMacCheckComputation.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kMacCheckComputation.java
index c2faab9cc..00335627a 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kMacCheckComputation.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kMacCheckComputation.java
@@ -19,7 +19,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
@@ -89,7 +89,7 @@ public void test() {
             return producer.seq(seq -> {
               SInt value = input.out();
               if (seq.getBasicNumericContext().getMyId() == cheatingPartyId) {
-                value = ((Spdz2kSInt<CompUInt128>) value).multiply(
+                value = ((Spdz2kSIntArithmetic<CompUInt128>) value).multiply(
                     new CompUInt128(BigInteger.valueOf(2)));
               }
               final SInt finalSInt = value;
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
index 9c57d2475..01c9dffc4 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
@@ -9,7 +9,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -22,11 +22,11 @@ public class TestSpdz2kDummyDataSupplier {
   private void testGetNextRandomElementShare(int noOfParties) {
     List<Spdz2kDataSupplier<CompUInt128>> suppliers = setupSuppliers(noOfParties);
     CompUInt128 macKey = getMacKeyFromSuppliers(suppliers);
-    List<Spdz2kSInt<CompUInt128>> shares = new ArrayList<>(noOfParties);
+    List<Spdz2kSIntArithmetic<CompUInt128>> shares = new ArrayList<>(noOfParties);
     for (Spdz2kDataSupplier<CompUInt128> supplier : suppliers) {
       shares.add(supplier.getNextRandomElementShare());
     }
-    Spdz2kSInt<CompUInt128> recombined = recombine(shares);
+    Spdz2kSIntArithmetic<CompUInt128> recombined = recombine(shares);
     assertFalse("Random value was 0 ",
         recombined.getShare().toBigInteger().equals(BigInteger.ZERO));
     assertMacCorrect(recombined, macKey);
@@ -35,11 +35,11 @@ private void testGetNextRandomElementShare(int noOfParties) {
   private void testGetNextBitShare(int noOfParties) {
     List<Spdz2kDataSupplier<CompUInt128>> suppliers = setupSuppliers(noOfParties);
     CompUInt128 macKey = getMacKeyFromSuppliers(suppliers);
-    List<Spdz2kSInt<CompUInt128>> shares = new ArrayList<>(noOfParties);
+    List<Spdz2kSIntArithmetic<CompUInt128>> shares = new ArrayList<>(noOfParties);
     for (Spdz2kDataSupplier<CompUInt128> supplier : suppliers) {
       shares.add(supplier.getNextBitShare());
     }
-    Spdz2kSInt<CompUInt128> recombined = recombine(shares);
+    Spdz2kSIntArithmetic<CompUInt128> recombined = recombine(shares);
     BigInteger asBitInt = recombined.getShare().toBigInteger();
     assertTrue("Not a bit " + asBitInt,
         asBitInt.equals(BigInteger.ZERO) || asBitInt.equals(BigInteger.ONE));
@@ -54,7 +54,7 @@ private void testGetInputMask(int noOfParties, int towardParty) {
       masks.add(supplier.getNextInputMask(towardParty));
     }
     CompUInt128 realValue = null;
-    List<Spdz2kSInt<CompUInt128>> shares = new ArrayList<>(noOfParties);
+    List<Spdz2kSIntArithmetic<CompUInt128>> shares = new ArrayList<>(noOfParties);
     for (int i = 1; i <= noOfParties; i++) {
       Spdz2kInputMask<CompUInt128> inputMask = masks.get(i - 1);
       if (i != towardParty) {
@@ -64,7 +64,7 @@ private void testGetInputMask(int noOfParties, int towardParty) {
       }
       shares.add(inputMask.getMaskShare());
     }
-    Spdz2kSInt<CompUInt128> recombined = recombine(shares);
+    Spdz2kSIntArithmetic<CompUInt128> recombined = recombine(shares);
     assertMacCorrect(recombined, macKey);
     assertEquals(realValue.toBigInteger(), recombined.getShare().toBigInteger());
   }
@@ -111,12 +111,12 @@ public void testGetNextTripleShares() {
     testGetNextTripleShares(5);
   }
 
-  private Spdz2kSInt<CompUInt128> recombine(
-      List<Spdz2kSInt<CompUInt128>> shares) {
-    return shares.stream().reduce(Spdz2kSInt::add).get();
+  private Spdz2kSIntArithmetic<CompUInt128> recombine(
+      List<Spdz2kSIntArithmetic<CompUInt128>> shares) {
+    return shares.stream().reduce(Spdz2kSIntArithmetic::add).get();
   }
 
-  private void assertMacCorrect(Spdz2kSInt<CompUInt128> recombined,
+  private void assertMacCorrect(Spdz2kSIntArithmetic<CompUInt128> recombined,
       CompUInt128 macKey) {
     assertArrayEquals(
         macKey.multiply(recombined.getShare()).toByteArray(),
@@ -146,9 +146,9 @@ private CompUInt128 getMacKeyFromSuppliers(
 
   private Spdz2kTriple<CompUInt128> recombineTriples(
       List<Spdz2kTriple<CompUInt128>> triples) {
-    List<Spdz2kSInt<CompUInt128>> left = new ArrayList<>(triples.size());
-    List<Spdz2kSInt<CompUInt128>> right = new ArrayList<>(triples.size());
-    List<Spdz2kSInt<CompUInt128>> product = new ArrayList<>(triples.size());
+    List<Spdz2kSIntArithmetic<CompUInt128>> left = new ArrayList<>(triples.size());
+    List<Spdz2kSIntArithmetic<CompUInt128>> right = new ArrayList<>(triples.size());
+    List<Spdz2kSIntArithmetic<CompUInt128>> product = new ArrayList<>(triples.size());
     for (Spdz2kTriple<CompUInt128> triple : triples) {
       left.add(triple.getLeft());
       right.add(triple.getRight());

From 773f97ea24491110b9b32590df2746364e3d41e7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 12:43:51 +0200
Subject: [PATCH 098/231] Add serialization methods to spdz2ksint

---
 .../alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java  | 11 ++++++++---
 .../fresco/suite/spdz2k/datatypes/Spdz2kSInt.java     |  4 +++-
 .../suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java  |  9 +++++++--
 .../suite/spdz2k/datatypes/Spdz2kSIntBoolean.java     |  7 ++++++-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 9ff09b65a..999a81b97 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -19,6 +19,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
@@ -88,7 +89,8 @@ public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
-        return () -> (factory.toSpdz2kSIntArithmetic(a)).subtract(factory.toSpdz2kSIntArithmetic(b));
+        return () -> (factory.toSpdz2kSIntArithmetic(a))
+            .subtract(factory.toSpdz2kSIntArithmetic(b));
       }
 
       @Override
@@ -191,8 +193,10 @@ public Conversion createConversion(ProtocolBuilderNumeric builder) {
       public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
         return () -> {
           Spdz2kSIntArithmetic<PlainT> value = factory.toSpdz2kSIntArithmetic(arithmeticValue);
-
-          return value;
+          return new Spdz2kSIntBoolean<>(
+              value.getShare().shiftLeft(factory.getLowBitLength() - 1),
+              value.getMacShare().shiftLeft(factory.getLowBitLength() - 1)
+          );
         };
       }
 
@@ -225,6 +229,7 @@ public RealNumericContext getRealNumericContext() {
   }
 
   class Spdz2kLogical extends DefaultLogical {
+
     protected Spdz2kLogical(
         ProtocolBuilderNumeric builder) {
       super(builder);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
index 2c4e17231..d47be1690 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
@@ -74,7 +74,9 @@ public PlainT getMacShare() {
     return macShare;
   }
 
-  public abstract byte[] serializeShare();
+  public abstract byte[] serializeShareLow();
+
+  public abstract byte[] serializeShareWhole();
 
   @Override
   public SInt out() {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
index c0bbaa0ee..531a3b84f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -14,7 +14,7 @@ public class Spdz2kSIntArithmetic<PlainT extends CompUInt<?, ?, PlainT>> extends
   public Spdz2kSIntArithmetic(PlainT share, PlainT macShare) {
     super(macShare, share);
   }
-  
+
   /**
    * Creates a {@link Spdz2kSIntArithmetic} from a public value. <p>All parties compute the mac
    * share of the value but only party one (by convention) stores the public value as the share, the
@@ -25,8 +25,13 @@ public Spdz2kSIntArithmetic(PlainT share, PlainT macKeyShare, PlainT zero, boole
   }
 
   @Override
-  public byte[] serializeShare() {
+  public byte[] serializeShareLow() {
     return share.getLeastSignificant().toByteArray();
   }
 
+  @Override
+  public byte[] serializeShareWhole() {
+    return share.toByteArray();
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 8cff8c3b1..5095e7821 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -25,8 +25,13 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean
   }
 
   @Override
-  public byte[] serializeShare() {
+  public byte[] serializeShareLow() {
     return share.getLeastSignificant().toByteArray();
   }
 
+  @Override
+  public byte[] serializeShareWhole() {
+    return share.toByteArray();
+  }
+
 }

From 0e100b805cea1a7b27074312be884a53fe297ba4 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 12:49:02 +0200
Subject: [PATCH 099/231] Use serialization methods in native protocols

---
 .../spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java      | 4 ++--
 .../protocols/natives/Spdz2kOutputSinglePartyProtocol.java    | 2 +-
 .../suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
index 44cf0719f..62425e2df 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
@@ -46,8 +46,8 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       triple = resourcePool.getDataSupplier().getNextTripleShares();
       epsilon = factory.toSpdz2kSIntArithmetic(left).subtract(triple.getLeft());
       delta = factory.toSpdz2kSIntArithmetic(right).subtract(triple.getRight());
-      network.sendToAll(epsilon.getShare().getLeastSignificant().toByteArray());
-      network.sendToAll(delta.getShare().getLeastSignificant().toByteArray());
+      network.sendToAll(epsilon.serializeShareLow());
+      network.sendToAll(delta.serializeShareLow());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
       Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
index 31aa7d94f..d17576b33 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputSinglePartyProtocol.java
@@ -48,7 +48,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     if (round == 0) {
       this.inputMask = supplier.getNextInputMask(outputParty);
       inMinusMask = factory.toSpdz2kSIntArithmetic(share).subtract(this.inputMask.getMaskShare());
-      network.sendToAll(inMinusMask.getShare().getLeastSignificant().toByteArray());
+      network.sendToAll(inMinusMask.serializeShareLow());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
       List<PlainT> shares = resourcePool.getPlainSerializer()
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
index 3688cfc8a..72aeefd58 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOutputToAll.java
@@ -41,7 +41,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
       authenticatedElement = factory.toSpdz2kSIntArithmetic(share);
-      network.sendToAll(authenticatedElement.getShare().getLeastSignificant().toByteArray());
+      network.sendToAll(authenticatedElement.serializeShareLow());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
       ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();

From f7d827f4f5d49c88427851f65d6f18fde85451eb Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 13:42:55 +0200
Subject: [PATCH 100/231] WIP conversion

---
 .../framework/builder/numeric/Conversion.java |  11 ++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  34 +++++-
 .../suite/spdz2k/datatypes/CompUInt128.java   |   2 +-
 .../spdz2k/datatypes/CompUIntFactory.java     |   7 ++
 .../suite/spdz2k/datatypes/Spdz2kSInt.java    |   8 --
 .../datatypes/Spdz2kSIntArithmetic.java       |   8 ++
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   |   8 ++
 .../computations/TestSpdz2kConversion.java    |  94 ++++++++++++++++
 .../TestSpdz2kLogicalOperations.java          | 106 ++++++++++++++++++
 9 files changed, 268 insertions(+), 10 deletions(-)
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java
index bd43cc1ee..5b8685266 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Conversion.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
 import dk.alexandra.fresco.framework.value.SInt;
+import java.util.List;
 
 /**
  * Operators for converting between different representations of secret values (for instance between
@@ -22,4 +23,14 @@ public interface Conversion extends ComputationDirectory {
    */
   DRes<SInt> toArithmetic(DRes<SInt> booleanValue);
 
+  /**
+   * Convert multiple values from arithmetic to boolean.
+   */
+  DRes<List<DRes<SInt>>> toBooleanBatch(DRes<List<DRes<SInt>>> arithmeticBatch);
+
+  /**
+   * Convert multiple values from boolean to arithmetic.
+   */
+  DRes<List<DRes<SInt>>> toArithmeticBatch(DRes<List<DRes<SInt>>> booleanBatch);
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 999a81b97..14a6b56be 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -30,6 +30,8 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomElementProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kSubtractFromKnownProtocol;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Basic native builder for the SPDZ2k protocol suite.
@@ -202,7 +204,37 @@ public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
 
       @Override
       public DRes<SInt> toArithmetic(DRes<SInt> booleanValue) {
-        throw new UnsupportedOperationException();
+        return () -> {
+          Spdz2kSIntBoolean<PlainT> value = factory.toSpdz2kSIntBoolean(booleanValue);
+          return new Spdz2kSIntArithmetic<>(
+              value.getShare(),
+              value.getMacShare()
+          );
+        };
+      }
+
+      @Override
+      public DRes<List<DRes<SInt>>> toBooleanBatch(DRes<List<DRes<SInt>>> arithmeticBatch) {
+        return builder.par(par -> {
+          List<DRes<SInt>> inner = arithmeticBatch.out();
+          List<DRes<SInt>> converted = new ArrayList<>(inner.size());
+          for (DRes<SInt> anInner : inner) {
+            converted.add(builder.conversion().toBoolean(anInner));
+          }
+          return () -> converted;
+        });
+      }
+
+      @Override
+      public DRes<List<DRes<SInt>>> toArithmeticBatch(DRes<List<DRes<SInt>>> booleanBatch) {
+        return builder.par(par -> {
+          List<DRes<SInt>> inner = booleanBatch.out();
+          List<DRes<SInt>> converted = new ArrayList<>(inner.size());
+          for (DRes<SInt> anInner : inner) {
+            converted.add(builder.conversion().toArithmetic(anInner));
+          }
+          return () -> converted;
+        });
       }
     };
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 975ca3580..6f69b3100 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -161,7 +161,7 @@ public UInt64 getLeastSignificantAsHigh() {
   @Override
   public CompUInt128 shiftLeft(int n) {
     // TODO hack hack hack
-    return new CompUInt128(high, low << 31, 0);
+    return new CompUInt128(this.toBigInteger().shiftLeft(n));
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index 4f5a23f4a..6d0c69a7d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -49,6 +49,13 @@ default Spdz2kSIntArithmetic<CompT> toSpdz2kSIntArithmetic(DRes<SInt> value) {
     return Objects.requireNonNull((Spdz2kSIntArithmetic<CompT>) value.out());
   }
 
+  /**
+   * Get result from deferred and downcast result to {@link Spdz2kSIntBoolean<CompT>}.
+   */
+  default Spdz2kSIntBoolean<CompT> toSpdz2kSIntBoolean(DRes<SInt> value) {
+    return Objects.requireNonNull((Spdz2kSIntBoolean<CompT>) value.out());
+  }
+
   /**
    * Creates new {@link CompT} from a raw array of bytes.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
index d47be1690..8c6911b3b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
@@ -34,14 +34,6 @@ public Spdz2kSIntArithmetic<PlainT> multiply(PlainT other) {
     return new Spdz2kSIntArithmetic<>(share.multiply(other), macShare.multiply(other));
   }
 
-  @Override
-  public String toString() {
-    return "Spdz2kSInt{" +
-        "share=" + share +
-        ", macShare=" + macShare +
-        '}';
-  }
-
   /**
    * Compute sum of this and constant (open) value. <p>All parties compute their mac share of the
    * public value and add it to the mac share of the authenticated value, however only party 1 adds
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
index 531a3b84f..65c5f5297 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -34,4 +34,12 @@ public byte[] serializeShareWhole() {
     return share.toByteArray();
   }
 
+  @Override
+  public String toString() {
+    return "Spdz2kSIntArithmetic{" +
+        "share=" + share +
+        ", macShare=" + macShare +
+        '}';
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 5095e7821..1775120d6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -34,4 +34,12 @@ public byte[] serializeShareWhole() {
     return share.toByteArray();
   }
 
+  @Override
+  public String toString() {
+    return "Spdz2kSIntBoolean{" +
+        "share=" + share +
+        ", macShare=" + macShare +
+        '}';
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
new file mode 100644
index 000000000..d5e25831f
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
@@ -0,0 +1,94 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
+import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
+import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestSpdz2kConversion extends
+    AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
+
+  @Test
+  public void testArithmeticToBool() {
+    runTest(new TestArithmeticToBool<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  @Override
+  protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
+      Supplier<Network> networkSupplier) {
+    CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+    Spdz2kResourcePool<CompUInt128> resourcePool =
+        new Spdz2kResourcePoolImpl<>(
+            playerId,
+            noOfParties, null,
+            new Spdz2kOpenedValueStoreImpl<>(),
+            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, factory.createRandom(), factory),
+            factory);
+    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
+    return resourcePool;
+  }
+
+  @Override
+  protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSuite() {
+    return new Spdz2kProtocolSuite128(true);
+  }
+
+  public static class TestArithmeticToBool<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> input = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO
+        );
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> inputClosed = root.numeric().knownAsDRes(input);
+                DRes<List<DRes<SInt>>> inputBool = root.conversion().toBooleanBatch(inputClosed);
+                DRes<List<DRes<SInt>>> inputArithmetic = root.conversion()
+                    .toArithmeticBatch(inputBool);
+                return root.collections().openList(inputArithmetic);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE.shiftLeft(63),
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
new file mode 100644
index 000000000..9cdc9dc68
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -0,0 +1,106 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
+import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
+import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestSpdz2kLogicalOperations extends
+    AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
+
+  @Test
+  public void testAnd() {
+    runTest(new TestAnd<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  @Override
+  protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
+      Supplier<Network> networkSupplier) {
+    CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+    Spdz2kResourcePool<CompUInt128> resourcePool =
+        new Spdz2kResourcePoolImpl<>(
+            playerId,
+            noOfParties, null,
+            new Spdz2kOpenedValueStoreImpl<>(),
+            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, factory.createRandom(), factory),
+            factory);
+    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
+    return resourcePool;
+  }
+
+  @Override
+  protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSuite() {
+    return new Spdz2kProtocolSuite128(true);
+  }
+
+  public static class TestAnd<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                DRes<List<DRes<SInt>>> rightClosed = root.numeric().knownAsDRes(right);
+                DRes<List<DRes<SInt>>> leftConverted = root.conversion().toBooleanBatch(leftClosed);
+                DRes<List<DRes<SInt>>> rightConverted = root.conversion()
+                    .toBooleanBatch(rightClosed);
+                DRes<List<DRes<SInt>>> anded = root.logical()
+                    .pairWiseAnd(leftConverted, rightConverted);
+                DRes<List<DRes<SInt>>> andedConverted = root.conversion().toArithmeticBatch(anded);
+                return root.collections().openList(andedConverted);
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.ZERO,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+
+}

From cee83b02bc9680af1b453b5b83303de19fce78f6 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 14:40:21 +0200
Subject: [PATCH 101/231] More work on conversion

---
 .../builder/numeric/DefaultLogical.java       | 18 ++++++++++++-
 .../framework/builder/numeric/Logical.java    | 12 +++++++++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  2 +-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 27 ++++++++++++++++---
 .../computations/TestSpdz2kConversion.java    | 14 +++++-----
 5 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 52817e214..6c080523d 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiFunction;
+import java.util.stream.Collectors;
 
 /**
  * Default implementation of {@link Logical}, expressing logical operations via arithmetic.
@@ -61,6 +62,21 @@ public DRes<SInt> not(DRes<SInt> secretBit) {
     });
   }
 
+  @Override
+  public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
+    return builder.numeric().openAsOInt(secretBit);
+  }
+
+  @Override
+  public DRes<List<DRes<OInt>>> openAsBits(DRes<List<DRes<SInt>>> secretBits) {
+    return builder.par(par -> {
+      List<DRes<OInt>> openList =
+          secretBits.out().stream().map(closed -> par.logical().openAsBit(closed))
+              .collect(Collectors.toList());
+      return () -> openList;
+    });
+  }
+
   private DRes<List<DRes<SInt>>> pairWise(
       DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB,
@@ -132,7 +148,7 @@ public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
       return pairWise(bitsA, bitsB, f);
     });
   }
-  
+
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<OInt>>> bits) {
     // TODO implement
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index c8fc929cf..1de3028e9 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -12,6 +12,7 @@
  * in.</p>
  */
 public interface Logical extends ComputationDirectory {
+  // TODO: this is starting to look a lot like the Binary computation directory...
 
   /**
    * Computes logical AND of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
@@ -38,6 +39,17 @@ public interface Logical extends ComputationDirectory {
    */
   DRes<SInt> not(DRes<SInt> secretBit);
 
+  /**
+   * Opens secret bits, possibly performing conversion before producing final open value. <p>NOTE:
+   * Input must represent 0 or 1 values only.</p>
+   */
+  DRes<OInt> openAsBit(DRes<SInt> secretBit);
+
+  /**
+   * Batch opening of bits.
+   */
+  DRes<List<DRes<OInt>>> openAsBits(DRes<List<DRes<SInt>>> secretBits);
+
   /**
    * Computes pairwise logical AND of input bits. <p>NOTE: Inputs must represent 0 or 1 values
    * only.</p>
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 14a6b56be..a8ee2c55a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -262,7 +262,7 @@ public RealNumericContext getRealNumericContext() {
 
   class Spdz2kLogical extends DefaultLogical {
 
-    protected Spdz2kLogical(
+    Spdz2kLogical(
         ProtocolBuilderNumeric builder) {
       super(builder);
     }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 6858666fc..97a92fc4c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -2,25 +2,44 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
+import dk.alexandra.fresco.framework.builder.numeric.Logical;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 
 /**
  * Logical operators for Spdz2k on boolean shares. <p>NOTE: requires that inputs have previously
  * been converted to boolean shares!</p>
  */
 public class Spdz2kLogicalBooleanMode<PlainT extends CompUInt<?, ?, PlainT>> extends
-    DefaultLogical {
+    DefaultLogical implements Logical {
+
+  private final CompUIntFactory<PlainT> factory;
 
   protected Spdz2kLogicalBooleanMode(
-      ProtocolBuilderNumeric builder) {
+      ProtocolBuilderNumeric builder, CompUIntFactory<PlainT> factory) {
     super(builder);
+    this.factory = factory;
   }
 
   @Override
-  public DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB) {
-    return super.and(bitA, bitB);
+  public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
+    // quite heavy machinery...
+    return builder.seq(seq -> {
+      Spdz2kSIntBoolean<PlainT> bit = factory.toSpdz2kSIntBoolean(secretBit);
+      Spdz2kSIntArithmetic<PlainT> bitArithmetic = new Spdz2kSIntArithmetic<>(
+          bit.getShare(),
+          bit.getMacShare());
+      return seq.numeric().openAsOInt(bitArithmetic);
+    }).seq((seq, opened) -> {
+      PlainT openBit = factory.fromOInt(opened);
+      PlainT res = openBit.testBit(factory.getLowBitLength() - 1) ? factory.one() : factory.zero();
+      return () -> res;
+    });
   }
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
index d5e25831f..47e35ccc6 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
@@ -9,6 +9,7 @@
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
@@ -24,7 +25,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -70,21 +70,21 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
         @Override
         public void test() {
-          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+          Application<List<DRes<OInt>>, ProtocolBuilderNumeric> app =
               root -> {
                 DRes<List<DRes<SInt>>> inputClosed = root.numeric().knownAsDRes(input);
                 DRes<List<DRes<SInt>>> inputBool = root.conversion().toBooleanBatch(inputClosed);
                 DRes<List<DRes<SInt>>> inputArithmetic = root.conversion()
                     .toArithmeticBatch(inputBool);
-                return root.collections().openList(inputArithmetic);
+                return root.logical().openAsBits(inputArithmetic);
               };
-          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
-              .collect(Collectors.toList());
+//          List<BigInteger> actual = runApplication(app).stream().map(v -> v.out().)
+//              .collect(Collectors.toList());
           List<BigInteger> expected = Arrays.asList(
-              BigInteger.ONE.shiftLeft(63),
+              BigInteger.ONE,
               BigInteger.ZERO
           );
-          Assert.assertEquals(expected, actual);
+          Assert.assertEquals(expected, null);
         }
       };
     }

From a6376923cee129329ea6d31a0f9b6bcc2c4a0507 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 14:52:49 +0200
Subject: [PATCH 102/231] Fix open values in dummy protocol suite

---
 .../DummyArithmeticBuilderFactory.java        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index 7f358bfef..91ff33477 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -75,12 +75,18 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
-        return sub(builder.getOIntFactory().toBigInteger(a.out()), b);
+        DummyArithmeticSubtractProtocol c =
+            new DummyArithmeticSubtractProtocol(
+                () -> new DummyArithmeticSInt(builder.getOIntFactory().toBigInteger(a.out())), b);
+        return builder.append(c);
       }
 
       @Override
       public DRes<SInt> subOpen(DRes<SInt> a, DRes<OInt> b) {
-        return sub(a, builder.getOIntFactory().toBigInteger(b.out()));
+        DummyArithmeticNativeProtocol<SInt> c =
+            new DummyArithmeticSubtractProtocol(a,
+                () -> new DummyArithmeticSInt(builder.getOIntFactory().toBigInteger(b.out())));
+        return builder.append(c);
       }
 
       @Override
@@ -175,7 +181,10 @@ public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
-        return mult(builder.getOIntFactory().toBigInteger(a.out()), b);
+        DummyArithmeticMultProtocol c =
+            new DummyArithmeticMultProtocol(
+                () -> new DummyArithmeticSInt(builder.getOIntFactory().toBigInteger(a.out())), b);
+        return builder.append(c);
       }
 
       @Override
@@ -221,7 +230,10 @@ public DRes<SInt> add(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
-        return add(builder.getOIntFactory().toBigInteger(a.out()), b);
+        DummyArithmeticAddProtocol c =
+            new DummyArithmeticAddProtocol(
+                () -> new DummyArithmeticSInt(builder.getOIntFactory().toBigInteger(a.out())), b);
+        return builder.append(c);
       }
 
       @Override

From 726c693bf78b09397a062e69544bd25102918a10 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Mon, 30 Apr 2018 14:54:10 +0200
Subject: [PATCH 103/231] Partial implementation of list or

---
 .../builder/numeric/DefaultLogical.java       | 72 +++++++++++++------
 .../lib/compare/eq/EqualityLogRounds.java     | 40 +++++++++++
 .../compare/zerotest/ZeroTestLogRounds.java   | 56 +++++++++++++++
 .../logical/LogicalOperationsTests.java       | 43 +++++++++++
 .../TestDummyArithmeticProtocolSuite.java     |  6 ++
 5 files changed, 197 insertions(+), 20 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 24312bd91..e116d46a8 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -141,27 +141,59 @@ public DRes<SInt> orOfKnownList(DRes<List<DRes<OInt>>> bits) {
 
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
-    // int currentSize = bits.out().size();
-    // DRes<List<DRes<SInt>>> partialRes = bits;
-    // while (currentSize > 1) {
-    // partialRes = builder.par(par -> {
-    // List<DRes<SInt>> list = new ArrayList<>();
-    // for (int i = 0; i + 1 < partialRes.out().size(); i = i + 2) {
-    // DRes<SInt> currentOr = or(partialRes.out().get(i), partialRes.out()
-    // .get(i + 1));
-    // list.add(currentOr);
-    // }
-    // if (partialRes.out().size() % 2 == 1) {
-    // list.add(partialRes.out().get(partialRes.out().size() - 1));
-    // }
-    // return () -> list;
-    // });
-    // currentSize = partialRes.out().size();
-    // }
-    // return partialRes.out().get(0);
-    return null;
+    return builder.seq(seq -> bits).whileLoop((inputs) -> inputs
+        .size() > 1,
+        (prevSeq, inputs) -> prevSeq.par(par -> {
+          int halfRoundedDown = inputs.size() / 2;
+          List<DRes<SInt>> listA = inputs.subList(0, halfRoundedDown);
+          List<DRes<SInt>> listB = inputs.subList(halfRoundedDown, 2
+              * halfRoundedDown);
+          DRes<List<DRes<SInt>>> resultList = par.logical().pairWiseOr(
+              () -> listA, () -> listB);
+          if (inputs.size() % 2 == 1) {
+            resultList.out().add(inputs.get(inputs.size() - 1));
+          }
+          return resultList;
+        })).seq((builder, currentInput) -> currentInput.get(0));
   }
 
+  //    while (currentSize > 1) {
+  //      int halfRoundedDown = currentSize / 2;
+  //        List<DRes<SInt>> listA = partialRes.out().subList(0, halfRoundedDown);
+  //        List<DRes<SInt>> listB = partialRes.out().subList(halfRoundedDown, 2
+  //            * halfRoundedDown);
+  //        DRes<List<DRes<SInt>>> resultList = pairWiseOr(() -> listA,
+  //            () -> listB);
+  //        if (partialRes.out().size() % 2 == 1) {
+  //          resultList.out().add(partialRes.out().get(partialRes.out().size()
+  //              - 1));
+  //        }
+  //      partialRes = resultList;
+  //      currentSize = partialRes.out().size();
+  //    }
+  //    return partialRes.out().get(0);
+
+
+  // int currentSize = bits.out().size();
+  // DRes<List<DRes<SInt>>> partialRes = bits;
+  // while (currentSize > 1) {
+  // partialRes = builder.par(par -> {
+  // List<DRes<SInt>> list = new ArrayList<>();
+  // for (int i = 0; i + 1 < partialRes.out().size(); i = i + 2) {
+  // DRes<SInt> currentOr = or(partialRes.out().get(i), partialRes.out()
+  // .get(i + 1));
+  // list.add(currentOr);
+  // }
+  // if (partialRes.out().size() % 2 == 1) {
+  // list.add(partialRes.out().get(partialRes.out().size() - 1));
+  // }
+  // return () -> list;
+  // });
+  // currentSize = partialRes.out().size();
+  // }
+  // return partialRes.out().get(0);
+  // return null;
+
   private DRes<List<DRes<SInt>>> partialOr(DRes<List<DRes<SInt>>> bits) {
     return builder.par(par -> {
       List<DRes<SInt>> list = new ArrayList<>();
@@ -175,4 +207,4 @@ private DRes<List<DRes<SInt>>> partialOr(DRes<List<DRes<SInt>>> bits) {
       return () -> list;
     });
   }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java
new file mode 100644
index 000000000..a54f8eac0
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java
@@ -0,0 +1,40 @@
+package dk.alexandra.fresco.lib.compare.eq;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Comparison.EqualityAlgorithm;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+
+public class EqualityLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  // params
+  private final int bitLength;
+  private final DRes<SInt> left;
+  private final DRes<SInt> right;
+
+  /**
+   * Constructs an instance of the Equality computation using a logarithmic amount of rounds.
+   *
+   * @param bitLength
+   *          The maximum bit length of the inputs.
+   * @param left
+   *          The first element to compare.
+   * @param right
+   *          The second element to compare.
+   */
+  public EqualityLogRounds(int bitLength, DRes<SInt> left,
+      DRes<SInt> right) {
+    super();
+    this.bitLength = bitLength;
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    DRes<SInt> diff = builder.numeric().sub(left, right);
+    return builder.comparison().compareZero(diff, bitLength,
+        EqualityAlgorithm.EQ_LOG_ROUNDS);
+  }
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
new file mode 100644
index 000000000..f817f77f7
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -0,0 +1,56 @@
+package dk.alexandra.fresco.lib.compare.zerotest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
+
+public class ZeroTestLogRounds implements
+    Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final int maxLength;
+  private final int securityParameter;
+  private final DRes<SInt> input;
+
+  public ZeroTestLogRounds(int maxLength, DRes<SInt> input,
+      int securityParameter) {
+    this.maxLength = maxLength;
+    this.securityParameter = securityParameter;
+    this.input = input;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    DRes<RandomBitMask> r = builder.advancedNumeric().randomBitMask(maxLength
+        + securityParameter);
+    return builder.seq(seq -> {
+      // Use the integer interpretation of r to compute c = 2^{k-1}+(left + r)
+      DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
+          .getOIntArithmetic().twoTo(maxLength - 1), seq.numeric().add(input, r
+              .out()
+              .getValue())));
+      return c;
+    }).par((par, c) -> {
+      List<DRes<SInt>> d = new ArrayList<>(maxLength);
+      DRes<OInt> two = par.getOIntArithmetic().twoTo(1);
+      List<DRes<OInt>> cbits = par.getOIntArithmetic().toBits(c.out(),
+          maxLength);
+      for (int i = 0; i < maxLength; i++) {
+        DRes<SInt> ri = r.out().getBits().out().get(i);
+        // DRes<SInt> temp = par.numeric().multByOpen(two, par.numeric().multByOpen(cbits.get(i), ri));
+        // DRes<SInt> temp2 = par.numeric().addOpen(cbits.get(i), ri);
+        DRes<SInt> di = par.numeric().sub(par.numeric().addOpen(cbits.get(i),
+            ri), par.numeric().multByOpen(two, par.numeric().multByOpen(cbits
+                .get(i), ri)));
+        d.add(di);
+      }
+      return par.numeric().subFromOpen(par.getOIntArithmetic().twoTo(0), par
+          .logical().orOfList(() -> d));
+    });
+  }
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
index f4b178e5c..dcab876ca 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
@@ -183,6 +183,49 @@ public void test() {
     }
   }
 
+  public static class TestOrList<ResourcePoolT extends ResourcePool> extends
+      TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> input1 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ZERO, BigInteger.ZERO, BigInteger.ONE);
+        private final List<BigInteger> input2 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ZERO, BigInteger.ZERO, BigInteger.ZERO);
+        private final List<BigInteger> input3 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ONE, BigInteger.ZERO, BigInteger.ZERO);
+        private final List<BigInteger> input4 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ONE, BigInteger.ZERO, BigInteger.ONE);
+
+        @Override
+        public void test() {
+          List<List<BigInteger>> inputLists = Arrays.asList(input1, input2,
+              input3, input4);
+          List<BigInteger> expectedOutput = Arrays.asList(BigInteger.ONE,
+              BigInteger.ZERO, BigInteger.ONE, BigInteger.ONE);
+
+          Application<BigInteger, ProtocolBuilderNumeric> app = root -> {
+            DRes<List<DRes<SInt>>> input1Closed = root.numeric().knownAsDRes(
+                input1);
+            DRes<List<DRes<SInt>>> input2Closed = root.numeric().knownAsDRes(
+                input2);
+            DRes<List<DRes<SInt>>> input3Closed = root.numeric().knownAsDRes(
+                input3);
+            DRes<List<DRes<SInt>>> input4Closed = root.numeric().knownAsDRes(
+                input4);
+            List<DRes<SInt>> ored = root.logical().orOfList(inputClosed);
+            return root.numeric().open(ored);
+          };
+          BigInteger actual = runApplication(app);
+          BigInteger expected = BigInteger.ONE;
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
   public static class TestNot<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index cbb94876d..417b9e1dc 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -46,6 +46,7 @@
 import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAndKnown;
 import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestNot;
 import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestOr;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestOrList;
 import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestXorKnown;
 import dk.alexandra.fresco.lib.math.integer.min.MinTests;
 import dk.alexandra.fresco.lib.math.integer.mod.Mod2mTests.TestMod2mBaseCase;
@@ -799,6 +800,11 @@ public void testOr() {
     runTest(new TestOr<>(), new TestParameters());
   }
 
+  @Test
+  public void testOrList() {
+    runTest(new TestOrList<>(), new TestParameters());
+  }
+
   @Test
   public void testNot() {
     runTest(new TestNot<>(), new TestParameters());

From 74fa590bad7a4dd4a9acd209d2184ad8aecce1e5 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 15:09:54 +0200
Subject: [PATCH 104/231] Open as bit

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java       |  2 +-
 .../suite/spdz2k/Spdz2kLogicalBooleanMode.java   |  3 +--
 .../computations/TestSpdz2kConversion.java       | 16 ++++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index a8ee2c55a..7a916910e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -65,7 +65,7 @@ public Comparison createComparison(ProtocolBuilderNumeric builder) {
   @Override
   public Logical createLogical(ProtocolBuilderNumeric builder) {
     if (useBooleanMode) {
-      return new Spdz2kLogicalBooleanMode(builder);
+      return new Spdz2kLogicalBooleanMode<>(builder, factory);
     } else {
       return new Spdz2kLogical(builder);
     }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 97a92fc4c..34b3ca2c2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -37,8 +37,7 @@ public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
       return seq.numeric().openAsOInt(bitArithmetic);
     }).seq((seq, opened) -> {
       PlainT openBit = factory.fromOInt(opened);
-      PlainT res = openBit.testBit(factory.getLowBitLength() - 1) ? factory.one() : factory.zero();
-      return () -> res;
+      return openBit.testBit(factory.getLowBitLength() - 1) ? factory.one() : factory.zero();
     });
   }
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
index 47e35ccc6..bdcd19720 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
@@ -10,6 +10,7 @@
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
 import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
@@ -25,6 +26,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -63,6 +65,8 @@ public static class TestArithmeticToBool<ResourcePoolT extends ResourcePool>
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        private OIntFactory factory;
         private final List<BigInteger> input = Arrays.asList(
             BigInteger.ONE,
             BigInteger.ZERO
@@ -72,19 +76,19 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<List<DRes<OInt>>, ProtocolBuilderNumeric> app =
               root -> {
+                factory = root.getOIntFactory();
                 DRes<List<DRes<SInt>>> inputClosed = root.numeric().knownAsDRes(input);
                 DRes<List<DRes<SInt>>> inputBool = root.conversion().toBooleanBatch(inputClosed);
-                DRes<List<DRes<SInt>>> inputArithmetic = root.conversion()
-                    .toArithmeticBatch(inputBool);
-                return root.logical().openAsBits(inputArithmetic);
+                return root.logical().openAsBits(inputBool);
               };
-//          List<BigInteger> actual = runApplication(app).stream().map(v -> v.out().)
-//              .collect(Collectors.toList());
+          List<BigInteger> actual = runApplication(app).stream()
+              .map(v -> factory.toBigInteger(v.out()))
+              .collect(Collectors.toList());
           List<BigInteger> expected = Arrays.asList(
               BigInteger.ONE,
               BigInteger.ZERO
           );
-          Assert.assertEquals(expected, null);
+          Assert.assertEquals(expected, actual);
         }
       };
     }

From 9aa49dff6baea2ebfb9611d507d256898bf3fb82 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 16:46:21 +0200
Subject: [PATCH 105/231] WIP and protocol

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |   8 +-
 .../suite/spdz2k/datatypes/Spdz2kSInt.java    |  78 +++++++-------
 .../datatypes/Spdz2kSIntArithmetic.java       |  40 +++++++
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   |  44 ++++++++
 .../suite/spdz2k/datatypes/Spdz2kTriple.java  |  17 ++-
 .../protocols/natives/Spdz2kAndProtocol.java  | 101 ++++++++++++++++++
 .../natives/Spdz2kMultiplyProtocol.java       |   4 +-
 .../resource/storage/Spdz2kDataSupplier.java  |  12 ++-
 .../storage/Spdz2kDummyDataSupplier.java      |  20 +++-
 ...Int.java => TestSpdz2kSIntArithmetic.java} |   4 +-
 .../computations/TestSpdz2kConversion.java    |  13 ++-
 .../TestSpdz2kLogicalOperations.java          |  13 ++-
 .../storage/TestSpdz2kDummyDataSupplier.java  |  14 +--
 13 files changed, 287 insertions(+), 81 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/{TestSpdz2kSInt.java => TestSpdz2kSIntArithmetic.java} (72%)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 7a916910e..f03f4f6d5 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -204,13 +204,7 @@ public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
 
       @Override
       public DRes<SInt> toArithmetic(DRes<SInt> booleanValue) {
-        return () -> {
-          Spdz2kSIntBoolean<PlainT> value = factory.toSpdz2kSIntBoolean(booleanValue);
-          return new Spdz2kSIntArithmetic<>(
-              value.getShare(),
-              value.getMacShare()
-          );
-        };
+        throw new UnsupportedOperationException();
       }
 
       @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
index 8c6911b3b..4fb9022a0 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
@@ -12,45 +12,45 @@ public Spdz2kSInt(PlainT macShare, PlainT share) {
     this.share = share;
   }
 
-  /**
-   * Compute sum of this and other.
-   */
-  public Spdz2kSIntArithmetic<PlainT> add(Spdz2kSIntArithmetic<PlainT> other) {
-    return new Spdz2kSIntArithmetic<>(share.add(other.share), macShare.add(other.macShare));
-  }
-
-  /**
-   * Compute difference of this and other.
-   */
-  public Spdz2kSIntArithmetic<PlainT> subtract(Spdz2kSIntArithmetic<PlainT> other) {
-    return new Spdz2kSIntArithmetic<>(share.subtract(other.share),
-        macShare.subtract(other.macShare));
-  }
-
-  /**
-   * Compute product of this and constant (open) value.
-   */
-  public Spdz2kSIntArithmetic<PlainT> multiply(PlainT other) {
-    return new Spdz2kSIntArithmetic<>(share.multiply(other), macShare.multiply(other));
-  }
-
-  /**
-   * Compute sum of this and constant (open) value. <p>All parties compute their mac share of the
-   * public value and add it to the mac share of the authenticated value, however only party 1 adds
-   * the public value to is value share.</p>
-   *
-   * @param other constant, open value
-   * @param macKeyShare mac key share for maccing open value
-   * @param zero zero value
-   * @param isPartyOne used to ensure that only one party adds value to share
-   * @return result of sum
-   */
-  public Spdz2kSIntArithmetic<PlainT> addConstant(
-      PlainT other, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-    Spdz2kSIntArithmetic<PlainT> wrapped = new Spdz2kSIntArithmetic<>(other, macKeyShare, zero,
-        isPartyOne);
-    return add(wrapped);
-  }
+//  /**
+//   * Compute sum of this and other.
+//   */
+//  public Spdz2kSIntArithmetic<PlainT> add(Spdz2kSIntArithmetic<PlainT> other) {
+//    return new Spdz2kSIntArithmetic<>(share.add(other.share), macShare.add(other.macShare));
+//  }
+//
+//  /**
+//   * Compute difference of this and other.
+//   */
+//  public Spdz2kSIntArithmetic<PlainT> subtract(Spdz2kSIntArithmetic<PlainT> other) {
+//    return new Spdz2kSIntArithmetic<>(share.subtract(other.share),
+//        macShare.subtract(other.macShare));
+//  }
+//
+//  /**
+//   * Compute product of this and constant (open) value.
+//   */
+//  public Spdz2kSIntArithmetic<PlainT> multiply(PlainT other) {
+//    return new Spdz2kSIntArithmetic<>(share.multiply(other), macShare.multiply(other));
+//  }
+//
+//  /**
+//   * Compute sum of this and constant (open) value. <p>All parties compute their mac share of the
+//   * public value and add it to the mac share of the authenticated value, however only party 1 adds
+//   * the public value to is value share.</p>
+//   *
+//   * @param other constant, open value
+//   * @param macKeyShare mac key share for maccing open value
+//   * @param zero zero value
+//   * @param isPartyOne used to ensure that only one party adds value to share
+//   * @return result of sum
+//   */
+//  public Spdz2kSIntArithmetic<PlainT> addConstant(
+//      PlainT other, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
+//    Spdz2kSIntArithmetic<PlainT> wrapped = new Spdz2kSIntArithmetic<>(other, macKeyShare, zero,
+//        isPartyOne);
+//    return add(wrapped);
+//  }
 
   /**
    * Return share.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
index 65c5f5297..df7534dfc 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -24,6 +24,46 @@ public Spdz2kSIntArithmetic(PlainT share, PlainT macKeyShare, PlainT zero, boole
     this(isPartyOne ? share : zero, share.multiply(macKeyShare));
   }
 
+  /**
+   * Compute sum of this and other.
+   */
+  public Spdz2kSIntArithmetic<PlainT> add(Spdz2kSIntArithmetic<PlainT> other) {
+    return new Spdz2kSIntArithmetic<>(share.add(other.share), macShare.add(other.macShare));
+  }
+
+  /**
+   * Compute difference of this and other.
+   */
+  public Spdz2kSIntArithmetic<PlainT> subtract(Spdz2kSIntArithmetic<PlainT> other) {
+    return new Spdz2kSIntArithmetic<>(share.subtract(other.share),
+        macShare.subtract(other.macShare));
+  }
+
+  /**
+   * Compute product of this and constant (open) value.
+   */
+  public Spdz2kSIntArithmetic<PlainT> multiply(PlainT other) {
+    return new Spdz2kSIntArithmetic<>(share.multiply(other), macShare.multiply(other));
+  }
+
+  /**
+   * Compute sum of this and constant (open) value. <p>All parties compute their mac share of the
+   * public value and add it to the mac share of the authenticated value, however only party 1 adds
+   * the public value to is value share.</p>
+   *
+   * @param other constant, open value
+   * @param macKeyShare mac key share for maccing open value
+   * @param zero zero value
+   * @param isPartyOne used to ensure that only one party adds value to share
+   * @return result of sum
+   */
+  public Spdz2kSIntArithmetic<PlainT> addConstant(
+      PlainT other, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
+    Spdz2kSIntArithmetic<PlainT> wrapped = new Spdz2kSIntArithmetic<>(other, macKeyShare, zero,
+        isPartyOne);
+    return add(wrapped);
+  }
+
   @Override
   public byte[] serializeShareLow() {
     return share.getLeastSignificant().toByteArray();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 1775120d6..c518376f8 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -24,6 +24,50 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean
     this(isPartyOne ? share : zero, share.multiply(macKeyShare));
   }
 
+  /**
+   * Compute sum of this and other.
+   */
+  public Spdz2kSIntBoolean<PlainT> add(Spdz2kSIntBoolean<PlainT> other) {
+    return new Spdz2kSIntBoolean<>(share.add(other.share), macShare.add(other.macShare));
+  }
+
+  /**
+   * Compute difference of this and other.
+   */
+  public Spdz2kSIntBoolean<PlainT> subtract(Spdz2kSIntBoolean<PlainT> other) {
+    return new Spdz2kSIntBoolean<>(share.subtract(other.share),
+        macShare.subtract(other.macShare));
+  }
+
+  /**
+   * Compute product of this and constant (open) value.
+   */
+  public Spdz2kSIntBoolean<PlainT> multiply(PlainT other) {
+    return new Spdz2kSIntBoolean<>(share.multiply(other), macShare.multiply(other));
+  }
+
+  /**
+   * Compute sum of this and constant (open) value. <p>All parties compute their mac share of the
+   * public value and add it to the mac share of the authenticated value, however only party 1 adds
+   * the public value to is value share.</p>
+   *
+   * @param other constant, open value
+   * @param macKeyShare mac key share for maccing open value
+   * @param zero zero value
+   * @param isPartyOne used to ensure that only one party adds value to share
+   * @return result of sum
+   */
+  public Spdz2kSIntBoolean<PlainT> addConstant(
+      PlainT other, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
+    Spdz2kSIntBoolean<PlainT> wrapped = new Spdz2kSIntBoolean<>(other, macKeyShare, zero,
+        isPartyOne);
+    return add(wrapped);
+  }
+
+  public Spdz2kSIntArithmetic<PlainT> asArithmetic() {
+    return new Spdz2kSIntArithmetic<>(share, macShare);
+  }
+
   @Override
   public byte[] serializeShareLow() {
     return share.getLeastSignificant().toByteArray();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
index e77a5291e..68f3638d3 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
@@ -1,27 +1,26 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
-public class Spdz2kTriple<PlainT extends CompUInt<?, ?, PlainT>> {
+public class Spdz2kTriple<PlainT extends CompUInt<?, ?, PlainT>, SIntT extends Spdz2kSInt<PlainT>> {
 
-  private final Spdz2kSIntArithmetic<PlainT> left;
-  private final Spdz2kSIntArithmetic<PlainT> right;
-  private final Spdz2kSIntArithmetic<PlainT> product;
+  private final SIntT left;
+  private final SIntT right;
+  private final SIntT product;
 
-  public Spdz2kTriple(Spdz2kSIntArithmetic<PlainT> left, Spdz2kSIntArithmetic<PlainT> right,
-      Spdz2kSIntArithmetic<PlainT> product) {
+  public Spdz2kTriple(SIntT left, SIntT right, SIntT product) {
     this.left = left;
     this.right = right;
     this.product = product;
   }
 
-  public Spdz2kSIntArithmetic<PlainT> getLeft() {
+  public SIntT getLeft() {
     return left;
   }
 
-  public Spdz2kSIntArithmetic<PlainT> getRight() {
+  public SIntT getRight() {
     return right;
   }
 
-  public Spdz2kSIntArithmetic<PlainT> getProduct() {
+  public SIntT getProduct() {
     return product;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
new file mode 100644
index 000000000..16397823a
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
@@ -0,0 +1,101 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.Arrays;
+
+/**
+ * Native protocol for computing logical AND of two values in boolean form.
+ */
+public class Spdz2kAndProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<SInt> left;
+  private final DRes<SInt> right;
+  private Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple;
+  private Spdz2kSIntBoolean<PlainT> epsilon;
+  private Spdz2kSIntBoolean<PlainT> delta;
+  private SInt product;
+
+  /**
+   * Creates new {@link dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultiplyProtocol}.
+   *
+   * @param left left factor
+   * @param right right factor
+   */
+  public Spdz2kAndProtocol(DRes<SInt> left, DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    final PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    if (round == 0) {
+      triple = resourcePool.getDataSupplier().getNextBitTripleShares();
+      epsilon = factory.toSpdz2kSIntBoolean(left).subtract(triple.getLeft());
+      delta = factory.toSpdz2kSIntBoolean(right).subtract(triple.getRight());
+      network.sendToAll(epsilon.serializeShareLow());
+      network.sendToAll(delta.serializeShareLow());
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
+          factory,
+          resourcePool.getNoOfParties(),
+          serializer);
+      // compute [prod] = [c] + epsilon * [b] + delta * [a] + epsilon * delta
+      PlainT e = epsilonAndDelta.getFirst();
+      PlainT d = epsilonAndDelta.getSecond();
+      PlainT ed = e.multiply(d);
+      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+      Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+      Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+      this.product = tripleProduct
+          .add(tripleRight.multiply(e))
+          .add(tripleLeft.multiply(d))
+          .addConstant(ed,
+              macKeyShare,
+              factory.zero(),
+              resourcePool.getMyId() == 1);
+      resourcePool.getOpenedValueStore().pushOpenedValues(
+          Arrays.asList(
+              epsilon.asArithmetic(),
+              delta.asArithmetic()
+          ),
+          Arrays.asList(e, d)
+      );
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  /**
+   * Retrieves shares for epsilon and delta and reconstructs each.
+   */
+  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
+      CompUIntFactory<PlainT> factory, int noOfParties,
+      ByteSerializer<PlainT> serializer) {
+    PlainT e = factory.zero();
+    PlainT d = factory.zero();
+    for (int i = 1; i <= noOfParties; i++) {
+      e = e.add(serializer.deserialize(network.receive(i)));
+      d = d.add(serializer.deserialize(network.receive(i)));
+    }
+    return new Pair<>(e, d);
+  }
+
+  @Override
+  public SInt out() {
+    return product;
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
index 62425e2df..348fe5bb2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultiplyProtocol.java
@@ -20,7 +20,7 @@ public class Spdz2kMultiplyProtocol<PlainT extends CompUInt<?, ?, PlainT>> exten
 
   private final DRes<SInt> left;
   private final DRes<SInt> right;
-  private Spdz2kTriple<PlainT> triple;
+  private Spdz2kTriple<PlainT, Spdz2kSIntArithmetic<PlainT>> triple;
   private Spdz2kSIntArithmetic<PlainT> epsilon;
   private Spdz2kSIntArithmetic<PlainT> delta;
   private SInt product;
@@ -43,7 +43,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
-      triple = resourcePool.getDataSupplier().getNextTripleShares();
+      triple = resourcePool.getDataSupplier().getNextTripleSharesFull();
       epsilon = factory.toSpdz2kSIntArithmetic(left).subtract(triple.getLeft());
       delta = factory.toSpdz2kSIntArithmetic(right).subtract(triple.getRight());
       network.sendToAll(epsilon.serializeShareLow());
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
index 90bbf623a..da9698c88 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 
 /**
@@ -12,11 +13,18 @@
 public interface Spdz2kDataSupplier<T extends CompUInt<?, ?, T>> {
 
   /**
-   * Supplies the next triple.
+   * Supplies the next full multiplication triple.
    *
    * @return the next new triple
    */
-  Spdz2kTriple<T> getNextTripleShares();
+  Spdz2kTriple<T, Spdz2kSIntArithmetic<T>> getNextTripleSharesFull();
+
+  /**
+   * Supplies the next boolean multiplication triple.
+   *
+   * @return the next new triple
+   */
+  Spdz2kTriple<T, Spdz2kSIntBoolean<T>> getNextBitTripleShares();
 
   /**
    * Supplies the next inputmask for a given input player.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index 5453e4f9c..679daa037 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -7,6 +7,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 import java.math.BigInteger;
 
@@ -33,7 +34,7 @@ public Spdz2kDummyDataSupplier(int myId, int noOfParties, PlainT secretSharedKey
   }
 
   @Override
-  public Spdz2kTriple<PlainT> getNextTripleShares() {
+  public Spdz2kTriple<PlainT, Spdz2kSIntArithmetic<PlainT>> getNextTripleSharesFull() {
     MultiplicationTripleShares rawTriple = supplier.getMultiplicationTripleShares();
     return new Spdz2kTriple<>(
         toSpdz2kSInt(rawTriple.getLeft()),
@@ -41,6 +42,15 @@ public Spdz2kTriple<PlainT> getNextTripleShares() {
         toSpdz2kSInt(rawTriple.getProduct()));
   }
 
+  @Override
+  public Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> getNextBitTripleShares() {
+    MultiplicationTripleShares rawTriple = supplier.getMultiplicationTripleShares();
+    return new Spdz2kTriple<>(
+        toSpdz2kSIntBool(rawTriple.getLeft()),
+        toSpdz2kSIntBool(rawTriple.getRight()),
+        toSpdz2kSIntBool(rawTriple.getProduct()));
+  }
+
   @Override
   public Spdz2kInputMask<PlainT> getNextInputMask(int towardPlayerId) {
     Pair<BigInteger, BigInteger> raw = supplier.getRandomElementShare();
@@ -74,4 +84,12 @@ private Spdz2kSIntArithmetic<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> r
     return new Spdz2kSIntArithmetic<>(share, macShare);
   }
 
+  private Spdz2kSIntBoolean<PlainT> toSpdz2kSIntBool(Pair<BigInteger, BigInteger> raw) {
+    int n = factory.getLowBitLength() - 1;
+    PlainT openValue = factory.createFromBigInteger(raw.getFirst().shiftLeft(n));
+    PlainT share = factory.createFromBigInteger(raw.getSecond().shiftLeft(n));
+    PlainT macShare = openValue.multiply(secretSharedKey);
+    return new Spdz2kSIntBoolean<>(share, macShare);
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSInt.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntArithmetic.java
similarity index 72%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSInt.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntArithmetic.java
index fa3c7a02c..6ad9f19c1 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSInt.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntArithmetic.java
@@ -4,13 +4,13 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class TestSpdz2kSInt {
+public class TestSpdz2kSIntArithmetic {
   @Test
   public void testToString() {
     Spdz2kSIntArithmetic<CompUInt128> sint = new Spdz2kSIntArithmetic<>(
         new CompUInt128(BigInteger.ONE),
         new CompUInt128(BigInteger.ONE)
     );
-    Assert.assertEquals("Spdz2kSInt{share=1, macShare=1}", sint.toString());
+    Assert.assertEquals("Spdz2kSIntArithmetic{share=1, macShare=1}", sint.toString());
   }
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
index bdcd19720..c1621c6e1 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
@@ -66,7 +66,6 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
 
-        private OIntFactory factory;
         private final List<BigInteger> input = Arrays.asList(
             BigInteger.ONE,
             BigInteger.ZERO
@@ -74,16 +73,16 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
         @Override
         public void test() {
-          Application<List<DRes<OInt>>, ProtocolBuilderNumeric> app =
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
               root -> {
-                factory = root.getOIntFactory();
+                OIntFactory factory = root.getOIntFactory();
                 DRes<List<DRes<SInt>>> inputClosed = root.numeric().knownAsDRes(input);
                 DRes<List<DRes<SInt>>> inputBool = root.conversion().toBooleanBatch(inputClosed);
-                return root.logical().openAsBits(inputBool);
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(inputBool);
+                return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
               };
-          List<BigInteger> actual = runApplication(app).stream()
-              .map(v -> factory.toBigInteger(v.out()))
-              .collect(Collectors.toList());
+          List<BigInteger> actual = runApplication(app);
           List<BigInteger> expected = Arrays.asList(
               BigInteger.ONE,
               BigInteger.ZERO
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 9cdc9dc68..48678efb6 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -9,6 +9,8 @@
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
@@ -76,7 +78,7 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
         @Override
         public void test() {
-          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
               root -> {
                 DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
                 DRes<List<DRes<SInt>>> rightClosed = root.numeric().knownAsDRes(right);
@@ -85,11 +87,12 @@ public void test() {
                     .toBooleanBatch(rightClosed);
                 DRes<List<DRes<SInt>>> anded = root.logical()
                     .pairWiseAnd(leftConverted, rightConverted);
-                DRes<List<DRes<SInt>>> andedConverted = root.conversion().toArithmeticBatch(anded);
-                return root.collections().openList(andedConverted);
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
+                OIntFactory factory = root.getOIntFactory();
+                return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
               };
-          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
-              .collect(Collectors.toList());
+          List<BigInteger> actual = runApplication(app);
           List<BigInteger> expected = Arrays.asList(
               BigInteger.ONE,
               BigInteger.ZERO,
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
index 01c9dffc4..c8a1c6c1b 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
@@ -72,11 +72,11 @@ private void testGetInputMask(int noOfParties, int towardParty) {
   private void testGetNextTripleShares(int noOfParties) {
     List<Spdz2kDataSupplier<CompUInt128>> suppliers = setupSuppliers(noOfParties);
     CompUInt128 macKey = getMacKeyFromSuppliers(suppliers);
-    List<Spdz2kTriple<CompUInt128>> triples = new ArrayList<>(noOfParties);
+    List<Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>>> triples = new ArrayList<>(noOfParties);
     for (Spdz2kDataSupplier<CompUInt128> supplier : suppliers) {
-      triples.add(supplier.getNextTripleShares());
+      triples.add(supplier.getNextTripleSharesFull());
     }
-    Spdz2kTriple<CompUInt128> recombined = recombineTriples(triples);
+    Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>> recombined = recombineTriples(triples);
     assertTripleValid(recombined, macKey);
   }
 
@@ -144,12 +144,12 @@ private CompUInt128 getMacKeyFromSuppliers(
         .reduce(CompUInt128::add).get();
   }
 
-  private Spdz2kTriple<CompUInt128> recombineTriples(
-      List<Spdz2kTriple<CompUInt128>> triples) {
+  private Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>> recombineTriples(
+      List<Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>>> triples) {
     List<Spdz2kSIntArithmetic<CompUInt128>> left = new ArrayList<>(triples.size());
     List<Spdz2kSIntArithmetic<CompUInt128>> right = new ArrayList<>(triples.size());
     List<Spdz2kSIntArithmetic<CompUInt128>> product = new ArrayList<>(triples.size());
-    for (Spdz2kTriple<CompUInt128> triple : triples) {
+    for (Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>> triple : triples) {
       left.add(triple.getLeft());
       right.add(triple.getRight());
       product.add(triple.getProduct());
@@ -157,7 +157,7 @@ private Spdz2kTriple<CompUInt128> recombineTriples(
     return new Spdz2kTriple<>(recombine(left), recombine(right), recombine(product));
   }
 
-  private void assertTripleValid(Spdz2kTriple<CompUInt128> recombined, CompUInt128 macKey) {
+  private void assertTripleValid(Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>> recombined, CompUInt128 macKey) {
     assertMacCorrect(recombined.getLeft(), macKey);
     assertMacCorrect(recombined.getRight(), macKey);
     assertMacCorrect(recombined.getRight(), macKey);

From c5a2a6cda6f524c8bb2dd30e0535c953190e2b00 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 18:23:29 +0200
Subject: [PATCH 106/231] Broken and protocol

---
 .../util/ArithmeticDummyDataSupplier.java     | 11 +++++
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 12 ++---
 .../suite/spdz2k/datatypes/CompUInt.java      | 21 +++++++++
 .../suite/spdz2k/datatypes/CompUInt128.java   | 15 +++++++
 .../suite/spdz2k/datatypes/Spdz2kSInt.java    | 44 +------------------
 .../datatypes/Spdz2kSIntArithmetic.java       |  2 +-
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   | 12 ++---
 .../protocols/natives/Spdz2kAndProtocol.java  |  8 ++--
 .../storage/Spdz2kDummyDataSupplier.java      |  6 ++-
 .../TestSpdz2kLogicalOperations.java          | 18 ++++++--
 10 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
index 30c0a2bd9..94eaee2f7 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
@@ -60,6 +60,17 @@ public MultiplicationTripleShares getMultiplicationTripleShares() {
     );
   }
 
+  public MultiplicationTripleShares getMultiplicationBitTripleShares() {
+    BigInteger left = getNextBit();
+    BigInteger right = getNextBit();
+    BigInteger product = left.multiply(right).mod(BigInteger.valueOf(2));
+    return new MultiplicationTripleShares(
+        new Pair<>(left, sharer.share(left, noOfParties).get(myId - 1)),
+        new Pair<>(right, sharer.share(right, noOfParties).get(myId - 1)),
+        new Pair<>(product, sharer.share(product, noOfParties).get(myId - 1))
+    );
+  }
+
   /**
    * Constructs an exponentiation pipe. <p>An exponentiation pipe is a list of numbers in the
    * following format: r^{-1}, r, r^{2}, r^{3}, ..., r^{expPipeLength}, where r is a random element
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 34b3ca2c2..ca2fbb3f6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -8,8 +8,8 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
 
 /**
  * Logical operators for Spdz2k on boolean shares. <p>NOTE: requires that inputs have previously
@@ -26,15 +26,17 @@ protected Spdz2kLogicalBooleanMode(
     this.factory = factory;
   }
 
+  @Override
+  public DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB) {
+    return builder.append(new Spdz2kAndProtocol<>(bitA, bitB));
+  }
+
   @Override
   public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
     return builder.seq(seq -> {
       Spdz2kSIntBoolean<PlainT> bit = factory.toSpdz2kSIntBoolean(secretBit);
-      Spdz2kSIntArithmetic<PlainT> bitArithmetic = new Spdz2kSIntArithmetic<>(
-          bit.getShare(),
-          bit.getMacShare());
-      return seq.numeric().openAsOInt(bitArithmetic);
+      return seq.numeric().openAsOInt(bit.asArithmetic());
     }).seq((seq, opened) -> {
       PlainT openBit = factory.fromOInt(opened);
       return openBit.testBit(factory.getLowBitLength() - 1) ? factory.one() : factory.zero();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index e4b4aea09..d02b935e8 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -49,6 +49,27 @@ public interface CompUInt<
    */
   CompT clearHighBits();
 
+  /**
+   * Bit-wise AND of this and other.
+   */
+  default CompT and(CompT other) {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * Bit-wise XOR of this and other.
+   */
+  default CompT xor(CompT other) {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * Bit-wise NOT of this.
+   */
+  default CompT not() {
+    throw new UnsupportedOperationException();
+  }
+
   /**
    * Get length of least significant bit segment, i.e., k.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 6f69b3100..dfa1beb1d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -123,6 +123,21 @@ public CompUInt128 multiply(CompUInt128 other) {
     return new CompUInt128(newHigh, (int) newMid, (int) t1);
   }
 
+  @Override
+  public CompUInt128 and(CompUInt128 other) {
+    return new CompUInt128(high & other.high, mid & other.mid, low & other.low);
+  }
+
+  @Override
+  public CompUInt128 xor(CompUInt128 other) {
+    return new CompUInt128(high ^ other.high, mid ^ other.mid, low ^ other.low);
+  }
+
+  @Override
+  public CompUInt128 not() {
+    return new CompUInt128(~high, ~mid, ~low);
+  }
+
   @Override
   public CompUInt128 subtract(CompUInt128 other) {
     return this.add(other.negate());
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
index 4fb9022a0..037d0be3b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
@@ -7,51 +7,11 @@ public abstract class Spdz2kSInt<PlainT extends CompUInt<?, ?, PlainT>> implemen
   protected final PlainT share;
   protected final PlainT macShare;
 
-  public Spdz2kSInt(PlainT macShare, PlainT share) {
-    this.macShare = macShare;
+  public Spdz2kSInt(PlainT share, PlainT macShare) {
     this.share = share;
+    this.macShare = macShare;
   }
 
-//  /**
-//   * Compute sum of this and other.
-//   */
-//  public Spdz2kSIntArithmetic<PlainT> add(Spdz2kSIntArithmetic<PlainT> other) {
-//    return new Spdz2kSIntArithmetic<>(share.add(other.share), macShare.add(other.macShare));
-//  }
-//
-//  /**
-//   * Compute difference of this and other.
-//   */
-//  public Spdz2kSIntArithmetic<PlainT> subtract(Spdz2kSIntArithmetic<PlainT> other) {
-//    return new Spdz2kSIntArithmetic<>(share.subtract(other.share),
-//        macShare.subtract(other.macShare));
-//  }
-//
-//  /**
-//   * Compute product of this and constant (open) value.
-//   */
-//  public Spdz2kSIntArithmetic<PlainT> multiply(PlainT other) {
-//    return new Spdz2kSIntArithmetic<>(share.multiply(other), macShare.multiply(other));
-//  }
-//
-//  /**
-//   * Compute sum of this and constant (open) value. <p>All parties compute their mac share of the
-//   * public value and add it to the mac share of the authenticated value, however only party 1 adds
-//   * the public value to is value share.</p>
-//   *
-//   * @param other constant, open value
-//   * @param macKeyShare mac key share for maccing open value
-//   * @param zero zero value
-//   * @param isPartyOne used to ensure that only one party adds value to share
-//   * @return result of sum
-//   */
-//  public Spdz2kSIntArithmetic<PlainT> addConstant(
-//      PlainT other, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-//    Spdz2kSIntArithmetic<PlainT> wrapped = new Spdz2kSIntArithmetic<>(other, macKeyShare, zero,
-//        isPartyOne);
-//    return add(wrapped);
-//  }
-
   /**
    * Return share.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
index df7534dfc..6817615e3 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -12,7 +12,7 @@ public class Spdz2kSIntArithmetic<PlainT extends CompUInt<?, ?, PlainT>> extends
    * Creates a {@link Spdz2kSIntArithmetic}.
    */
   public Spdz2kSIntArithmetic(PlainT share, PlainT macShare) {
-    super(macShare, share);
+    super(share, macShare);
   }
 
   /**
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index c518376f8..41dfa5a76 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -12,7 +12,7 @@ public class Spdz2kSIntBoolean<PlainT extends CompUInt<?, ?, PlainT>> extends
    * Creates a {@link Spdz2kSIntBoolean}.
    */
   public Spdz2kSIntBoolean(PlainT share, PlainT macShare) {
-    super(macShare, share);
+    super(share, macShare);
   }
 
   /**
@@ -21,29 +21,29 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macShare) {
    * others store 0.</p>
    */
   public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-    this(isPartyOne ? share : zero, share.multiply(macKeyShare));
+    this(isPartyOne ? share : zero, share.and(macKeyShare));
   }
 
   /**
    * Compute sum of this and other.
    */
   public Spdz2kSIntBoolean<PlainT> add(Spdz2kSIntBoolean<PlainT> other) {
-    return new Spdz2kSIntBoolean<>(share.add(other.share), macShare.add(other.macShare));
+    return new Spdz2kSIntBoolean<>(share.xor(other.share), macShare.xor(other.macShare));
   }
 
   /**
    * Compute difference of this and other.
    */
   public Spdz2kSIntBoolean<PlainT> subtract(Spdz2kSIntBoolean<PlainT> other) {
-    return new Spdz2kSIntBoolean<>(share.subtract(other.share),
-        macShare.subtract(other.macShare));
+    return new Spdz2kSIntBoolean<>(share.xor(other.share.not()),
+        macShare.xor(other.macShare.not()));
   }
 
   /**
    * Compute product of this and constant (open) value.
    */
   public Spdz2kSIntBoolean<PlainT> multiply(PlainT other) {
-    return new Spdz2kSIntBoolean<>(share.multiply(other), macShare.multiply(other));
+    return new Spdz2kSIntBoolean<>(share.and(other), macShare.and(other));
   }
 
   /**
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
index 16397823a..f9f65da79 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
@@ -57,7 +57,8 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       // compute [prod] = [c] + epsilon * [b] + delta * [a] + epsilon * delta
       PlainT e = epsilonAndDelta.getFirst();
       PlainT d = epsilonAndDelta.getSecond();
-      PlainT ed = e.multiply(d);
+      PlainT ed = e.and(d);
+      System.out.println("ed " + ed);
       Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
       Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
       Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
@@ -88,9 +89,10 @@ private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
     PlainT e = factory.zero();
     PlainT d = factory.zero();
     for (int i = 1; i <= noOfParties; i++) {
-      e = e.add(serializer.deserialize(network.receive(i)));
-      d = d.add(serializer.deserialize(network.receive(i)));
+      e = e.xor(serializer.deserialize(network.receive(i)));
+      d = d.xor(serializer.deserialize(network.receive(i)));
     }
+    System.out.println("e " + e + " d " + d);
     return new Pair<>(e, d);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index 679daa037..afa728fb7 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -44,7 +44,11 @@ public Spdz2kTriple<PlainT, Spdz2kSIntArithmetic<PlainT>> getNextTripleSharesFul
 
   @Override
   public Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> getNextBitTripleShares() {
-    MultiplicationTripleShares rawTriple = supplier.getMultiplicationTripleShares();
+    MultiplicationTripleShares rawTriple = supplier.getMultiplicationBitTripleShares();
+    if (myId == 1) {
+      System.out.println(rawTriple.getProduct().getFirst());
+    }
+
     return new Spdz2kTriple<>(
         toSpdz2kSIntBool(rawTriple.getLeft()),
         toSpdz2kSIntBool(rawTriple.getRight()),
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 48678efb6..ec7319d21 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -35,7 +35,7 @@ public class TestSpdz2kLogicalOperations extends
 
   @Test
   public void testAnd() {
-    runTest(new TestAnd<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
   @Override
@@ -58,7 +58,7 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128(true);
   }
 
-  public static class TestAnd<ResourcePoolT extends ResourcePool>
+  public static class TestAndSpdz2k<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
     @Override
@@ -66,6 +66,10 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
         private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO,
             BigInteger.ONE,
             BigInteger.ZERO,
             BigInteger.ONE,
@@ -74,6 +78,10 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
             BigInteger.ONE,
             BigInteger.ONE,
             BigInteger.ZERO,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
             BigInteger.ZERO);
 
         @Override
@@ -85,8 +93,10 @@ public void test() {
                 DRes<List<DRes<SInt>>> leftConverted = root.conversion().toBooleanBatch(leftClosed);
                 DRes<List<DRes<SInt>>> rightConverted = root.conversion()
                     .toBooleanBatch(rightClosed);
-                DRes<List<DRes<SInt>>> anded = root.logical()
-                    .pairWiseAnd(leftConverted, rightConverted);
+                DRes<List<DRes<SInt>>> anded = root.logical().pairWiseAnd(
+                    leftConverted,
+                    rightConverted
+                );
                 DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
                 OIntFactory factory = root.getOIntFactory();
                 return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))

From 25ad7318a419e09b0f267a0fb3aaf241e61135c4 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 30 Apr 2018 18:44:19 +0200
Subject: [PATCH 107/231] No mac-check for debugging

---
 .../Spdz2kRoundSynchronization.java           | 34 ++++------
 .../TestSpdz2kLogicalOperations.java          | 68 ++++++++++++++++---
 2 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 83fbe28ee..dff8c4ae5 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -1,20 +1,14 @@
 package dk.alexandra.fresco.suite.spdz2k.synchronization;
 
 import dk.alexandra.fresco.framework.ProtocolCollection;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.sce.evaluator.BatchEvaluationStrategy;
-import dk.alexandra.fresco.framework.sce.evaluator.BatchedProtocolEvaluator;
-import dk.alexandra.fresco.framework.sce.evaluator.BatchedStrategy;
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
 import dk.alexandra.fresco.suite.ProtocolSuite.RoundSynchronization;
-import dk.alexandra.fresco.suite.spdz2k.Spdz2kBuilder;
 import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.RequiresMacCheck;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.stream.StreamSupport;
@@ -52,20 +46,20 @@ public Spdz2kRoundSynchronization(Spdz2kProtocolSuite<HighT, LowT, PlainT> proto
   }
 
   private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
-    Spdz2kBuilder<PlainT> builder = new Spdz2kBuilder<>(resourcePool.getFactory(),
-        protocolSuite.createBasicNumericContext(resourcePool), false);
-    BatchEvaluationStrategy<Spdz2kResourcePool<PlainT>> batchStrategy = new BatchedStrategy<>();
-    BatchedProtocolEvaluator<Spdz2kResourcePool<PlainT>> evaluator = new BatchedProtocolEvaluator<>(
-        batchStrategy,
-        protocolSuite,
-        batchSize);
-    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
-    Spdz2kMacCheckComputation<HighT, LowT, PlainT> macCheck = new Spdz2kMacCheckComputation<>(
-        store.popValues(),
-        resourcePool, converter);
-    ProtocolBuilderNumeric sequential = builder.createSequential();
-    macCheck.buildComputation(sequential);
-    evaluator.eval(sequential.build(), resourcePool, network);
+//    Spdz2kBuilder<PlainT> builder = new Spdz2kBuilder<>(resourcePool.getFactory(),
+//        protocolSuite.createBasicNumericContext(resourcePool), false);
+//    BatchEvaluationStrategy<Spdz2kResourcePool<PlainT>> batchStrategy = new BatchedStrategy<>();
+//    BatchedProtocolEvaluator<Spdz2kResourcePool<PlainT>> evaluator = new BatchedProtocolEvaluator<>(
+//        batchStrategy,
+//        protocolSuite,
+//        batchSize);
+//    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
+//    Spdz2kMacCheckComputation<HighT, LowT, PlainT> macCheck = new Spdz2kMacCheckComputation<>(
+//        store.popValues(),
+//        resourcePool, converter);
+//    ProtocolBuilderNumeric sequential = builder.createSequential();
+//    macCheck.buildComputation(sequential);
+//    evaluator.eval(sequential.build(), resourcePool, network);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index ec7319d21..570b559f5 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -23,8 +23,10 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.junit.Assert;
@@ -38,6 +40,11 @@ public void testAnd() {
     runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testAndRandom() {
+    runTest(new TestAndSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
@@ -66,10 +73,6 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
         private final List<BigInteger> left = Arrays.asList(
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ONE,
-            BigInteger.ZERO,
             BigInteger.ONE,
             BigInteger.ZERO,
             BigInteger.ONE,
@@ -78,10 +81,6 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
             BigInteger.ONE,
             BigInteger.ONE,
             BigInteger.ZERO,
-            BigInteger.ZERO,
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ONE,
             BigInteger.ZERO);
 
         @Override
@@ -115,5 +114,58 @@ public void test() {
     }
   }
 
+  public static class TestAndSpdz2kRandom<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = randomBits(100, 1);
+        private final List<BigInteger> right = randomBits(100, 2);
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                DRes<List<DRes<SInt>>> rightClosed = root.numeric().knownAsDRes(right);
+                DRes<List<DRes<SInt>>> leftConverted = root.conversion().toBooleanBatch(leftClosed);
+                DRes<List<DRes<SInt>>> rightConverted = root.conversion()
+                    .toBooleanBatch(rightClosed);
+                DRes<List<DRes<SInt>>> anded = root.logical().pairWiseAnd(
+                    leftConverted,
+                    rightConverted
+                );
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
+                OIntFactory factory = root.getOIntFactory();
+                return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = and(left, right);
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  private static List<BigInteger> randomBits(int num, int seed) {
+    Random random = new Random(seed);
+    List<BigInteger> bits = new ArrayList<>(num);
+    for (int i = 0; i < num; i++) {
+      bits.add(random.nextBoolean() ? BigInteger.ONE : BigInteger.ZERO);
+    }
+    return bits;
+  }
+
+  private static List<BigInteger> and(List<BigInteger> left, List<BigInteger> right) {
+    List<BigInteger> bits = new ArrayList<>(left.size());
+    for (int i = 0; i < left.size(); i++) {
+      bits.add(left.get(i).multiply(right.get(i)).mod(BigInteger.valueOf(2)));
+    }
+    return bits;
+  }
+
 
 }

From fe754bae01eab1feaa4100163bd81b3b1ef14fec Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Tue, 1 May 2018 12:55:48 +0200
Subject: [PATCH 108/231] Draft of new equality

---
 .../builder/numeric/DefaultComparison.java    |  4 +-
 .../compare/zerotest/ZeroTestLogRounds.java   | 51 +++++++++++--------
 .../fresco/lib/compare/CompareTests.java      |  5 +-
 .../TestDummyArithmeticProtocolSuite.java     | 11 +++-
 4 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 6c5024403..238ed3441 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -22,7 +22,7 @@
 public class DefaultComparison implements Comparison {
 
   // Security parameter used by protocols using rightshifts and/or additive masks.
-  protected final int magicSecureNumber = 60;
+  protected final int magicSecureNumber = 40;
   protected final BuilderFactoryNumeric factoryNumeric;
   protected final ProtocolBuilderNumeric builder;
 
@@ -44,7 +44,7 @@ public DRes<SInt> compareLEQLong(DRes<SInt> x, DRes<SInt> y) {
   @Override
   public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y,
       EqualityAlgorithm algorithm) {
-    int maxBitLength = builder.getBasicNumericContext().getMaxBitLength();
+    int maxBitLength = 64;// builder.getBasicNumericContext().getMaxBitLength();
     switch (algorithm) {
     case EQ_CONST_ROUNDS:
       return equalsConstRounds(maxBitLength, x, y);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index f817f77f7..2e55cc7b5 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -6,9 +6,9 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 
 public class ZeroTestLogRounds implements
     Computation<SInt, ProtocolBuilderNumeric> {
@@ -26,31 +26,42 @@ public ZeroTestLogRounds(int maxLength, DRes<SInt> input,
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<RandomBitMask> r = builder.advancedNumeric().randomBitMask(maxLength
-        + securityParameter);
-    return builder.seq(seq -> {
-      // Use the integer interpretation of r to compute c = 2^{k-1}+(left + r)
+    return builder.seq( seq -> seq.advancedNumeric().randomBitMask(maxLength
+        + securityParameter)).seq((seq, r) -> {
+      // Use the integer interpretation of r to compute c = 2^{k-1}+(input + r)
       DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
           .getOIntArithmetic().twoTo(maxLength - 1), seq.numeric().add(input, r
-              .out()
-              .getValue())));
-      return c;
-    }).par((par, c) -> {
+                      .getValue())));
+          return () -> new Pair<>(r.getBits(), c);
+    }).seq((seq, pair) -> {
+      List<DRes<OInt>> cbits = seq.getOIntArithmetic().toBits(pair.getSecond()
+          .out(), maxLength);
+      return () -> new Pair<>(pair.getFirst().out(), cbits);
+    }).seq((seq, pair) -> {
       List<DRes<SInt>> d = new ArrayList<>(maxLength);
-      DRes<OInt> two = par.getOIntArithmetic().twoTo(1);
-      List<DRes<OInt>> cbits = par.getOIntArithmetic().toBits(c.out(),
-          maxLength);
+      // DRes<OInt> two = seq.getOIntArithmetic().twoTo(1);
       for (int i = 0; i < maxLength; i++) {
-        DRes<SInt> ri = r.out().getBits().out().get(i);
-        // DRes<SInt> temp = par.numeric().multByOpen(two, par.numeric().multByOpen(cbits.get(i), ri));
-        // DRes<SInt> temp2 = par.numeric().addOpen(cbits.get(i), ri);
-        DRes<SInt> di = par.numeric().sub(par.numeric().addOpen(cbits.get(i),
-            ri), par.numeric().multByOpen(two, par.numeric().multByOpen(cbits
-                .get(i), ri)));
+        DRes<SInt> ri = pair.getFirst().get(i);
+        DRes<OInt> ci = pair.getSecond().get(i);
+        DRes<SInt> di = seq.logical().xorKnown(ci, ri);
+        // DRes<SInt> producti = seq.numeric().multByOpen(two, seq.numeric()
+        // .multByOpen(ci, ri));
+        // DRes<SInt> sumi = seq.numeric().addOpen(ci, ri);
+        // DRes<SInt> di = seq.numeric().sub(sumi, producti);
         d.add(di);
       }
-      return par.numeric().subFromOpen(par.getOIntArithmetic().twoTo(0), par
+      return () -> d;// new Pair<>(tempList1, tempList2);
+      // }).par((par, pair) -> {
+//      List<DRes<SInt>> d = new ArrayList<>(maxLength);
+//      for (int i = 0; i < maxLength; i++) {
+//        DRes<SInt> di = par.numeric().sub(pair.getSecond().get(i), pair
+//            .getFirst().get(i));
+//        d.add(di);
+//      }
+//      return () -> d;
+    }).seq((seq, d) -> {
+      return seq.numeric().subFromOpen(seq.getOIntArithmetic().twoTo(0), seq
           .logical().orOfList(() -> d));
-    });
+      });
   }
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index 4a6bafff1..9cdc80cd6 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -125,7 +125,7 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() throws Exception {
           Application<Pair<BigInteger, BigInteger>, ProtocolBuilderNumeric> app = builder -> {
             Numeric input = builder.numeric();
-            DRes<SInt> x = input.known(BigInteger.valueOf(3));
+            DRes<SInt> x = input.known(BigInteger.valueOf(1));
             DRes<SInt> y = input.known(BigInteger.valueOf(5));
             Comparison comparison = builder.comparison();
             DRes<SInt> compResult1 = comparison.equals(x, x);
@@ -136,8 +136,9 @@ public void test() throws Exception {
             return () -> new Pair<>(res1.out(), res2.out());
           };
           Pair<BigInteger, BigInteger> output = runApplication(app);
-          Assert.assertEquals(BigInteger.ONE, output.getFirst());
           Assert.assertEquals(BigInteger.ZERO, output.getSecond());
+          Assert.assertEquals(BigInteger.ONE, output.getFirst());
+
         }
       };
     }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 417b9e1dc..50f8cbdf8 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -137,7 +137,9 @@ public void testCompareLtEdgeCasesSequential() {
 
   @Test
   public void test_compareEQ_Sequential() {
-    runTest(new CompareTests.TestCompareEQ<>(), new TestParameters());
+    TestParameters params = new TestParameters().modulus(ModulusFinder
+        .findSuitableModulus(128));
+    runTest(new CompareTests.TestCompareEQ<>(), params);
   }
 
   @Test
@@ -145,6 +147,13 @@ public void testCompareEqEdgeCasesSequential() {
     runTest(new CompareTests.TestCompareEQEdgeCases<>(), new TestParameters());
   }
 
+  @Test
+  public void test_compareZero_Sequential() {
+    TestParameters params = new TestParameters().modulus(ModulusFinder
+        .findSuitableModulus(128));
+    runTest(new CompareTests.TestCompareEQ<>(), params);
+  }
+
   @Test
   public void test_isSorted() {
     runTest(new SortingTests.TestIsSorted<>(), new TestParameters());

From d2d4a673ca2b62e542a42b6d56491d33b7fd6c4e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 1 May 2018 12:56:46 +0200
Subject: [PATCH 109/231] WIP comuin128but

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  4 +-
 .../suite/spdz2k/datatypes/CompUInt.java      | 11 ++--
 .../suite/spdz2k/datatypes/CompUInt128.java   | 21 +++++---
 .../spdz2k/datatypes/CompUInt128Bit.java      | 50 +++++++++++++++++++
 .../suite/spdz2k/datatypes/CompUInt96.java    |  5 ++
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   | 22 +++++---
 .../suite/spdz2k/datatypes/Spdz2kTriple.java  |  8 +++
 .../Spdz2kMacCheckComputation.java            |  4 +-
 .../protocols/natives/Spdz2kAndProtocol.java  | 10 ++--
 .../storage/Spdz2kDummyDataSupplier.java      |  6 +--
 .../Spdz2kRoundSynchronization.java           | 32 +++++++-----
 .../TestSpdz2kLogicalOperations.java          | 21 ++++----
 12 files changed, 138 insertions(+), 56 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index f03f4f6d5..4527db0db 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -196,8 +196,8 @@ public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
         return () -> {
           Spdz2kSIntArithmetic<PlainT> value = factory.toSpdz2kSIntArithmetic(arithmeticValue);
           return new Spdz2kSIntBoolean<>(
-              value.getShare().shiftLeft(factory.getLowBitLength() - 1),
-              value.getMacShare().shiftLeft(factory.getLowBitLength() - 1)
+              value.getShare().toBitRepresentation(),
+              value.getMacShare().toBitRepresentation()
           );
         };
       }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index d02b935e8..8ed7bf0f0 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -49,24 +49,29 @@ public interface CompUInt<
    */
   CompT clearHighBits();
 
+  /**
+   * Converts this to bit representation.
+   */
+  CompT toBitRepresentation();
+
   /**
    * Bit-wise AND of this and other.
    */
-  default CompT and(CompT other) {
+  default CompT multiplyMsb(CompT other) {
     throw new UnsupportedOperationException();
   }
 
   /**
    * Bit-wise XOR of this and other.
    */
-  default CompT xor(CompT other) {
+  default CompT addMsb(CompT other) {
     throw new UnsupportedOperationException();
   }
 
   /**
    * Bit-wise NOT of this.
    */
-  default CompT not() {
+  default CompT negateMsb() {
     throw new UnsupportedOperationException();
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index dfa1beb1d..98ab62ae8 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -11,9 +11,9 @@
 public class CompUInt128 implements CompUInt<UInt64, UInt64, CompUInt128> {
 
   private static final CompUInt128 ONE = new CompUInt128(1);
-  private final long high;
-  private final int mid;
-  private final int low;
+  protected final long high;
+  protected final int mid;
+  protected final int low;
 
   /**
    * Creates new {@link CompUInt128}. <p>Do <b>not</b> pad bytes by default.</p>
@@ -124,17 +124,17 @@ public CompUInt128 multiply(CompUInt128 other) {
   }
 
   @Override
-  public CompUInt128 and(CompUInt128 other) {
-    return new CompUInt128(high & other.high, mid & other.mid, low & other.low);
+  public CompUInt128 multiplyMsb(CompUInt128 other) {
+    return new CompUInt128(high + other.high, mid & other.mid, low & other.low);
   }
 
   @Override
-  public CompUInt128 xor(CompUInt128 other) {
-    return new CompUInt128(high ^ other.high, mid ^ other.mid, low ^ other.low);
+  public CompUInt128 addMsb(CompUInt128 other) {
+    return new CompUInt128(high * other.high, mid ^ other.mid, low ^ other.low);
   }
 
   @Override
-  public CompUInt128 not() {
+  public CompUInt128 negateMsb() {
     return new CompUInt128(~high, ~mid, ~low);
   }
 
@@ -213,6 +213,11 @@ public CompUInt128 clearHighBits() {
     return new CompUInt128(0, mid, low);
   }
 
+  @Override
+  public CompUInt128 toBitRepresentation() {
+    return new CompUInt128Bit(shiftLeft(63));
+  }
+
   @Override
   public int getLowBitLength() {
     return 64;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
new file mode 100644
index 000000000..378de8168
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -0,0 +1,50 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import java.math.BigInteger;
+
+public class CompUInt128Bit extends CompUInt128 {
+
+  public CompUInt128Bit(byte[] bytes) {
+    super(bytes);
+  }
+
+  public CompUInt128Bit(byte[] bytes, boolean requiresPadding) {
+    super(bytes, requiresPadding);
+  }
+
+  public CompUInt128Bit(BigInteger value) {
+    super(value);
+  }
+
+  CompUInt128Bit(long high, int mid, int low) {
+    super(high, mid, low);
+  }
+
+  CompUInt128Bit(UInt64 value) {
+    super(value);
+  }
+
+  CompUInt128Bit(long value) {
+    super(value);
+  }
+
+  CompUInt128Bit(CompUInt128 other) {
+    super(other);
+  }
+
+  @Override
+  public CompUInt128 add(CompUInt128 other) {
+    return new CompUInt128Bit(high + other.high, mid & other.mid, low & other.low);
+  }
+
+  @Override
+  public CompUInt128 multiply(CompUInt128 other) {
+    return new CompUInt128Bit(high + other.high, mid & other.mid, low & other.low);
+  }
+
+  @Override
+  public CompUInt128 toBitRepresentation() {
+    throw new IllegalStateException("Already in bit form");
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 1ef15e081..1ab574e76 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -173,6 +173,11 @@ public CompUInt96 clearHighBits() {
     return new CompUInt96(0, 0, low);
   }
 
+  @Override
+  public CompUInt96 toBitRepresentation() {
+    return null;
+  }
+
   @Override
   public int getLowBitLength() {
     return 32;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 41dfa5a76..640be2fc7 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -16,34 +16,42 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macShare) {
   }
 
   /**
-   * Creates a {@link Spdz2kSIntBoolean} from a public value. <p>All parties compute the mac
-   * share of the value but only party one (by convention) stores the public value as the share, the
+   * Creates a {@link Spdz2kSIntBoolean} from a public value. <p>All parties compute the mac share
+   * of the value but only party one (by convention) stores the public value as the share, the
    * others store 0.</p>
    */
   public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-    this(isPartyOne ? share : zero, share.and(macKeyShare));
+    this(isPartyOne ? share : zero, share.multiplyMsb(macKeyShare));
   }
 
   /**
    * Compute sum of this and other.
    */
   public Spdz2kSIntBoolean<PlainT> add(Spdz2kSIntBoolean<PlainT> other) {
-    return new Spdz2kSIntBoolean<>(share.xor(other.share), macShare.xor(other.macShare));
+    return new Spdz2kSIntBoolean<>(
+        share.addMsb(other.share),
+        macShare.addMsb(other.macShare)
+    );
   }
 
   /**
    * Compute difference of this and other.
    */
   public Spdz2kSIntBoolean<PlainT> subtract(Spdz2kSIntBoolean<PlainT> other) {
-    return new Spdz2kSIntBoolean<>(share.xor(other.share.not()),
-        macShare.xor(other.macShare.not()));
+    return new Spdz2kSIntBoolean<>(
+        share.addMsb(other.share.negateMsb()),
+        macShare.addMsb(other.macShare.negateMsb())
+    );
   }
 
   /**
    * Compute product of this and constant (open) value.
    */
   public Spdz2kSIntBoolean<PlainT> multiply(PlainT other) {
-    return new Spdz2kSIntBoolean<>(share.and(other), macShare.and(other));
+    return new Spdz2kSIntBoolean<>(
+        share.multiplyMsb(other),
+        macShare.multiplyMsb(other)
+    );
   }
 
   /**
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
index 68f3638d3..3afb5a9ed 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTriple.java
@@ -24,4 +24,12 @@ public SIntT getProduct() {
     return product;
   }
 
+  @Override
+  public String toString() {
+    return "Spdz2kTriple{" +
+        "left=" + left +
+        ", right=" + right +
+        ", product=" + product +
+        '}';
+  }
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
index 02691d701..6af582562 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
@@ -84,7 +84,9 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
         .seq((seq, broadcastPjs) -> computeZValues(seq, authenticatedElements, macKeyShare, y, r,
             broadcastPjs))
         .seq((seq, commitZjs) -> {
-          if (!UInt.sum(serializer.deserializeList(commitZjs)).isZero()) {
+          List<PlainT> elements = serializer.deserializeList(commitZjs);
+          PlainT sum = UInt.sum(elements);
+          if (!sum.isZero()) {
             throw new MaliciousException("Mac check failed");
           }
           authenticatedElements.clear();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
index f9f65da79..4246e91ee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
@@ -54,11 +54,10 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
           factory,
           resourcePool.getNoOfParties(),
           serializer);
-      // compute [prod] = [c] + epsilon * [b] + delta * [a] + epsilon * delta
+      // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
       PlainT e = epsilonAndDelta.getFirst();
       PlainT d = epsilonAndDelta.getSecond();
-      PlainT ed = e.and(d);
-      System.out.println("ed " + ed);
+      PlainT ed = e.multiplyMsb(d);
       Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
       Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
       Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
@@ -89,10 +88,9 @@ private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
     PlainT e = factory.zero();
     PlainT d = factory.zero();
     for (int i = 1; i <= noOfParties; i++) {
-      e = e.xor(serializer.deserialize(network.receive(i)));
-      d = d.xor(serializer.deserialize(network.receive(i)));
+      e = e.addMsb(serializer.deserialize(network.receive(i)));
+      d = d.addMsb(serializer.deserialize(network.receive(i)));
     }
-    System.out.println("e " + e + " d " + d);
     return new Pair<>(e, d);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index afa728fb7..cc43394c6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -45,10 +45,6 @@ public Spdz2kTriple<PlainT, Spdz2kSIntArithmetic<PlainT>> getNextTripleSharesFul
   @Override
   public Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> getNextBitTripleShares() {
     MultiplicationTripleShares rawTriple = supplier.getMultiplicationBitTripleShares();
-    if (myId == 1) {
-      System.out.println(rawTriple.getProduct().getFirst());
-    }
-
     return new Spdz2kTriple<>(
         toSpdz2kSIntBool(rawTriple.getLeft()),
         toSpdz2kSIntBool(rawTriple.getRight()),
@@ -92,7 +88,7 @@ private Spdz2kSIntBoolean<PlainT> toSpdz2kSIntBool(Pair<BigInteger, BigInteger>
     int n = factory.getLowBitLength() - 1;
     PlainT openValue = factory.createFromBigInteger(raw.getFirst().shiftLeft(n));
     PlainT share = factory.createFromBigInteger(raw.getSecond().shiftLeft(n));
-    PlainT macShare = openValue.multiply(secretSharedKey);
+    PlainT macShare = openValue.multiplyMsb(secretSharedKey);
     return new Spdz2kSIntBoolean<>(share, macShare);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index dff8c4ae5..1948abf72 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -1,14 +1,20 @@
 package dk.alexandra.fresco.suite.spdz2k.synchronization;
 
 import dk.alexandra.fresco.framework.ProtocolCollection;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.sce.evaluator.BatchEvaluationStrategy;
+import dk.alexandra.fresco.framework.sce.evaluator.BatchedProtocolEvaluator;
+import dk.alexandra.fresco.framework.sce.evaluator.BatchedStrategy;
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
 import dk.alexandra.fresco.suite.ProtocolSuite.RoundSynchronization;
+import dk.alexandra.fresco.suite.spdz2k.Spdz2kBuilder;
 import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.RequiresMacCheck;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.stream.StreamSupport;
@@ -46,19 +52,19 @@ public Spdz2kRoundSynchronization(Spdz2kProtocolSuite<HighT, LowT, PlainT> proto
   }
 
   private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
-//    Spdz2kBuilder<PlainT> builder = new Spdz2kBuilder<>(resourcePool.getFactory(),
-//        protocolSuite.createBasicNumericContext(resourcePool), false);
-//    BatchEvaluationStrategy<Spdz2kResourcePool<PlainT>> batchStrategy = new BatchedStrategy<>();
-//    BatchedProtocolEvaluator<Spdz2kResourcePool<PlainT>> evaluator = new BatchedProtocolEvaluator<>(
-//        batchStrategy,
-//        protocolSuite,
-//        batchSize);
-//    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
-//    Spdz2kMacCheckComputation<HighT, LowT, PlainT> macCheck = new Spdz2kMacCheckComputation<>(
-//        store.popValues(),
-//        resourcePool, converter);
-//    ProtocolBuilderNumeric sequential = builder.createSequential();
-//    macCheck.buildComputation(sequential);
+    Spdz2kBuilder<PlainT> builder = new Spdz2kBuilder<>(resourcePool.getFactory(),
+        protocolSuite.createBasicNumericContext(resourcePool), false);
+    BatchEvaluationStrategy<Spdz2kResourcePool<PlainT>> batchStrategy = new BatchedStrategy<>();
+    BatchedProtocolEvaluator<Spdz2kResourcePool<PlainT>> evaluator = new BatchedProtocolEvaluator<>(
+        batchStrategy,
+        protocolSuite,
+        batchSize);
+    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
+    Spdz2kMacCheckComputation<HighT, LowT, PlainT> macCheck = new Spdz2kMacCheckComputation<>(
+        store.popValues(),
+        resourcePool, converter);
+    ProtocolBuilderNumeric sequential = builder.createSequential();
+    macCheck.buildComputation(sequential);
 //    evaluator.eval(sequential.build(), resourcePool, network);
   }
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 570b559f5..063ed7888 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -48,15 +48,20 @@ public void testAndRandom() {
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
+    System.err.println("TestSpdz2kLogicalOperations change me back!");
     CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+    Random random = new Random(playerId);
+    byte[] bytes = new byte[16];
+    random.nextBytes(bytes);
+    CompUInt128 keyShare = new CompUInt128(bytes);
     Spdz2kResourcePool<CompUInt128> resourcePool =
         new Spdz2kResourcePoolImpl<>(
             playerId,
-            noOfParties, null,
+            noOfParties, new AesCtrDrbg(new byte[32]),
             new Spdz2kOpenedValueStoreImpl<>(),
-            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, factory.createRandom(), factory),
+            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, keyShare, factory),
             factory);
-    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
+//    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
     return resourcePool;
   }
 
@@ -73,15 +78,9 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
         private final List<BigInteger> left = Arrays.asList(
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ONE,
-            BigInteger.ZERO);
+            BigInteger.ONE);
         private final List<BigInteger> right = Arrays.asList(
-            BigInteger.ONE,
-            BigInteger.ONE,
-            BigInteger.ZERO,
-            BigInteger.ZERO);
+            BigInteger.ONE);
 
         @Override
         public void test() {

From bc30b15ba20eb4caf3a0c1116b6d1c8d219f3d0b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 1 May 2018 13:56:10 +0200
Subject: [PATCH 110/231] Semi-working zero test

---
 .../framework/value/BigIntegerOInt.java       |  7 +++++
 .../compare/zerotest/ZeroTestLogRounds.java   | 26 +++++++++-------
 .../fresco/lib/compare/CompareTests.java      | 31 +++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     |  2 +-
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOInt.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOInt.java
index 6e8c340d0..5219bc172 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOInt.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOInt.java
@@ -22,4 +22,11 @@ public OInt out() {
     return this;
   }
 
+  @Override
+  public String toString() {
+    return "BigIntegerOInt{" +
+        "value=" + value +
+        '}';
+  }
 }
+
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index 2e55cc7b5..a2e70bc89 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -1,6 +1,7 @@
 package dk.alexandra.fresco.lib.compare.zerotest;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import dk.alexandra.fresco.framework.DRes;
@@ -26,28 +27,30 @@ public ZeroTestLogRounds(int maxLength, DRes<SInt> input,
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    return builder.seq( seq -> seq.advancedNumeric().randomBitMask(maxLength
+    return builder.seq(seq -> seq.advancedNumeric().randomBitMask(maxLength
         + securityParameter)).seq((seq, r) -> {
       // Use the integer interpretation of r to compute c = 2^{k-1}+(input + r)
       DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
           .getOIntArithmetic().twoTo(maxLength - 1), seq.numeric().add(input, r
-                      .getValue())));
-          return () -> new Pair<>(r.getBits(), c);
+          .getValue())));
+      seq.debug().openAndPrint("r ", r.getValue(), System.out);
+      return () -> new Pair<>(r.getBits(), c);
     }).seq((seq, pair) -> {
+      System.out.println("c " + pair.getSecond().out());
       List<DRes<OInt>> cbits = seq.getOIntArithmetic().toBits(pair.getSecond()
           .out(), maxLength);
       return () -> new Pair<>(pair.getFirst().out(), cbits);
     }).seq((seq, pair) -> {
       List<DRes<SInt>> d = new ArrayList<>(maxLength);
-      // DRes<OInt> two = seq.getOIntArithmetic().twoTo(1);
-      for (int i = 0; i < maxLength; i++) {
+      DRes<OInt> two = seq.getOIntArithmetic().twoTo(1);
+      List<DRes<OInt>> second = pair.getSecond();
+      Collections.reverse(second);
+      // TODO why -1?
+      for (int i = 0; i < maxLength - 1; i++) {
         DRes<SInt> ri = pair.getFirst().get(i);
-        DRes<OInt> ci = pair.getSecond().get(i);
+        DRes<OInt> ci = second.get(i);
+        seq.debug().openAndPrint("r" + i + " ci " + ci.out(), ri, System.out);
         DRes<SInt> di = seq.logical().xorKnown(ci, ri);
-        // DRes<SInt> producti = seq.numeric().multByOpen(two, seq.numeric()
-        // .multByOpen(ci, ri));
-        // DRes<SInt> sumi = seq.numeric().addOpen(ci, ri);
-        // DRes<SInt> di = seq.numeric().sub(sumi, producti);
         d.add(di);
       }
       return () -> d;// new Pair<>(tempList1, tempList2);
@@ -60,8 +63,9 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
 //      }
 //      return () -> d;
     }).seq((seq, d) -> {
+      seq.debug().openAndPrint("label " + seq.getBasicNumericContext().getMyId(), d, System.out);
       return seq.numeric().subFromOpen(seq.getOIntArithmetic().twoTo(0), seq
           .logical().orOfList(() -> d));
-      });
+    });
   }
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index 9cdc80cd6..091f2493c 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -144,6 +144,37 @@ public void test() throws Exception {
     }
   }
 
+  public static class TestCompareEQZero<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() throws Exception {
+          Application<Pair<BigInteger, BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+            Numeric input = builder.numeric();
+            DRes<SInt> x = input.known(BigInteger.valueOf(1));
+            DRes<SInt> y = input.known(BigInteger.valueOf(0));
+            Comparison comparison = builder.comparison();
+//            DRes<SInt> compResult1 = comparison.compareZero(x, 64);
+            DRes<SInt> compResult2 = comparison.compareZero(y, 64);
+            Numeric open = builder.numeric();
+            DRes<BigInteger> res1 = open.open(x);
+            DRes<BigInteger> res2 = open.open(compResult2);
+
+            return () -> new Pair<>(res1.out(), res2.out());
+          };
+          Pair<BigInteger, BigInteger> output = runApplication(app);
+//          Assert.assertEquals(BigInteger.ZERO, output.getFirst());
+          Assert.assertEquals(BigInteger.ONE, output.getSecond());
+
+        }
+      };
+    }
+  }
+
   public static class TestCompareEQEdgeCases<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 50f8cbdf8..d909b1eeb 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -151,7 +151,7 @@ public void testCompareEqEdgeCasesSequential() {
   public void test_compareZero_Sequential() {
     TestParameters params = new TestParameters().modulus(ModulusFinder
         .findSuitableModulus(128));
-    runTest(new CompareTests.TestCompareEQ<>(), params);
+    runTest(new CompareTests.TestCompareEQZero<>(), params);
   }
 
   @Test

From 821477050861ebd30c0015e5346158ff1113ef7b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 1 May 2018 17:19:31 +0200
Subject: [PATCH 111/231] Work on bit rep of uint

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  4 +-
 .../suite/spdz2k/datatypes/CompUInt.java      | 22 ++-------
 .../suite/spdz2k/datatypes/CompUInt128.java   | 24 +++-------
 .../spdz2k/datatypes/CompUInt128Bit.java      | 39 ++++++---------
 .../suite/spdz2k/datatypes/CompUInt96.java    |  7 ++-
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   | 14 +++---
 .../protocols/natives/Spdz2kAndProtocol.java  | 10 ++--
 .../storage/Spdz2kDummyDataSupplier.java      |  7 ++-
 .../spdz2k/datatypes/TestCompUInt128.java     |  8 ++++
 .../spdz2k/datatypes/TestCompUInt128Bit.java  | 47 +++++++++++++++++++
 .../TestSpdz2kLogicalOperations.java          | 15 ++++--
 11 files changed, 115 insertions(+), 82 deletions(-)
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 4527db0db..89ee55009 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -196,8 +196,8 @@ public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
         return () -> {
           Spdz2kSIntArithmetic<PlainT> value = factory.toSpdz2kSIntArithmetic(arithmeticValue);
           return new Spdz2kSIntBoolean<>(
-              value.getShare().toBitRepresentation(),
-              value.getMacShare().toBitRepresentation()
+              value.getShare().toBitRep(),
+              value.getMacShare().toBitRep()
           );
         };
       }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 8ed7bf0f0..b141fbd3b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -52,28 +52,12 @@ public interface CompUInt<
   /**
    * Converts this to bit representation.
    */
-  CompT toBitRepresentation();
+  CompT toBitRep();
 
   /**
-   * Bit-wise AND of this and other.
+   * Converts this to arithmetic representation.
    */
-  default CompT multiplyMsb(CompT other) {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * Bit-wise XOR of this and other.
-   */
-  default CompT addMsb(CompT other) {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * Bit-wise NOT of this.
-   */
-  default CompT negateMsb() {
-    throw new UnsupportedOperationException();
-  }
+  CompT toArithmeticRep();
 
   /**
    * Get length of least significant bit segment, i.e., k.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 98ab62ae8..e27cbccb2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -122,22 +122,7 @@ public CompUInt128 multiply(CompUInt128 other) {
         + (newMid >>> 32);
     return new CompUInt128(newHigh, (int) newMid, (int) t1);
   }
-
-  @Override
-  public CompUInt128 multiplyMsb(CompUInt128 other) {
-    return new CompUInt128(high + other.high, mid & other.mid, low & other.low);
-  }
-
-  @Override
-  public CompUInt128 addMsb(CompUInt128 other) {
-    return new CompUInt128(high * other.high, mid ^ other.mid, low ^ other.low);
-  }
-
-  @Override
-  public CompUInt128 negateMsb() {
-    return new CompUInt128(~high, ~mid, ~low);
-  }
-
+  
   @Override
   public CompUInt128 subtract(CompUInt128 other) {
     return this.add(other.negate());
@@ -214,10 +199,15 @@ public CompUInt128 clearHighBits() {
   }
 
   @Override
-  public CompUInt128 toBitRepresentation() {
+  public CompUInt128 toBitRep() {
     return new CompUInt128Bit(shiftLeft(63));
   }
 
+  @Override
+  public CompUInt128 toArithmeticRep() {
+    throw new UnsupportedOperationException("Already arithmetic");
+  }
+
   @Override
   public int getLowBitLength() {
     return 64;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 378de8168..85d57318f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -1,50 +1,41 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
-import java.math.BigInteger;
-
 public class CompUInt128Bit extends CompUInt128 {
 
-  public CompUInt128Bit(byte[] bytes) {
-    super(bytes);
-  }
-
-  public CompUInt128Bit(byte[] bytes, boolean requiresPadding) {
-    super(bytes, requiresPadding);
-  }
-
-  public CompUInt128Bit(BigInteger value) {
-    super(value);
-  }
-
   CompUInt128Bit(long high, int mid, int low) {
     super(high, mid, low);
   }
 
-  CompUInt128Bit(UInt64 value) {
-    super(value);
-  }
-
-  CompUInt128Bit(long value) {
-    super(value);
+  CompUInt128Bit(long high, int bit) {
+    super(high, bit << 31, 0);
   }
 
   CompUInt128Bit(CompUInt128 other) {
     super(other);
   }
 
+  @Override
+  public CompUInt128 multiply(CompUInt128 other) {
+    return new CompUInt128Bit(high * other.high, mid & other.mid, low & other.low);
+  }
+
   @Override
   public CompUInt128 add(CompUInt128 other) {
-    return new CompUInt128Bit(high + other.high, mid & other.mid, low & other.low);
+    return new CompUInt128Bit(high + other.high, mid ^ other.mid, low ^ other.low);
   }
 
   @Override
-  public CompUInt128 multiply(CompUInt128 other) {
-    return new CompUInt128Bit(high + other.high, mid & other.mid, low & other.low);
+  public CompUInt128 subtract(CompUInt128 other) {
+    return new CompUInt128Bit(high - other.high, mid ^ (~other.mid), low ^ (~other.low));
   }
 
   @Override
-  public CompUInt128 toBitRepresentation() {
+  public CompUInt128 toBitRep() {
     throw new IllegalStateException("Already in bit form");
   }
 
+  public boolean getValueBit() {
+    return testBit(63);
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 1ab574e76..1e7d5abd6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -174,7 +174,12 @@ public CompUInt96 clearHighBits() {
   }
 
   @Override
-  public CompUInt96 toBitRepresentation() {
+  public CompUInt96 toBitRep() {
+    return null;
+  }
+
+  @Override
+  public CompUInt96 toArithmeticRep() {
     return null;
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 640be2fc7..7296bd639 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -21,7 +21,7 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macShare) {
    * others store 0.</p>
    */
   public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-    this(isPartyOne ? share : zero, share.multiplyMsb(macKeyShare));
+    this(isPartyOne ? share : zero, share.multiply(macKeyShare));
   }
 
   /**
@@ -29,8 +29,8 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean
    */
   public Spdz2kSIntBoolean<PlainT> add(Spdz2kSIntBoolean<PlainT> other) {
     return new Spdz2kSIntBoolean<>(
-        share.addMsb(other.share),
-        macShare.addMsb(other.macShare)
+        share.add(other.share),
+        macShare.add(other.macShare)
     );
   }
 
@@ -39,8 +39,8 @@ public Spdz2kSIntBoolean<PlainT> add(Spdz2kSIntBoolean<PlainT> other) {
    */
   public Spdz2kSIntBoolean<PlainT> subtract(Spdz2kSIntBoolean<PlainT> other) {
     return new Spdz2kSIntBoolean<>(
-        share.addMsb(other.share.negateMsb()),
-        macShare.addMsb(other.macShare.negateMsb())
+        share.subtract(other.share),
+        macShare.subtract(other.macShare)
     );
   }
 
@@ -49,8 +49,8 @@ public Spdz2kSIntBoolean<PlainT> subtract(Spdz2kSIntBoolean<PlainT> other) {
    */
   public Spdz2kSIntBoolean<PlainT> multiply(PlainT other) {
     return new Spdz2kSIntBoolean<>(
-        share.multiplyMsb(other),
-        macShare.multiplyMsb(other)
+        share.multiply(other),
+        macShare.multiply(other)
     );
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
index 4246e91ee..5405b7a5f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
@@ -57,7 +57,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
       PlainT e = epsilonAndDelta.getFirst();
       PlainT d = epsilonAndDelta.getSecond();
-      PlainT ed = e.multiplyMsb(d);
+      PlainT ed = e.multiply(d);
       Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
       Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
       Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
@@ -85,11 +85,11 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
   private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
       CompUIntFactory<PlainT> factory, int noOfParties,
       ByteSerializer<PlainT> serializer) {
-    PlainT e = factory.zero();
-    PlainT d = factory.zero();
+    PlainT e = factory.zero().toBitRep();
+    PlainT d = factory.zero().toBitRep();
     for (int i = 1; i <= noOfParties; i++) {
-      e = e.addMsb(serializer.deserialize(network.receive(i)));
-      d = d.addMsb(serializer.deserialize(network.receive(i)));
+      e = e.add(serializer.deserialize(network.receive(i)));
+      d = d.add(serializer.deserialize(network.receive(i)));
     }
     return new Pair<>(e, d);
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index cc43394c6..b9aa64d60 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -85,10 +85,9 @@ private Spdz2kSIntArithmetic<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> r
   }
 
   private Spdz2kSIntBoolean<PlainT> toSpdz2kSIntBool(Pair<BigInteger, BigInteger> raw) {
-    int n = factory.getLowBitLength() - 1;
-    PlainT openValue = factory.createFromBigInteger(raw.getFirst().shiftLeft(n));
-    PlainT share = factory.createFromBigInteger(raw.getSecond().shiftLeft(n));
-    PlainT macShare = openValue.multiplyMsb(secretSharedKey);
+    PlainT openValue = factory.createFromBigInteger(raw.getFirst()).toBitRep();
+    PlainT share = factory.createFromBigInteger(raw.getSecond()).toBitRep();
+    PlainT macShare = openValue.multiply(secretSharedKey);
     return new Spdz2kSIntBoolean<>(share, macShare);
   }
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index c9b562311..9fa988ec9 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -330,4 +330,12 @@ public void testShiftLeft() {
     assertEquals(new BigInteger("12312").shiftLeft(12),
         new CompUInt128(new BigInteger("12312")).shiftLeft(12).toBigInteger());
   }
+
+  @Test
+  public void testToBit() {
+    assertEquals(BigInteger.ZERO, new CompUInt128(0).toBitRep().toBigInteger());
+    assertEquals(twoTo64.shiftRight(1), new CompUInt128(1).toBitRep().toBigInteger());
+    assertEquals(twoTo64.shiftLeft(63), new CompUInt128(twoTo64).toBitRep().toBigInteger());
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
new file mode 100644
index 000000000..8c299eaf8
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -0,0 +1,47 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import java.math.BigInteger;
+import java.util.Random;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestCompUInt128Bit {
+
+  private final BigInteger twoTo128 = BigInteger.ONE.shiftLeft(128);
+
+  private static long rand(int seed) {
+    return new Random(seed).nextLong();
+  }
+
+  @Test
+  public void testConstruct() {
+    Assert.assertEquals(BigInteger.valueOf(111).shiftLeft(64),
+        new CompUInt128Bit(111, 0).toBigInteger());
+    Assert.assertEquals(BigInteger.valueOf(rand(1)).shiftLeft(64).mod(twoTo128),
+        new CompUInt128Bit(rand(1), 0).toBigInteger());
+    Assert.assertEquals(
+        BigInteger.valueOf(rand(2)).shiftLeft(64).add(BigInteger.valueOf(1L).shiftLeft(63))
+            .mod(twoTo128),
+        new CompUInt128Bit(rand(2), 1).toBigInteger());
+  }
+
+  @Test
+  public void testValueBit() {
+    Assert.assertEquals(
+        false,
+        new CompUInt128Bit(111, 0).getValueBit());
+    Assert.assertEquals(
+        false,
+        new CompUInt128Bit(rand(1), 0).getValueBit());
+    Assert.assertEquals(
+        true,
+        new CompUInt128Bit(rand(2), 1).getValueBit());
+    Assert.assertEquals(
+        true,
+        new CompUInt128Bit(0, 1).getValueBit());
+    Assert.assertEquals(
+        false,
+        new CompUInt128Bit(0, 0).getValueBit());
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 063ed7888..df55a6c7c 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -78,9 +78,17 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
         private final List<BigInteger> left = Arrays.asList(
-            BigInteger.ONE);
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO
+        );
         private final List<BigInteger> right = Arrays.asList(
-            BigInteger.ONE);
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO
+        );
 
         @Override
         public void test() {
@@ -88,7 +96,8 @@ public void test() {
               root -> {
                 DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
                 DRes<List<DRes<SInt>>> rightClosed = root.numeric().knownAsDRes(right);
-                DRes<List<DRes<SInt>>> leftConverted = root.conversion().toBooleanBatch(leftClosed);
+                DRes<List<DRes<SInt>>> leftConverted = root.conversion()
+                    .toBooleanBatch(leftClosed);
                 DRes<List<DRes<SInt>>> rightConverted = root.conversion()
                     .toBooleanBatch(rightClosed);
                 DRes<List<DRes<SInt>>> anded = root.logical().pairWiseAnd(

From 5e9fb05cd2ee52b78c70249a6d3fccb899b55589 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Tue, 1 May 2018 18:10:23 +0200
Subject: [PATCH 112/231] Cleaned up a bit of equality

---
 .../value/BigIntegerOIntArithmetic.java       |  5 ++
 .../framework/value/OIntArithmetic.java       | 13 ++-
 .../compare/zerotest/ZeroTestLogRounds.java   | 67 +++++++--------
 .../fresco/lib/compare/CompareTests.java      | 81 +++++++++++++------
 .../TestDummyArithmeticProtocolSuite.java     |  8 +-
 .../spdz2k/datatypes/CompUIntArithmetic.java  |  5 ++
 6 files changed, 108 insertions(+), 71 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 8f041c035..ed1f4a63d 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -22,6 +22,11 @@ public BigIntegerOIntArithmetic(OIntFactory factory) {
     twoPowersList.add(() -> new BigIntegerOInt(BigInteger.ONE));
   }
 
+  @Override
+  public DRes<OInt> one() {
+    return factory.one();
+  }
+
   @Override
   public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
     BigInteger value = factory.toBigInteger(openValue);
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index 64a080ddb..832a712f9 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -9,9 +9,16 @@
 public interface OIntArithmetic {
 
   /**
-   * Turns input value into bits in big-endian order. <p>If the actual bit length of the value is
-   * smaller than numBits, the result is padded with 0s. If the bit length is larger only the first
-   * numBits bits are used.</p>
+   * Returns the number one as a deferred opened int.
+   */
+  DRes<OInt> one();
+
+  /**
+   * Turns input value into bits in big-endian order.
+   * <p>
+   * If the actual bit length of the value is smaller than numBits, the result is padded with 0s. If
+   * the bit length is larger only the first numBits bits are used.
+   * </p>
    */
   List<DRes<OInt>> toBits(OInt openValue, int numBits);
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index a2e70bc89..04bba7166 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -29,43 +29,34 @@ public ZeroTestLogRounds(int maxLength, DRes<SInt> input,
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     return builder.seq(seq -> seq.advancedNumeric().randomBitMask(maxLength
         + securityParameter)).seq((seq, r) -> {
-      // Use the integer interpretation of r to compute c = 2^{k-1}+(input + r)
-      DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
-          .getOIntArithmetic().twoTo(maxLength - 1), seq.numeric().add(input, r
-          .getValue())));
-      seq.debug().openAndPrint("r ", r.getValue(), System.out);
-      return () -> new Pair<>(r.getBits(), c);
-    }).seq((seq, pair) -> {
-      System.out.println("c " + pair.getSecond().out());
-      List<DRes<OInt>> cbits = seq.getOIntArithmetic().toBits(pair.getSecond()
-          .out(), maxLength);
-      return () -> new Pair<>(pair.getFirst().out(), cbits);
-    }).seq((seq, pair) -> {
-      List<DRes<SInt>> d = new ArrayList<>(maxLength);
-      DRes<OInt> two = seq.getOIntArithmetic().twoTo(1);
-      List<DRes<OInt>> second = pair.getSecond();
-      Collections.reverse(second);
-      // TODO why -1?
-      for (int i = 0; i < maxLength - 1; i++) {
-        DRes<SInt> ri = pair.getFirst().get(i);
-        DRes<OInt> ci = second.get(i);
-        seq.debug().openAndPrint("r" + i + " ci " + ci.out(), ri, System.out);
-        DRes<SInt> di = seq.logical().xorKnown(ci, ri);
-        d.add(di);
-      }
-      return () -> d;// new Pair<>(tempList1, tempList2);
-      // }).par((par, pair) -> {
-//      List<DRes<SInt>> d = new ArrayList<>(maxLength);
-//      for (int i = 0; i < maxLength; i++) {
-//        DRes<SInt> di = par.numeric().sub(pair.getSecond().get(i), pair
-//            .getFirst().get(i));
-//        d.add(di);
-//      }
-//      return () -> d;
-    }).seq((seq, d) -> {
-      seq.debug().openAndPrint("label " + seq.getBasicNumericContext().getMyId(), d, System.out);
-      return seq.numeric().subFromOpen(seq.getOIntArithmetic().twoTo(0), seq
-          .logical().orOfList(() -> d));
-    });
+          // Use the integer interpretation of r to compute c = 2^{k-1}+(input + r)
+          DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
+              .getOIntArithmetic().twoTo(maxLength - 1), seq.numeric().add(
+                  input, r.getValue())));
+          return () -> new Pair<>(r.getBits(), c);
+        }).seq((seq, pair) -> {
+          List<DRes<OInt>> cbits = seq.getOIntArithmetic().toBits(pair
+              .getSecond().out(), maxLength);
+          // Reverse the bits of c as they are stored in big endian whereas the
+          // composed r values from random bit mask will be in little endian as
+          // it is based on a list of bits
+          Collections.reverse(cbits);
+          return () -> new Pair<>(pair.getFirst().out(), cbits);
+        }).par((par, pair) -> {
+          List<DRes<SInt>> d = new ArrayList<>(maxLength);
+          // TODO why -1?
+          for (int i = 0; i < maxLength - 1; i++) {
+            DRes<SInt> ri = pair.getFirst().get(i);
+            DRes<OInt> ci = pair.getSecond().get(i);
+            DRes<SInt> di = par.logical().xorKnown(ci, ri);
+            d.add(di);
+          }
+          return () -> d;
+        }).seq((seq, d) -> {
+          // return 1 - OR-list(d)
+          return seq.numeric().subFromOpen(seq.getOIntArithmetic().one(), seq
+              .logical().orOfList(() -> d));
+        });
+    // HARDCODED 64 LENGTH
   }
 }
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index 091f2493c..fc69467ef 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -11,7 +11,6 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.ByteAndBitConverter;
-import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.SBool;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
@@ -112,7 +111,7 @@ public void test() throws Exception {
   }
 
   /**
-   * Compares the two numbers 3 and 5 and checks that 3 == 3. Also checks that 3 != 5
+   * Compares the two numbers x and y and checks that x == x. Also checks that x != y
    */
   public static class TestCompareEQ<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
@@ -123,22 +122,46 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
         @Override
         public void test() throws Exception {
-          Application<Pair<BigInteger, BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
             Numeric input = builder.numeric();
-            DRes<SInt> x = input.known(BigInteger.valueOf(1));
-            DRes<SInt> y = input.known(BigInteger.valueOf(5));
+            // Pair 1
+            DRes<SInt> x1 = input.known(BigInteger.valueOf(3));
+            DRes<SInt> y1 = input.known(BigInteger.valueOf(5));
+            // Pair 2
+            DRes<SInt> x2 = input.known(BigInteger.valueOf(11833));
+            DRes<SInt> y2 = input.known(BigInteger.valueOf(-583));
+            // Pair 3
+            // Minimum legal case
+            DRes<SInt> x3 = input.known(BigInteger.valueOf(2).pow(62).subtract(
+                BigInteger.ONE).negate());
+            DRes<SInt> y3 = input.known(BigInteger.valueOf(2).pow(62).subtract(
+                BigInteger.valueOf(2)).negate());
+
             Comparison comparison = builder.comparison();
-            DRes<SInt> compResult1 = comparison.equals(x, x);
-            DRes<SInt> compResult2 = comparison.equals(x, y);
+
+            DRes<SInt> compResult1 = comparison.equals(x1, x1);
+            DRes<SInt> compResult2 = comparison.equals(x1, y1);
+            DRes<SInt> compResult3 = comparison.equals(x2, x2);
+            DRes<SInt> compResult4 = comparison.equals(x2, y2);
+            DRes<SInt> compResult5 = comparison.equals(x3, x3);
+            DRes<SInt> compResult6 = comparison.equals(x3, y3);
             Numeric open = builder.numeric();
             DRes<BigInteger> res1 = open.open(compResult1);
             DRes<BigInteger> res2 = open.open(compResult2);
-            return () -> new Pair<>(res1.out(), res2.out());
+            DRes<BigInteger> res3 = open.open(compResult3);
+            DRes<BigInteger> res4 = open.open(compResult4);
+            DRes<BigInteger> res5 = open.open(compResult5);
+            DRes<BigInteger> res6 = open.open(compResult6);
+            return () -> Arrays.asList(res1.out(), res2.out(), res3.out(), res4
+                .out(), res5.out(), res6.out());
           };
-          Pair<BigInteger, BigInteger> output = runApplication(app);
-          Assert.assertEquals(BigInteger.ZERO, output.getSecond());
-          Assert.assertEquals(BigInteger.ONE, output.getFirst());
-
+          List<BigInteger> output = runApplication(app);
+          Assert.assertEquals(BigInteger.ONE, output.get(0));
+          Assert.assertEquals(BigInteger.ZERO, output.get(1));
+          Assert.assertEquals(BigInteger.ONE, output.get(2));
+          Assert.assertEquals(BigInteger.ZERO, output.get(3));
+          Assert.assertEquals(BigInteger.ONE, output.get(4));
+          Assert.assertEquals(BigInteger.ZERO, output.get(5));
         }
       };
     }
@@ -153,23 +176,33 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
         @Override
         public void test() throws Exception {
-          Application<Pair<BigInteger, BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
             Numeric input = builder.numeric();
-            DRes<SInt> x = input.known(BigInteger.valueOf(1));
-            DRes<SInt> y = input.known(BigInteger.valueOf(0));
+            DRes<SInt> w = input.known(BigInteger.valueOf(-1));
+            DRes<SInt> x = input.known(BigInteger.valueOf(0));
+            // Max positive value
+            DRes<SInt> y = input.known(BigInteger.valueOf(2).pow(63).subtract(
+                BigInteger.ONE));
+            // Min negative value
+            DRes<SInt> z = input.known(BigInteger.valueOf(2).pow(63).negate());
             Comparison comparison = builder.comparison();
-//            DRes<SInt> compResult1 = comparison.compareZero(x, 64);
-            DRes<SInt> compResult2 = comparison.compareZero(y, 64);
+            DRes<SInt> compResult1 = comparison.compareZero(w, 64);
+            DRes<SInt> compResult2 = comparison.compareZero(x, 64);
+            DRes<SInt> compResult3 = comparison.compareZero(y, 64);
+            DRes<SInt> compResult4 = comparison.compareZero(z, 64);
             Numeric open = builder.numeric();
-            DRes<BigInteger> res1 = open.open(x);
+            DRes<BigInteger> res1 = open.open(compResult1);
             DRes<BigInteger> res2 = open.open(compResult2);
-
-            return () -> new Pair<>(res1.out(), res2.out());
+            DRes<BigInteger> res3 = open.open(compResult3);
+            DRes<BigInteger> res4 = open.open(compResult4);
+            return () -> Arrays.asList(res1.out(), res2.out(), res3.out(), res4
+                .out());
           };
-          Pair<BigInteger, BigInteger> output = runApplication(app);
-//          Assert.assertEquals(BigInteger.ZERO, output.getFirst());
-          Assert.assertEquals(BigInteger.ONE, output.getSecond());
-
+          List<BigInteger> output = runApplication(app);
+          Assert.assertEquals(BigInteger.ZERO, output.get(0));
+          Assert.assertEquals(BigInteger.ONE, output.get(1));
+          Assert.assertEquals(BigInteger.ZERO, output.get(2));
+          Assert.assertEquals(BigInteger.ZERO, output.get(3));
         }
       };
     }
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index d909b1eeb..63e02962a 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -137,9 +137,7 @@ public void testCompareLtEdgeCasesSequential() {
 
   @Test
   public void test_compareEQ_Sequential() {
-    TestParameters params = new TestParameters().modulus(ModulusFinder
-        .findSuitableModulus(128));
-    runTest(new CompareTests.TestCompareEQ<>(), params);
+    runTest(new CompareTests.TestCompareEQ<>(), new TestParameters());
   }
 
   @Test
@@ -149,9 +147,7 @@ public void testCompareEqEdgeCasesSequential() {
 
   @Test
   public void test_compareZero_Sequential() {
-    TestParameters params = new TestParameters().modulus(ModulusFinder
-        .findSuitableModulus(128));
-    runTest(new CompareTests.TestCompareEQZero<>(), params);
+    runTest(new CompareTests.TestCompareEQZero<>(), new TestParameters());
   }
 
   @Test
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index fe178deda..166141cc6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -20,6 +20,11 @@ public CompUIntArithmetic(CompUIntFactory<CompT> factory) {
     this.powersOfTwo = initializePowersOfTwo(factory.getLowBitLength());
   }
 
+  @Override
+  public DRes<OInt> one() {
+    return factory.one();
+  }
+
   @Override
   public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
     CompUInt value = (CompUInt) openValue;

From 426fd43fd6c1cb5ec0806e041373039544bb88f9 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Wed, 2 May 2018 11:33:21 +0200
Subject: [PATCH 113/231] Cleaned a bit of equality code

---
 .../builder/numeric/DefaultComparison.java       |  2 +-
 .../fresco/lib/compare/lt/LessThanLogRounds.java | 16 ++++++++--------
 .../lib/compare/zerotest/ZeroTestLogRounds.java  |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 238ed3441..d1c15b517 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -44,7 +44,7 @@ public DRes<SInt> compareLEQLong(DRes<SInt> x, DRes<SInt> y) {
   @Override
   public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y,
       EqualityAlgorithm algorithm) {
-    int maxBitLength = 64;// builder.getBasicNumericContext().getMaxBitLength();
+    int maxBitLength = builder.getBasicNumericContext().getMaxBitLength();
     switch (algorithm) {
     case EQ_CONST_ROUNDS:
       return equalsConstRounds(maxBitLength, x, y);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
index de7d34314..cab23eddf 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
@@ -9,24 +9,24 @@
  * Given two secret values a and b computes a < b.
  */
 public class LessThanLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
-  // TODO add paper reference
-
   private final DRes<SInt> left;
   private final DRes<SInt> right;
-  private final int k;
-  private final int kappa;
+  private final int maxLength;
+  private final int securityParameter;
 
-  public LessThanLogRounds(DRes<SInt> left, DRes<SInt> right, int k, int kappa) {
+  public LessThanLogRounds(DRes<SInt> left, DRes<SInt> right, int maxLength,
+      int securityParameter) {
     this.left = left;
     this.right = right;
-    this.k = k;
-    this.kappa = kappa;
+    this.maxLength = maxLength;
+    this.securityParameter = securityParameter;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<SInt> difference = builder.numeric().sub(left, right);
-    return builder.seq(new LessThanZero(difference, k, kappa));
+    return builder.seq(new LessThanZero(difference, maxLength,
+        securityParameter));
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index 04bba7166..c073efd47 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -13,7 +13,7 @@
 
 public class ZeroTestLogRounds implements
     Computation<SInt, ProtocolBuilderNumeric> {
-
+  // TODO add paper reference
   private final int maxLength;
   private final int securityParameter;
   private final DRes<SInt> input;
@@ -57,6 +57,5 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           return seq.numeric().subFromOpen(seq.getOIntArithmetic().one(), seq
               .logical().orOfList(() -> d));
         });
-    // HARDCODED 64 LENGTH
   }
 }

From ded9fef5dc16c66b68be58fbff641e9f513388ba Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Wed, 2 May 2018 12:32:43 +0200
Subject: [PATCH 114/231] Fixed equality code bug

---
 .../fresco/framework/builder/numeric/DefaultLogical.java   | 6 +++---
 .../fresco/lib/compare/zerotest/ZeroTestLogRounds.java     | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 37fbfbe75..93338fc6d 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -151,8 +151,8 @@ public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
 
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
-    return builder.seq(seq -> bits).whileLoop((inputs) -> inputs
-        .size() > 1,
+    return builder.seq(seq -> bits
+        ).whileLoop((inputs) -> inputs.size() > 1,
         (prevSeq, inputs) -> prevSeq.par(par -> {
           List<DRes<SInt>> out = new ArrayList<>();
           DRes<SInt> left = null;
@@ -168,6 +168,6 @@ public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
             out.add(left);
           }
           return () -> out;
-        })).seq((builder, currentInput) -> currentInput.get(0));
+        })).seq((builder, out) -> out.get(0));
   }
 }
\ No newline at end of file
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index c073efd47..25c9a5fc5 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -29,9 +29,9 @@ public ZeroTestLogRounds(int maxLength, DRes<SInt> input,
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     return builder.seq(seq -> seq.advancedNumeric().randomBitMask(maxLength
         + securityParameter)).seq((seq, r) -> {
-          // Use the integer interpretation of r to compute c = 2^{k-1}+(input + r)
+          // Use the integer interpretation of r to compute c = 2^maxLength+(input + r)
           DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
-              .getOIntArithmetic().twoTo(maxLength - 1), seq.numeric().add(
+              .getOIntArithmetic().twoTo(maxLength), seq.numeric().add(
                   input, r.getValue())));
           return () -> new Pair<>(r.getBits(), c);
         }).seq((seq, pair) -> {
@@ -44,8 +44,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           return () -> new Pair<>(pair.getFirst().out(), cbits);
         }).par((par, pair) -> {
           List<DRes<SInt>> d = new ArrayList<>(maxLength);
-          // TODO why -1?
-          for (int i = 0; i < maxLength - 1; i++) {
+          for (int i = 0; i < maxLength; i++) {
             DRes<SInt> ri = pair.getFirst().get(i);
             DRes<OInt> ci = pair.getSecond().get(i);
             DRes<SInt> di = par.logical().xorKnown(ci, ri);

From 3a6311ea5de36feee084c2ffa9cc3cfef3ff2a3d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 3 May 2018 12:54:34 +0200
Subject: [PATCH 115/231] 65-bit mult

---
 .../spdz2k/datatypes/CompUInt128Bit.java      |  7 ++++-
 .../spdz2k/datatypes/TestCompUInt128Bit.java  | 31 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 85d57318f..b14a7f1ef 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -16,7 +16,12 @@ public class CompUInt128Bit extends CompUInt128 {
 
   @Override
   public CompUInt128 multiply(CompUInt128 other) {
-    return new CompUInt128Bit(high * other.high, mid & other.mid, low & other.low);
+    int bit = mid >>> 31;
+    int otherBit = other.mid >>> 31;
+    return new CompUInt128Bit(
+        ((high * other.high) << 1) + (high * otherBit) + (other.high * bit),
+        mid & other.mid,
+        0);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index 8c299eaf8..e277ba9c0 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -7,12 +7,22 @@
 
 public class TestCompUInt128Bit {
 
-  private final BigInteger twoTo128 = BigInteger.ONE.shiftLeft(128);
+  private static final BigInteger twoTo128 = BigInteger.ONE.shiftLeft(128);
 
   private static long rand(int seed) {
     return new Random(seed).nextLong();
   }
 
+  private static BigInteger bigInt128(BigInteger value65) {
+    return value65.shiftLeft(63).mod(twoTo128);
+  }
+
+  private static BigInteger bigInt65(long high, int bit) {
+    return BigInteger.valueOf(high).shiftLeft(1)
+        .add(BigInteger.valueOf(bit))
+        .mod(twoTo128);
+  }
+
   @Test
   public void testConstruct() {
     Assert.assertEquals(BigInteger.valueOf(111).shiftLeft(64),
@@ -44,4 +54,23 @@ public void testValueBit() {
         new CompUInt128Bit(0, 0).getValueBit());
   }
 
+  @Test
+  public void testMultiply() {
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 0).multiply(bigInt65(rand(4), 0))),
+        new CompUInt128Bit(rand(3), 0).multiply(new CompUInt128Bit(rand(4), 0)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 1).multiply(bigInt65(rand(4), 0))).toString(2),
+        new CompUInt128Bit(rand(3), 1).multiply(new CompUInt128Bit(rand(4), 0)).toBigInteger().toString(2)
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(1, 1).multiply(bigInt65(1, 1))),
+        new CompUInt128Bit(1, 1).multiply(new CompUInt128Bit(1, 1)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 1).multiply(bigInt65(rand(4), 1))),
+        new CompUInt128Bit(rand(3), 1).multiply(new CompUInt128Bit(rand(4), 1)).toBigInteger()
+    );
+  }
 }

From a59419ac0177a6de97ecf96ffbbfef2a947e6a81 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 3 May 2018 13:03:39 +0200
Subject: [PATCH 116/231] Addition

---
 .../spdz2k/datatypes/CompUInt128Bit.java      |  3 ++-
 .../spdz2k/datatypes/TestCompUInt128Bit.java  | 24 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index b14a7f1ef..f9bc51cc4 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -26,7 +26,8 @@ public CompUInt128 multiply(CompUInt128 other) {
 
   @Override
   public CompUInt128 add(CompUInt128 other) {
-    return new CompUInt128Bit(high + other.high, mid ^ other.mid, low ^ other.low);
+    CompUInt128 sum = super.add(other);
+    return new CompUInt128Bit(sum.high, sum.mid, sum.low);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index e277ba9c0..276bac85b 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -61,8 +61,8 @@ public void testMultiply() {
         new CompUInt128Bit(rand(3), 0).multiply(new CompUInt128Bit(rand(4), 0)).toBigInteger()
     );
     Assert.assertEquals(
-        bigInt128(bigInt65(rand(3), 1).multiply(bigInt65(rand(4), 0))).toString(2),
-        new CompUInt128Bit(rand(3), 1).multiply(new CompUInt128Bit(rand(4), 0)).toBigInteger().toString(2)
+        bigInt128(bigInt65(rand(3), 1).multiply(bigInt65(rand(4), 0))),
+        new CompUInt128Bit(rand(3), 1).multiply(new CompUInt128Bit(rand(4), 0)).toBigInteger()
     );
     Assert.assertEquals(
         bigInt128(bigInt65(1, 1).multiply(bigInt65(1, 1))),
@@ -73,4 +73,24 @@ public void testMultiply() {
         new CompUInt128Bit(rand(3), 1).multiply(new CompUInt128Bit(rand(4), 1)).toBigInteger()
     );
   }
+
+  @Test
+  public void testAdd() {
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 0).add(bigInt65(rand(4), 0))),
+        new CompUInt128Bit(rand(3), 0).add(new CompUInt128Bit(rand(4), 0)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 1).add(bigInt65(rand(4), 0))).toString(2),
+        new CompUInt128Bit(rand(3), 1).add(new CompUInt128Bit(rand(4), 0)).toBigInteger().toString(2)
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(1, 1).add(bigInt65(1, 1))),
+        new CompUInt128Bit(1, 1).add(new CompUInt128Bit(1, 1)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 1).add(bigInt65(rand(4), 1))),
+        new CompUInt128Bit(rand(3), 1).add(new CompUInt128Bit(rand(4), 1)).toBigInteger()
+    );
+  }
 }

From 3c1ab88b2d5d13afe0f514abb202c361e3d69d74 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 3 May 2018 13:21:36 +0200
Subject: [PATCH 117/231] Subtraction

---
 .../spdz2k/datatypes/CompUInt128Bit.java      |  5 +++-
 .../spdz2k/datatypes/TestCompUInt128Bit.java  | 25 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index f9bc51cc4..0e9a7f5bb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -2,6 +2,8 @@
 
 public class CompUInt128Bit extends CompUInt128 {
 
+  private static final CompUInt128Bit ONE = new CompUInt128Bit(0, 0x80000000, 0);
+
   CompUInt128Bit(long high, int mid, int low) {
     super(high, mid, low);
   }
@@ -32,7 +34,8 @@ public CompUInt128 add(CompUInt128 other) {
 
   @Override
   public CompUInt128 subtract(CompUInt128 other) {
-    return new CompUInt128Bit(high - other.high, mid ^ (~other.mid), low ^ (~other.low));
+    CompUInt128 negated = new CompUInt128Bit(~other.high, ~other.mid & 0x80000000, 0).add(ONE);
+    return this.add(negated);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index 276bac85b..f1d861fa4 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -82,7 +82,8 @@ public void testAdd() {
     );
     Assert.assertEquals(
         bigInt128(bigInt65(rand(3), 1).add(bigInt65(rand(4), 0))).toString(2),
-        new CompUInt128Bit(rand(3), 1).add(new CompUInt128Bit(rand(4), 0)).toBigInteger().toString(2)
+        new CompUInt128Bit(rand(3), 1).add(new CompUInt128Bit(rand(4), 0)).toBigInteger()
+            .toString(2)
     );
     Assert.assertEquals(
         bigInt128(bigInt65(1, 1).add(bigInt65(1, 1))),
@@ -93,4 +94,26 @@ public void testAdd() {
         new CompUInt128Bit(rand(3), 1).add(new CompUInt128Bit(rand(4), 1)).toBigInteger()
     );
   }
+
+  @Test
+  public void testSubtract() {
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 0).subtract(bigInt65(rand(4), 0))),
+        new CompUInt128Bit(rand(3), 0).subtract(new CompUInt128Bit(rand(4), 0)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 1).subtract(bigInt65(rand(4), 0))).toString(2),
+        new CompUInt128Bit(rand(3), 1).subtract(new CompUInt128Bit(rand(4), 0)).toBigInteger()
+            .toString(2)
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(1, 1).subtract(bigInt65(1, 1))),
+        new CompUInt128Bit(1, 1).subtract(new CompUInt128Bit(1, 1)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt128(bigInt65(rand(3), 1).subtract(bigInt65(rand(4), 1))),
+        new CompUInt128Bit(rand(3), 1).subtract(new CompUInt128Bit(rand(4), 1)).toBigInteger()
+    );
+  }
+
 }

From 2a77246de04262a2a3e77d7e567b87924fbcb11b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 3 May 2018 13:38:04 +0200
Subject: [PATCH 118/231] Restructure serialization

---
 .../fresco/suite/spdz2k/datatypes/CompUInt.java      |  8 ++++++++
 .../suite/spdz2k/datatypes/CompUInt128Bit.java       |  7 ++++++-
 .../fresco/suite/spdz2k/datatypes/Spdz2kSInt.java    |  8 ++++++--
 .../suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java | 12 +-----------
 .../suite/spdz2k/datatypes/Spdz2kSIntBoolean.java    | 10 ----------
 .../suite/spdz2k/datatypes/TestCompUInt128Bit.java   | 12 ++++++++++++
 6 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index b141fbd3b..15546e8ee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -81,6 +81,14 @@ default int getBitLength() {
     return getCompositeBitLength();
   }
 
+  default byte[] serializeWhole() {
+    return toByteArray();
+  }
+  
+  default byte[] serializeLeastSignificant() {
+    return getLeastSignificant().toByteArray();
+  }
+
   /**
    * Util for padding a byte array up to the required bit length. <p>Since we are working with
    * unsigned ints, the first byte of the passed in array is discarded if it's a zero byte.</p>
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 0e9a7f5bb..9051a4aa9 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -4,7 +4,7 @@ public class CompUInt128Bit extends CompUInt128 {
 
   private static final CompUInt128Bit ONE = new CompUInt128Bit(0, 0x80000000, 0);
 
-  CompUInt128Bit(long high, int mid, int low) {
+  private CompUInt128Bit(long high, int mid, int low) {
     super(high, mid, low);
   }
 
@@ -43,6 +43,11 @@ public CompUInt128 toBitRep() {
     throw new IllegalStateException("Already in bit form");
   }
 
+  @Override
+  public byte[] serializeLeastSignificant() {
+    return new byte[]{(byte) (mid >>> 31)};
+  }
+
   public boolean getValueBit() {
     return testBit(63);
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
index 037d0be3b..ae7f3dedb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
@@ -26,9 +26,13 @@ public PlainT getMacShare() {
     return macShare;
   }
 
-  public abstract byte[] serializeShareLow();
+  public byte[] serializeShareLow() {
+    return share.serializeLeastSignificant();
+  }
 
-  public abstract byte[] serializeShareWhole();
+  public byte[] serializeShareWhole() {
+    return share.serializeWhole();
+  }
 
   @Override
   public SInt out() {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
index 6817615e3..d25b0b370 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -63,17 +63,7 @@ public Spdz2kSIntArithmetic<PlainT> addConstant(
         isPartyOne);
     return add(wrapped);
   }
-
-  @Override
-  public byte[] serializeShareLow() {
-    return share.getLeastSignificant().toByteArray();
-  }
-
-  @Override
-  public byte[] serializeShareWhole() {
-    return share.toByteArray();
-  }
-
+  
   @Override
   public String toString() {
     return "Spdz2kSIntArithmetic{" +
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 7296bd639..3d0636528 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -76,16 +76,6 @@ public Spdz2kSIntArithmetic<PlainT> asArithmetic() {
     return new Spdz2kSIntArithmetic<>(share, macShare);
   }
 
-  @Override
-  public byte[] serializeShareLow() {
-    return share.getLeastSignificant().toByteArray();
-  }
-
-  @Override
-  public byte[] serializeShareWhole() {
-    return share.toByteArray();
-  }
-
   @Override
   public String toString() {
     return "Spdz2kSIntBoolean{" +
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index f1d861fa4..c65f6e5a6 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -116,4 +116,16 @@ public void testSubtract() {
     );
   }
 
+  @Test
+  public void testSerializeLeastSignificant() {
+    Assert.assertArrayEquals(
+        new byte[]{0},
+        new CompUInt128Bit(rand(42), 0).serializeLeastSignificant()
+    );
+    Assert.assertArrayEquals(
+        new byte[]{1},
+        new CompUInt128Bit(rand(42), 1).serializeLeastSignificant()
+    );
+  }
+
 }

From 198e5a92302168cd9ced9862bf391da4e707aeb1 Mon Sep 17 00:00:00 2001
From: Tore Kasper Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 3 May 2018 17:48:37 +0200
Subject: [PATCH 119/231] Refactored DefaultComparison and moved location of
 statistical security parameter

---
 .../framework/builder/numeric/Comparison.java | 116 +++++++++---------
 .../builder/numeric/DefaultComparison.java    |  84 +++++--------
 .../lib/compare/eq/EqualityConstRounds.java   |  44 -------
 .../lib/compare/eq/EqualityLogRounds.java     |  40 ------
 .../lib/compare/lt/LessThanLogRounds.java     |  32 -----
 .../lib/compare/lt/LessThanOrEquals.java      |  20 ++-
 .../fresco/lib/compare/lt/LessThanZero.java   |  15 +--
 .../compare/zerotest/ZeroTestConstRounds.java |  13 +-
 .../compare/zerotest/ZeroTestLogRounds.java   |  25 ++--
 .../field/integer/BasicNumericContext.java    |  41 ++++++-
 .../fresco/lib/lp/BlandEnteringVariable.java  |   2 +-
 .../arithmetic/ComparisonLoggerDecorator.java |  24 ++--
 .../fresco/lib/compare/CompareTests.java      |   3 +-
 .../lib/compare/lt/LessThanZeroTests.java     |   3 +-
 .../TestNumericSuiteLoggingDecorators.java    |   4 +-
 .../TestDummyArithmeticProtocolSuite.java     |   4 +-
 .../fresco/suite/spdz2k/Spdz2kComparison.java |   4 +-
 17 files changed, 184 insertions(+), 290 deletions(-)
 delete mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityConstRounds.java
 delete mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java
 delete mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index bbb266b4e..627eb4d4e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -12,76 +12,75 @@
 public interface Comparison extends ComputationDirectory {
 
   /**
-   * The different algorithms supported by Fresco.
+   * The different algorithms supported by Fresco. The enum is used to decide of whether an
+   * algorithm running in constant rounds or logarithmic rounds should be used. In general the
+   * logarithmic round choice is the fastest.
    */
-  public enum EqualityAlgorithm {
-    EQ_LOG_ROUNDS,
-    EQ_CONST_ROUNDS
+  public enum Algorithm {
+    LOG_ROUNDS, CONST_ROUNDS
   }
 
   /**
-   * The different algorithms supported by Fresco.
-   */
-  enum ComparisonAlgorithm {
-    LT_LOG_ROUNDS,
-    LT_CONST_ROUNDS
-  }
-
-  /**
-   * Compares two values and return x == y
+   * Computes x == y.
    *
-   * @param bitLength
-   *          The maximum bit-length of the numbers to compare.
    * @param x
-   *          The first number
+   *          the first input
    * @param y
-   *          The second number
-   * @return A deferred result computing x == y
+   *          the second input
+   * @param bitlength
+   *          the amount of bits to do the equality test on. Must be less than or equal to the max
+   *          bitlength allowed
+   * @param algorithm
+   *          the algorithm to use
+   * @return A deferred result computing x' == y'. Where x' and y' represent the {@code bitlength}
+   *         least significant bits of x, respectively y. Result will be either [1] (true) or [0]
+   *         (false).
    */
-  DRes<SInt> equals(int bitLength, DRes<SInt> x, DRes<SInt> y);
+  DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm algorithm);
 
   /**
-   * Computes x == y.
-   *
-   * @param x input
-   * @param y input
-   * @return A deferred result computing x == y. Result will be either [1] (true) or [0] (false).
+   * Call to {@link #equals(DRes, DRes, int, ComparisonAlgorithm)} with default comparison
+   * algorithm.
    */
-  DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, EqualityAlgorithm algorithm);
+  default DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength) {
+    return equals(x, y, bitlength, Algorithm.LOG_ROUNDS);
+  }
 
   /**
-   * Call to {@link #equals(DRes, DRes, ComparisonAlgorithm)} with default comparison algorithm.
+   * Call to {@link #equals(DRes, DRes, int, ComparisonAlgorithm)} with default comparison
+   * algorithm, checking equality of all bits.
    */
-  default DRes<SInt> equals(DRes<SInt> x1, DRes<SInt> x2) {
-    return equals(x1, x2, EqualityAlgorithm.EQ_LOG_ROUNDS);
-  }
+  DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y);
 
   /**
-   * Computes if x1 <= x2.
+   * Computes if x <= y.
    *
-   * @param x1
-   *          input
-   * @param x2
-   *          input
-   * @return A deferred result computing x1 <= x2. Result will be either [1] (true) or [0] (false).
+   * @param x
+   *          the first input
+   * @param y
+   *          the second input
+   * @return A deferred result computing x <= y. Result will be either [1] (true) or [0] (false).
    */
-  DRes<SInt> compareLEQ(DRes<SInt> x1, DRes<SInt> x2);
+  DRes<SInt> compareLEQ(DRes<SInt> x, DRes<SInt> y);
 
   /**
-   * Computes if x1 < x2.
+   * Computes if x < y.
    *
-   * @param x1 input
-   * @param x2 input
-   * @param algorithm the comparison algorithm to use
-   * @return A deferred result computing x1 <= x2. Result will be either [1] (true) or [0] (false).
+   * @param x
+   *          the first input
+   * @param y
+   *          the second input
+   * @param algorithm
+   *          the algorithm to use
+   * @return A deferred result computing x <= y. Result will be either [1] (true) or [0] (false).
    */
-  DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm);
+  DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y, Algorithm algorithm);
 
   /**
-   * Call to {@link #compareLT(DRes, DRes, ComparisonAlgorithm)} with default comparison algorithm.
+   * Call to {@link #compareLT(DRes, DRes, Algorithm)} with default comparison algorithm.
    */
-  default DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2) {
-    return compareLT(x1, x2, ComparisonAlgorithm.LT_LOG_ROUNDS);
+  default DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y) {
+    return compareLT(x, y, Algorithm.LOG_ROUNDS);
   }
 
   /**
@@ -99,15 +98,17 @@ default DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2) {
   DRes<SInt> compareLTBits(OInt openValue, List<DRes<SInt>> secretBits);
 
   /**
-   * Compares if x1 <= x2, but with twice the possible bit-length. Requires that the maximum bit
+   * Compares if x <= y, but with twice the possible bit-length. Requires that the maximum bit
    * length is set to something that can handle this scenario. It has to be at least less than half
    * the modulus bit size.
    *
-   * @param x1 input
-   * @param x2 input
-   * @return A deferred result computing x1 <= x2. Result will be either [1] (true) or [0] (false).
+   * @param x
+   *          the first input
+   * @param y
+   *          the second input
+   * @return A deferred result computing x <= y. Result will be either [1] (true) or [0] (false).
    */
-  DRes<SInt> compareLEQLong(DRes<SInt> x1, DRes<SInt> x2);
+  DRes<SInt> compareLEQLong(DRes<SInt> x, DRes<SInt> y);
 
   /**
    * Computes the sign of the value (positive or negative)
@@ -123,19 +124,20 @@ default DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2) {
    *
    * @param x
    *          the value to test against zero
-   * @param bitLength
-   *          bitlength including the sign bit
+   * @param bitlength
+   *          the amount of bits to do the zero-test on. Must be less than or equal to the modulus
+   *          bitlength
    * @param algorithm
    *          the algorithm to use for zero-equality test
-   * @return A deferred result computing x == 0. Result will be either [1] (true) or [0] (false)
+   * @return A deferred result computing x' == 0 where x' is the {@code bitlength} least significant
+   *         bits of x. Result will be either [1] (true) or [0] (false)
    */
-  DRes<SInt> compareZero(DRes<SInt> x, int bitLength,
-      EqualityAlgorithm algorithm);
+  DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm);
 
   /**
-   * Call to {@link #compareZero(DRes, int, ComparisonAlgorithm)} with default comparison algorithm.
+   * Call to {@link #compareZero(DRes, int, Algorithm)} with default comparison algorithm.
    */
   default DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
-    return compareZero(x, bitlength, EqualityAlgorithm.EQ_LOG_ROUNDS);
+    return compareZero(x, bitlength, Algorithm.LOG_ROUNDS);
   }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index d1c15b517..f25210db8 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -3,11 +3,9 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.compare.eq.EqualityConstRounds;
-import dk.alexandra.fresco.lib.compare.eq.EqualityLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
-import dk.alexandra.fresco.lib.compare.lt.LessThanLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.LessThanOrEquals;
+import dk.alexandra.fresco.lib.compare.lt.LessThanZero;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestConstRounds;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestLogRounds;
 
@@ -21,8 +19,6 @@
  */
 public class DefaultComparison implements Comparison {
 
-  // Security parameter used by protocols using rightshifts and/or additive masks.
-  protected final int magicSecureNumber = 40;
   protected final BuilderFactoryNumeric factoryNumeric;
   protected final ProtocolBuilderNumeric builder;
 
@@ -35,50 +31,27 @@ public DefaultComparison(BuilderFactoryNumeric factoryNumeric,
   @Override
   public DRes<SInt> compareLEQLong(DRes<SInt> x, DRes<SInt> y) {
     int bitLength = factoryNumeric.getBasicNumericContext().getMaxBitLength() * 2;
-    LessThanOrEquals leqProtocol = new LessThanOrEquals(
-        bitLength, magicSecureNumber, x, y);
+    LessThanOrEquals leqProtocol = new LessThanOrEquals(bitLength, x, y);
     return builder.seq(leqProtocol);
-
-  }
-
-  @Override
-  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y,
-      EqualityAlgorithm algorithm) {
-    int maxBitLength = builder.getBasicNumericContext().getMaxBitLength();
-    switch (algorithm) {
-    case EQ_CONST_ROUNDS:
-      return equalsConstRounds(maxBitLength, x, y);
-    case EQ_LOG_ROUNDS:
-      return equals(maxBitLength, x, y);
-    default:
-      throw new UnsupportedOperationException("Not implemented yet");
-    }
-  }
-
-  @Override
-  public DRes<SInt> equals(int bitLength, DRes<SInt> x, DRes<SInt> y) {
-    // TODO throw if maxBitLength + securityParameter > mod bit length
-    return builder.seq(new EqualityLogRounds(bitLength, x, y));
-  }
-
-  public DRes<SInt> equalsConstRounds(int bitLength, DRes<SInt> x,
-      DRes<SInt> y) {
-    return builder.seq(new EqualityConstRounds(bitLength, x, y));
   }
 
   @Override
   public DRes<SInt> compareLEQ(DRes<SInt> x, DRes<SInt> y) {
     int bitLength = factoryNumeric.getBasicNumericContext().getMaxBitLength();
-    return builder.seq(
-        new LessThanOrEquals(bitLength, magicSecureNumber, x, y));
+    return builder.seq(new LessThanOrEquals(bitLength, x, y));
   }
 
   @Override
-  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm) {
-    if (algorithm == ComparisonAlgorithm.LT_LOG_ROUNDS) {
-      int k = builder.getBasicNumericContext().getMaxBitLength();
-      // TODO throw if k + kappa > mod bit length
-      return builder.seq(new LessThanLogRounds(x1, x2, k, magicSecureNumber));
+  public DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y, Algorithm algorithm) {
+    if (algorithm == Algorithm.LOG_ROUNDS) {
+      if (factoryNumeric.getBasicNumericContext().getStatisticalSecurityParam() + factoryNumeric
+          .getBasicNumericContext().getMaxBitLength() > factoryNumeric.getBasicNumericContext()
+              .getModulus().bitLength()) {
+        throw new IllegalArgumentException(
+            "The max bitlength plus the statistical security parameter overflows the size of the modulus.");
+      }
+      DRes<SInt> difference = builder.numeric().sub(x, y);
+      return builder.seq(new LessThanZero(difference));
     } else {
       throw new UnsupportedOperationException("Not implemented yet");
     }
@@ -107,23 +80,32 @@ public DRes<SInt> sign(DRes<SInt> x) {
   }
 
   @Override
-  public DRes<SInt> compareZero(DRes<SInt> x, int bitLength) {
-    return builder.seq(new ZeroTestLogRounds(bitLength, x, magicSecureNumber));
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm algorithm) {
+    DRes<SInt> diff = builder.numeric().sub(x, y);
+    return compareZero(diff, bitlength, algorithm);
   }
 
-  public DRes<SInt> compareZeroConstRounds(DRes<SInt> x, int bitLength) {
-    return builder.seq(new ZeroTestConstRounds(bitLength, x, magicSecureNumber));
+  @Override
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y) {
+    int bitLength = factoryNumeric.getBasicNumericContext().getMaxBitLength();
+    return equals(x, y, bitLength);
   }
 
   @Override
-  public DRes<SInt> compareZero(DRes<SInt> x, int bitLength,
-      EqualityAlgorithm algorithm) {
-    // int maxBitLength = builder.getBasicNumericContext().getMaxBitLength();
+  public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm) {
+    if (bitlength > factoryNumeric.getBasicNumericContext().getMaxBitLength()) {
+      throw new IllegalArgumentException("The bitlength is more than allowed for elements.");
+    }
+    if (factoryNumeric.getBasicNumericContext().getStatisticalSecurityParam()
+        + bitlength > factoryNumeric.getBasicNumericContext().getModulus().bitLength()) {
+      throw new IllegalArgumentException(
+          "The max bitlength plus the statistical security parameter overflows the size of the modulus.");
+    }
     switch (algorithm) {
-    case EQ_CONST_ROUNDS:
-      return compareZeroConstRounds(x, bitLength);
-    case EQ_LOG_ROUNDS:
-      return compareZero(x, bitLength);
+    case CONST_ROUNDS:
+      return builder.seq(new ZeroTestConstRounds(x, bitlength));
+    case LOG_ROUNDS:
+      return builder.seq(new ZeroTestLogRounds(x, bitlength));
     default:
       throw new UnsupportedOperationException("Not implemented yet");
     }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityConstRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityConstRounds.java
deleted file mode 100644
index e376b0012..000000000
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityConstRounds.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package dk.alexandra.fresco.lib.compare.eq;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.Comparison.EqualityAlgorithm;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.SInt;
-
-/**
- * Implements an equality protocol -- given inputs x, y set output to x==y.
- *
- */
-public class EqualityConstRounds implements Computation<SInt, ProtocolBuilderNumeric> {
-
-  // params
-  private final int bitLength;
-  private final DRes<SInt> left;
-  private final DRes<SInt> right;
-
-  /**
-   * Constructs an instance of the Equality computation in a constant amount of rounds.
-   *
-   * @param bitLength
-   *          The maximum bit length of the inputs.
-   * @param left
-   *          The first element to compare.
-   * @param right
-   *          The second element to compare.
-   */
-  public EqualityConstRounds(
-      int bitLength, DRes<SInt> left, DRes<SInt> right) {
-    super();
-    this.bitLength = bitLength;
-    this.left = left;
-    this.right = right;
-  }
-
-  @Override
-  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> diff = builder.numeric().sub(left, right);
-    return builder.comparison().compareZero(diff, bitLength,
-        EqualityAlgorithm.EQ_CONST_ROUNDS);
-  }
-}
\ No newline at end of file
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java
deleted file mode 100644
index a54f8eac0..000000000
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/eq/EqualityLogRounds.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package dk.alexandra.fresco.lib.compare.eq;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.Comparison.EqualityAlgorithm;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.SInt;
-
-public class EqualityLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
-
-  // params
-  private final int bitLength;
-  private final DRes<SInt> left;
-  private final DRes<SInt> right;
-
-  /**
-   * Constructs an instance of the Equality computation using a logarithmic amount of rounds.
-   *
-   * @param bitLength
-   *          The maximum bit length of the inputs.
-   * @param left
-   *          The first element to compare.
-   * @param right
-   *          The second element to compare.
-   */
-  public EqualityLogRounds(int bitLength, DRes<SInt> left,
-      DRes<SInt> right) {
-    super();
-    this.bitLength = bitLength;
-    this.left = left;
-    this.right = right;
-  }
-
-  @Override
-  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> diff = builder.numeric().sub(left, right);
-    return builder.comparison().compareZero(diff, bitLength,
-        EqualityAlgorithm.EQ_LOG_ROUNDS);
-  }
-}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
deleted file mode 100644
index cab23eddf..000000000
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanLogRounds.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package dk.alexandra.fresco.lib.compare.lt;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.SInt;
-
-/**
- * Given two secret values a and b computes a < b.
- */
-public class LessThanLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
-  private final DRes<SInt> left;
-  private final DRes<SInt> right;
-  private final int maxLength;
-  private final int securityParameter;
-
-  public LessThanLogRounds(DRes<SInt> left, DRes<SInt> right, int maxLength,
-      int securityParameter) {
-    this.left = left;
-    this.right = right;
-    this.maxLength = maxLength;
-    this.securityParameter = securityParameter;
-  }
-
-  @Override
-  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> difference = builder.numeric().sub(left, right);
-    return builder.seq(new LessThanZero(difference, maxLength,
-        securityParameter));
-  }
-
-}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
index 35b1fe1d3..812080118 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
@@ -12,36 +12,34 @@
 import java.util.List;
 
 public class LessThanOrEquals implements Computation<SInt, ProtocolBuilderNumeric> {
+  // params etc
+  private final int bitLength;
+  private final DRes<SInt> x;
+  private final DRes<SInt> y;
 
-  public LessThanOrEquals(int bitLength, int securityParameter, DRes<SInt> x, DRes<SInt> y) {
+  public LessThanOrEquals(int bitLength, DRes<SInt> x, DRes<SInt> y) {
     this.bitLength = bitLength;
-    this.securityParameter = securityParameter;
     this.x = x;
     this.y = y;
   }
 
-  // params etc
-  private final int bitLength;
-  private final int securityParameter;
-  private final DRes<SInt> x;
-  private final DRes<SInt> y;
-
   @SuppressWarnings("unchecked")
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    final int statisticalSecurity = builder.getBasicNumericContext().getStatisticalSecurityParam();
     final BigInteger modulus = builder.getBasicNumericContext().getModulus();
 
     final int bitLengthBottom = bitLength / 2;
     final int bitLengthTop = bitLength - bitLengthBottom;
 
-    final BigInteger twoToBitLength = BigInteger.ONE.shiftLeft(this.bitLength);
+    final BigInteger twoToBitLength = BigInteger.ONE.shiftLeft(bitLength);
     final BigInteger twoToBitLengthBottom = BigInteger.ONE.shiftLeft(bitLengthBottom);
     final BigInteger twoToNegBitLength = twoToBitLength.modInverse(modulus);
 
     final BigInteger one = BigInteger.ONE;
 
     return builder.seq((seq) -> seq.advancedNumeric()
-        .additiveMask(bitLength + securityParameter))
+        .additiveMask(bitLength + statisticalSecurity))
         .pairInPar((seq, mask) -> {
           List<DRes<SInt>> bits = mask.bits.subList(0, bitLength);
           List<DRes<SInt>> rBottomBits = bits.subList(0, bitLengthBottom);
@@ -132,7 +130,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
             // compare the half-length inputs
             int nextBitLength = (bitLength + 1) / 2;
             subComparisonResult =
-                seq.seq(new LessThanOrEquals(nextBitLength, securityParameter, rPrime, mPrime));
+                seq.seq(new LessThanOrEquals(nextBitLength, rPrime, mPrime));
           }
           return () -> new Object[] {subComparisonResult, mBar, rBar, z};
         }).seq((ProtocolBuilderNumeric seq, Object[] input) -> {
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanZero.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanZero.java
index 92aa2c36e..b7f3c30d5 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanZero.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanZero.java
@@ -15,28 +15,25 @@ public class LessThanZero implements Computation<SInt, ProtocolBuilderNumeric> {
   // TODO add reference to protocol description
 
   private final DRes<SInt> input;
-  private final int k;
-  private final int kappa;
 
   /**
    * Constructs new {@link LessThanZero}.
    *
    * @param input input to compare to 0
-   * @param k bit length of input
-   * @param kappa computational security parameter
    */
-  public LessThanZero(DRes<SInt> input, int k, int kappa) {
+  public LessThanZero(DRes<SInt> input) {
     this.input = input;
-    this.k = k;
-    this.kappa = kappa;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> inputMod2m = builder.seq(new Mod2m(input, k - 1, k, kappa));
+    final int maxBitlength = builder.getBasicNumericContext().getMaxBitLength();
+    final int statisticalSecurity = builder.getBasicNumericContext().getStatisticalSecurityParam();
+    DRes<SInt> inputMod2m = builder.seq(new Mod2m(input, maxBitlength - 1, maxBitlength,
+        statisticalSecurity));
     Numeric numeric = builder.numeric();
     DRes<SInt> difference = numeric.sub(input, inputMod2m);
-    BigInteger twoToMinusM = builder.getBigIntegerHelper().invertPowerOfTwo(k - 1);
+    BigInteger twoToMinusM = builder.getBigIntegerHelper().invertPowerOfTwo(maxBitlength - 1);
     return numeric.sub(BigInteger.ZERO, numeric.mult(twoToMinusM, difference));
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestConstRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestConstRounds.java
index fb18e7bd3..c6d2d3034 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestConstRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestConstRounds.java
@@ -11,19 +11,18 @@
  */
 public class ZeroTestConstRounds implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final int securityParameter;
-  private final int bitLength;
   private final DRes<SInt> input;
+  private final int maxBitlength;
 
-  public ZeroTestConstRounds(int bitLength, DRes<SInt> input, int securityParameter) {
-    this.bitLength = bitLength;
+  public ZeroTestConstRounds(DRes<SInt> input, int maxBitlength) {
     this.input = input;
-    this.securityParameter = securityParameter;
+    this.maxBitlength = maxBitlength;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<SInt> reduced = builder.seq(new ZeroTestReducer(bitLength, input, securityParameter));
-    return builder.seq(new ZeroTestBruteforce(bitLength, reduced));
+    final int statisticalSecurity = builder.getBasicNumericContext().getStatisticalSecurityParam();
+    DRes<SInt> reduced = builder.seq(new ZeroTestReducer(maxBitlength, input, statisticalSecurity));
+    return builder.seq(new ZeroTestBruteforce(maxBitlength, reduced));
   }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index 25c9a5fc5..99df10ad7 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -11,40 +11,37 @@
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 
-public class ZeroTestLogRounds implements
-    Computation<SInt, ProtocolBuilderNumeric> {
+public class ZeroTestLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
   // TODO add paper reference
-  private final int maxLength;
-  private final int securityParameter;
   private final DRes<SInt> input;
+  private final int maxBitlength;
 
-  public ZeroTestLogRounds(int maxLength, DRes<SInt> input,
-      int securityParameter) {
-    this.maxLength = maxLength;
-    this.securityParameter = securityParameter;
+  public ZeroTestLogRounds(DRes<SInt> input, int maxBitlength) {
     this.input = input;
+    this.maxBitlength = maxBitlength;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    return builder.seq(seq -> seq.advancedNumeric().randomBitMask(maxLength
-        + securityParameter)).seq((seq, r) -> {
+    final int statisticalSecurity = builder.getBasicNumericContext().getStatisticalSecurityParam();
+    return builder.seq(seq -> seq.advancedNumeric().randomBitMask(maxBitlength
+        + statisticalSecurity)).seq((seq, r) -> {
           // Use the integer interpretation of r to compute c = 2^maxLength+(input + r)
           DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
-              .getOIntArithmetic().twoTo(maxLength), seq.numeric().add(
+              .getOIntArithmetic().twoTo(maxBitlength), seq.numeric().add(
                   input, r.getValue())));
           return () -> new Pair<>(r.getBits(), c);
         }).seq((seq, pair) -> {
           List<DRes<OInt>> cbits = seq.getOIntArithmetic().toBits(pair
-              .getSecond().out(), maxLength);
+              .getSecond().out(), maxBitlength);
           // Reverse the bits of c as they are stored in big endian whereas the
           // composed r values from random bit mask will be in little endian as
           // it is based on a list of bits
           Collections.reverse(cbits);
           return () -> new Pair<>(pair.getFirst().out(), cbits);
         }).par((par, pair) -> {
-          List<DRes<SInt>> d = new ArrayList<>(maxLength);
-          for (int i = 0; i < maxLength; i++) {
+          List<DRes<SInt>> d = new ArrayList<>(maxBitlength);
+          for (int i = 0; i < maxBitlength; i++) {
             DRes<SInt> ri = pair.getFirst().get(i);
             DRes<OInt> ci = pair.getSecond().get(i);
             DRes<SInt> di = par.logical().xorKnown(ci, ri);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java b/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
index 8e2dccade..7bd19f58d 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
@@ -6,26 +6,57 @@
  * Holds the most crucial properties about the finite field we are working within.
  */
 public class BasicNumericContext {
+  // TODO temporary hardcoded statistical security parameter
+  private static final int DEFAULT_STATISTICAL_SECURITY = 40;
 
+  private final int statisticalSecurityParam;
   private final int maxBitLength;
   private final BigInteger modulus;
   private final int myId;
   private final int noOfParties;
 
   /**
-   * @param maxBitLength The maximum length in bits that the numbers in the application will
-   *     have.
-   * @param modulus the modules used in the application
-   * @param myId my party id
-   * @param noOfParties number of parties in computation
+   * @param maxBitLength
+   *          The maximum length in bits that the numbers in the application will have.
+   * @param modulus
+   *          the modules used in the application
+   * @param myId
+   *          my party id
+   * @param noOfParties
+   *          number of parties in computation
    */
   public BasicNumericContext(int maxBitLength, BigInteger modulus, int myId, int noOfParties) {
+    this(maxBitLength, modulus, myId, noOfParties, DEFAULT_STATISTICAL_SECURITY);
+  }
+
+  /**
+   * @param maxBitLength
+   *          The maximum length in bits that the numbers in the application will have.
+   * @param modulus
+   *          the modules used in the application
+   * @param myId
+   *          my party id
+   * @param noOfParties
+   *          number of parties in computation
+   * @param statisticalSecurityParameter
+   *          the statistical security parameter
+   */
+  public BasicNumericContext(int maxBitLength, BigInteger modulus, int myId, int noOfParties,
+      int statisticalSecurityParam) {
+    this.statisticalSecurityParam = statisticalSecurityParam;
     this.maxBitLength = maxBitLength;
     this.modulus = modulus;
     this.myId = myId;
     this.noOfParties = noOfParties;
   }
 
+  /**
+   * Returns the statistical security parameter.
+   */
+  public int getStatisticalSecurityParam() {
+    return this.statisticalSecurityParam;
+  }
+
   /**
    * Returns the maximum number of bits a number in the field can contain.
    */
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/lp/BlandEnteringVariable.java b/core/src/main/java/dk/alexandra/fresco/lib/lp/BlandEnteringVariable.java
index d68438c51..607405484 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/lp/BlandEnteringVariable.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/lp/BlandEnteringVariable.java
@@ -77,7 +77,7 @@ public DRes<Pair<List<DRes<SInt>>, SInt>> buildComputation(
           int bitlength = (int) Math.log(pairwiseSums.size()) * 2 + 1;
           Comparison comparison = par.comparison();
           for (int i = 0; i < updatedF.size(); i++) {
-            enteringIndex.add(comparison.equals(bitlength, pairwiseSums.get(i), one));
+            enteringIndex.add(comparison.equals(pairwiseSums.get(i), one, bitlength));
           }
           return () -> enteringIndex;
         })).seq((seq, enteringIndex) -> {
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 67039e5b7..55462c6b9 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -30,14 +30,19 @@ public ComparisonLoggerDecorator(Comparison delegate) {
   }
 
   @Override
-  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y,
-      EqualityAlgorithm algorithm) {
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm algorithm) {
     eqCount++;
-    return this.delegate.equals(x, y, algorithm);
+    return this.delegate.equals(x, y, bitlength, algorithm);
   }
 
   @Override
-  public DRes<SInt> equals(int bitLength, DRes<SInt> x, DRes<SInt> y) {
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength) {
+    eqCount++;
+    return this.delegate.equals(x, y, bitlength);
+  }
+
+  @Override
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y) {
     eqCount++;
     return this.delegate.equals(x, y);
   }
@@ -49,7 +54,7 @@ public DRes<SInt> compareLEQ(DRes<SInt> x1, DRes<SInt> x2) {
   }
 
   @Override
-  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm) {
+  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, Algorithm algorithm) {
     ltCount++;
     return this.delegate.compareLT(x1, x2, algorithm);
   }
@@ -78,16 +83,15 @@ public DRes<SInt> sign(DRes<SInt> x) {
   }
 
   @Override
-  public DRes<SInt> compareZero(DRes<SInt> x, int bitLength) {
+  public DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
     comp0Count++;
-    return this.delegate.compareZero(x, bitLength);
+    return this.delegate.compareZero(x, bitlength);
   }
 
   @Override
-  public DRes<SInt> compareZero(DRes<SInt> x, int bitLength,
-      EqualityAlgorithm algorithm) {
+  public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm) {
     comp0Count++;
-    return this.delegate.compareZero(x, bitLength);
+    return this.delegate.compareZero(x, bitlength);
   }
 
   @Override
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index fc69467ef..53045a237 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -6,7 +6,6 @@
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
 import dk.alexandra.fresco.framework.builder.binary.ProtocolBuilderBinary;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
-import dk.alexandra.fresco.framework.builder.numeric.Comparison.ComparisonAlgorithm;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
@@ -404,7 +403,7 @@ public void test() {
             List<DRes<SInt>> actualInner = new ArrayList<>(left.size());
             for (int i = 0; i < left.size(); i++) {
               actualInner.add(builder.comparison().compareLT(left.get(i), right.get(i),
-                  ComparisonAlgorithm.LT_LOG_ROUNDS));
+                  Comparison.Algorithm.LOG_ROUNDS));
             }
             DRes<List<DRes<BigInteger>>> opened = builder.collections().openList(() -> actualInner);
             return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/LessThanZeroTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/LessThanZeroTests.java
index f298b2634..03aad6d13 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/LessThanZeroTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/LessThanZeroTests.java
@@ -52,11 +52,10 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
             Numeric numeric = builder.numeric();
-            int kappa = 40;
             List<DRes<SInt>> inputs = numeric.known(openInputs);
             List<DRes<SInt>> actualInner = new ArrayList<>(inputs.size());
             for (DRes<SInt> input : inputs) {
-              actualInner.add(builder.seq(new LessThanZero(input, 64, kappa)));
+              actualInner.add(builder.seq(new LessThanZero(input)));
             }
             DRes<List<DRes<BigInteger>>> opened = builder.collections().openList(() -> actualInner);
             return () -> opened.out().stream().map(DRes::out).collect(Collectors.toList());
diff --git a/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java b/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java
index 9d60d8702..09a615cb9 100644
--- a/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java
+++ b/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java
@@ -53,7 +53,7 @@ public void testNumericLoggingDecorator() {
     BigInteger mod = new BigInteger(
         "6703903964971298549787012499123814115273848577471136527425966013026501536706464354255445443244279389455058889493431223951165286470575994074291745908195329");
 
-    Map<Integer, NumericSuiteLogging<DummyArithmeticResourcePool>> performanceLoggers 
+    Map<Integer, NumericSuiteLogging<DummyArithmeticResourcePool>> performanceLoggers
       = new HashMap<>();
 
     for (int playerId : netConf.keySet()) {
@@ -118,7 +118,7 @@ public void testComparisonLoggingDecorator() {
     BigInteger mod = new BigInteger(
         "6703903964971298549787012499123814115273848577471136527425966013026501536706464354255445443244279389455058889493431223951165286470575994074291745908195329");
 
-    Map<Integer, NumericSuiteLogging<DummyArithmeticResourcePool>> performanceLoggers 
+    Map<Integer, NumericSuiteLogging<DummyArithmeticResourcePool>> performanceLoggers
       = new HashMap<>();
 
     for (int playerId : netConf.keySet()) {
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 63e02962a..9e98abd24 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -874,7 +874,9 @@ public void testBitLessThanOpen() {
   @Test
   public void testLessThanZero() {
     BigInteger modulus = ModulusFinder.findSuitableModulus(128);
-    TestParameters parameters = new TestParameters().numParties(2).modulus(modulus);
+    int maxBitLength = 64;
+    TestParameters parameters = new TestParameters().numParties(2).modulus(modulus).maxBitLength(
+        maxBitLength);
     runTest(new TestLessThanZero<>(modulus), parameters);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index 951c834ad..aadbaee9c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -24,8 +24,8 @@ public Spdz2kComparison(
   }
 
   @Override
-  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, ComparisonAlgorithm algorithm) {
-    if (algorithm == ComparisonAlgorithm.LT_CONST_ROUNDS) {
+  public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, Algorithm algorithm) {
+    if (algorithm == Algorithm.CONST_ROUNDS) {
       throw new UnsupportedOperationException(
           "No constant round comparison protocol implemented for Spdz2k");
     } else {

From a15bd8674da127e727f1cb7c4894b296cf008289 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Sat, 5 May 2018 18:18:03 +0200
Subject: [PATCH 120/231] And/ xor tests passing

---
 .../builder/numeric/DefaultCollections.java   |   8 +-
 .../builder/numeric/DefaultLogical.java       |  17 +-
 .../framework/builder/numeric/Logical.java    |  12 +
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |   2 +-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |   6 +
 .../spdz2k/datatypes/CompUInt128Bit.java      |  13 +
 .../spdz2k/datatypes/CompUInt128Factory.java  |   5 +
 .../spdz2k/datatypes/CompUIntFactory.java     |   4 +
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   |   6 +-
 .../Spdz2kMacCheckComputation.java            |   2 +-
 .../protocols/natives/Spdz2kAndProtocol.java  |  80 ++++--
 .../protocols/natives/Spdz2kXorProtocol.java  |  38 +++
 .../storage/Spdz2kDummyDataSupplier.java      |   2 +-
 .../Spdz2kRoundSynchronization.java           |   2 +-
 .../spdz2k/datatypes/TestCompUInt128Bit.java  |  10 +
 .../datatypes/TestSpdz2kSIntBoolean.java      |  27 ++
 .../TestSpdz2kLogicalOperations.java          | 235 +++++++++++++++++-
 .../storage/TestSpdz2kDummyDataSupplier.java  |   2 +-
 18 files changed, 438 insertions(+), 33 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
index e62f5be45..05e8b990e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
@@ -42,7 +42,11 @@ public DRes<RowPairD<BigInteger, BigInteger>> openRowPair(DRes<RowPairD<SInt, SI
 
   @Override
   public DRes<List<DRes<SInt>>> closeList(List<BigInteger> openList, int inputParty) {
-    return builder.par(new CloseList(openList, inputParty));
+    if (builder.getBasicNumericContext().getMyId() == 1) {
+      return builder.par(new CloseList(openList, inputParty));
+    } else {
+      return builder.par(new CloseList(openList.size(), inputParty));
+    }
   }
 
   @Override
@@ -96,7 +100,7 @@ public DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int[] i
 
   @Override
   public DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int permProviderPid) {
-    return builder.seq(new PermuteRows(values, new int[] {}, permProviderPid, false));
+    return builder.seq(new PermuteRows(values, new int[]{}, permProviderPid, false));
   }
 
   @Override
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 93338fc6d..bca8220d0 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -35,6 +35,11 @@ public DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB) {
     });
   }
 
+  @Override
+  public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
     return builder.seq(seq -> seq.numeric().multByOpen(knownBit, secretBit));
@@ -149,6 +154,16 @@ public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
     });
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseXor(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    return builder.par(par -> {
+      BiFunction<DRes<SInt>, DRes<SInt>, DRes<SInt>> f = (left, right) -> par.logical()
+          .xor(left, right);
+      return pairWise(bitsA, bitsB, f);
+    });
+  }
+
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
     return builder.seq(seq -> bits
@@ -170,4 +185,4 @@ public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
           return () -> out;
         })).seq((builder, out) -> out.get(0));
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index 8d69a6ab8..a60dee9f1 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -24,6 +24,11 @@ public interface Logical extends ComputationDirectory {
    */
   DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB);
 
+  /**
+   * Computes logical XOR of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
+   */
+  DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB);
+
   /**
    * Computes logical AND of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
    */
@@ -71,6 +76,13 @@ DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
   DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB);
 
+  /**
+   * Computes pairwise logical XOR of input bits. <p>NOTE: Inputs must represent 0 or 1 values
+   * only.</p>
+   */
+  DRes<List<DRes<SInt>>> pairWiseXor(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB);
+
   /**
    * Computes pairwise logical XOR of input bits. <p>NOTE: Inputs must represent 0 or 1 values
    * only.</p>
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 89ee55009..142b0c688 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -197,7 +197,7 @@ public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
           Spdz2kSIntArithmetic<PlainT> value = factory.toSpdz2kSIntArithmetic(arithmeticValue);
           return new Spdz2kSIntBoolean<>(
               value.getShare().toBitRep(),
-              value.getMacShare().toBitRep()
+              value.getMacShare().shiftLeft(63)
           );
         };
       }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index ca2fbb3f6..3ff67fd6a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -10,6 +10,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
 
 /**
  * Logical operators for Spdz2k on boolean shares. <p>NOTE: requires that inputs have previously
@@ -31,6 +32,11 @@ public DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB) {
     return builder.append(new Spdz2kAndProtocol<>(bitA, bitB));
   }
 
+  @Override
+  public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
+    return builder.append(new Spdz2kXorProtocol<>(bitA, bitB));
+  }
+
   @Override
   public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 9051a4aa9..d7e2e75e8 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -18,6 +18,7 @@ private CompUInt128Bit(long high, int mid, int low) {
 
   @Override
   public CompUInt128 multiply(CompUInt128 other) {
+//    CompUInt128Bit test = ((CompUInt128Bit) other);
     int bit = mid >>> 31;
     int otherBit = other.mid >>> 31;
     return new CompUInt128Bit(
@@ -28,12 +29,14 @@ public CompUInt128 multiply(CompUInt128 other) {
 
   @Override
   public CompUInt128 add(CompUInt128 other) {
+//    CompUInt128Bit test = ((CompUInt128Bit) other);
     CompUInt128 sum = super.add(other);
     return new CompUInt128Bit(sum.high, sum.mid, sum.low);
   }
 
   @Override
   public CompUInt128 subtract(CompUInt128 other) {
+//    CompUInt128Bit test = ((CompUInt128Bit) other);
     CompUInt128 negated = new CompUInt128Bit(~other.high, ~other.mid & 0x80000000, 0).add(ONE);
     return this.add(negated);
   }
@@ -43,6 +46,16 @@ public CompUInt128 toBitRep() {
     throw new IllegalStateException("Already in bit form");
   }
 
+  @Override
+  public CompUInt128 toArithmeticRep() {
+    return new CompUInt128(high, mid, low);
+  }
+
+  @Override
+  public String toString() {
+    return toBigInteger().toString() + "B";
+  }
+
   @Override
   public byte[] serializeLeastSignificant() {
     return new byte[]{(byte) (mid >>> 31)};
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
index 8232a7ac5..9a8bbb659 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
@@ -24,6 +24,11 @@ public CompUInt128 createRandom() {
     return createFromBytes(bytes);
   }
 
+  @Override
+  public CompUInt128 fromBit(int bit) {
+    return new CompUInt128Bit(0L, bit);
+  }
+
   @Override
   public ByteSerializer<CompUInt128> createSerializer() {
     return new UIntSerializer<>(this);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index 6d0c69a7d..4cf95bcd4 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -35,6 +35,10 @@ default OInt fromLong(long value) {
     return fromBigInteger(BigInteger.valueOf(value));
   }
 
+  default CompT fromBit(int bit) {
+    throw new UnsupportedOperationException();
+  }
+
   /**
    * Get result from deferred and downcast result to {@link CompT}.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 3d0636528..0273861a1 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -21,7 +21,7 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macShare) {
    * others store 0.</p>
    */
   public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
-    this(isPartyOne ? share : zero, share.multiply(macKeyShare));
+    this(isPartyOne ? share : zero, share.toArithmeticRep().multiply(macKeyShare));
   }
 
   /**
@@ -50,7 +50,7 @@ public Spdz2kSIntBoolean<PlainT> subtract(Spdz2kSIntBoolean<PlainT> other) {
   public Spdz2kSIntBoolean<PlainT> multiply(PlainT other) {
     return new Spdz2kSIntBoolean<>(
         share.multiply(other),
-        macShare.multiply(other)
+        macShare.multiply(other.toArithmeticRep())
     );
   }
 
@@ -73,7 +73,7 @@ public Spdz2kSIntBoolean<PlainT> addConstant(
   }
 
   public Spdz2kSIntArithmetic<PlainT> asArithmetic() {
-    return new Spdz2kSIntArithmetic<>(share, macShare);
+    return new Spdz2kSIntArithmetic<>(share.toArithmeticRep(), macShare);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
index 6af582562..9b6ba172a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
@@ -77,7 +77,7 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
             return new BroadcastComputation<ProtocolBuilderNumeric>(sharesLowBits)
                 .buildComputation(seq);
           } else {
-            return () -> null;
+            return null;
           }
         })
         .seq((seq, ignored) -> computePValues(seq, authenticatedElements, r))
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
index 5405b7a5f..889149104 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
@@ -39,8 +39,7 @@ public Spdz2kAndProtocol(DRes<SInt> left, DRes<SInt> right) {
   @Override
   public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
       Network network) {
-    final PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
-    ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
       triple = resourcePool.getDataSupplier().getNextBitTripleShares();
@@ -51,29 +50,41 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
       Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
-          factory,
           resourcePool.getNoOfParties(),
-          serializer);
+          factory, null);
       // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
       PlainT e = epsilonAndDelta.getFirst();
       PlainT d = epsilonAndDelta.getSecond();
       PlainT ed = e.multiply(d);
-      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
       Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
       Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
       this.product = tripleProduct
-          .add(tripleRight.multiply(e))
-          .add(tripleLeft.multiply(d))
+          .add(e.testBit(63) ? tripleRight : new Spdz2kSIntBoolean<>(factory.zero().toBitRep(), factory.zero()))
+          .add(d.testBit(63) ? tripleLeft : new Spdz2kSIntBoolean<>(factory.zero().toBitRep(), factory.zero()))
+//          .add(tripleLeft)
+//      this.product = tripleProduct
+//          .add(tripleRight.multiply(e))
+//          .add(tripleLeft.multiply(d))
           .addConstant(ed,
               macKeyShare,
-              factory.zero(),
+              factory.zero().toBitRep(),
               resourcePool.getMyId() == 1);
+//      System.out.println(product);
+//      System.out.println();
+      // seems that shares need to be reconstructed arithmetically?
       resourcePool.getOpenedValueStore().pushOpenedValues(
           Arrays.asList(
+//              epsilon.asArithmetic(),
               epsilon.asArithmetic(),
               delta.asArithmetic()
           ),
-          Arrays.asList(e, d)
+          Arrays.asList(
+              e.toArithmeticRep(),
+              d.toArithmeticRep()
+//              factory.one().shiftLeft(64)
+//              e.toArithmeticRep().multiply(factory.two())
+          )
       );
       return EvaluationStatus.IS_DONE;
     }
@@ -82,18 +93,57 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
   /**
    * Retrieves shares for epsilon and delta and reconstructs each.
    */
+  private int[] receiveAndReconstruct(Network network,
+      int noOfParties) {
+    int e = 0;
+    int d = 0;
+    for (int i = 1; i <= noOfParties; i++) {
+      e = e ^ network.receive(i)[0];
+      d = d ^ network.receive(i)[0];
+    }
+    return new int[]{e, d};
+  }
+
   private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
-      CompUIntFactory<PlainT> factory, int noOfParties,
+      int noOfParties, CompUIntFactory<PlainT> factory) {
+    int e = 0;
+    int d = 0;
+    for (int i = 1; i <= noOfParties; i++) {
+      e = e ^ network.receive(i)[0];
+      d = d ^ network.receive(i)[0];
+    }
+    return new Pair<>(factory.fromBit(e), factory.fromBit(d));
+  }
+
+  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
+      int noOfParties, CompUIntFactory<PlainT> factory,
       ByteSerializer<PlainT> serializer) {
-    PlainT e = factory.zero().toBitRep();
-    PlainT d = factory.zero().toBitRep();
+    PlainT e = factory.zero();
+    PlainT d = factory.zero();
     for (int i = 1; i <= noOfParties; i++) {
-      e = e.add(serializer.deserialize(network.receive(i)));
-      d = d.add(serializer.deserialize(network.receive(i)));
+      byte[] bytesE = network.receive(i);
+      byte[] tempE = new byte[16];
+      tempE[15] = bytesE[0];
+      e = e.add(factory.createFromBytes(tempE));
+      byte[] bytesD = network.receive(i);
+      byte[] tempD = new byte[16];
+      tempD[15] = bytesD[0];
+      d = d.add(factory.createFromBytes(tempD));
     }
-    return new Pair<>(e, d);
+    return new Pair<>(e.toBitRep(), d.toBitRep());
   }
 
+//  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
+//      int noOfParties, CompUIntFactory<PlainT> factory) {
+//    int e = 0;
+//    int d = 0;
+//    for (int i = 1; i <= noOfParties; i++) {
+//      e = e ^ network.receive(i)[0];
+//      d = d ^ network.receive(i)[0];
+//    }
+//    return new Pair<>(factory.fromBit(e), factory.fromBit(d));
+//  }
+
   @Override
   public SInt out() {
     return product;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java
new file mode 100644
index 000000000..e6d5c1ed5
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java
@@ -0,0 +1,38 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+public class Spdz2kXorProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<SInt> left;
+  private final DRes<SInt> right;
+  private SInt result;
+
+  public Spdz2kXorProtocol(
+      DRes<SInt> left,
+      DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    Spdz2kSIntBoolean<PlainT> leftBit = resourcePool.getFactory().toSpdz2kSIntBoolean(left);
+    Spdz2kSIntBoolean<PlainT> rightBit = resourcePool.getFactory().toSpdz2kSIntBoolean(right);
+    result = leftBit.add(rightBit);
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public SInt out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index b9aa64d60..471aed69f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -87,7 +87,7 @@ private Spdz2kSIntArithmetic<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> r
   private Spdz2kSIntBoolean<PlainT> toSpdz2kSIntBool(Pair<BigInteger, BigInteger> raw) {
     PlainT openValue = factory.createFromBigInteger(raw.getFirst()).toBitRep();
     PlainT share = factory.createFromBigInteger(raw.getSecond()).toBitRep();
-    PlainT macShare = openValue.multiply(secretSharedKey);
+    PlainT macShare = openValue.toArithmeticRep().multiply(secretSharedKey);
     return new Spdz2kSIntBoolean<>(share, macShare);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 1948abf72..83fbe28ee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -65,7 +65,7 @@ private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network
         resourcePool, converter);
     ProtocolBuilderNumeric sequential = builder.createSequential();
     macCheck.buildComputation(sequential);
-//    evaluator.eval(sequential.build(), resourcePool, network);
+    evaluator.eval(sequential.build(), resourcePool, network);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index c65f6e5a6..67c6e2b4f 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -114,6 +114,16 @@ public void testSubtract() {
         bigInt128(bigInt65(rand(3), 1).subtract(bigInt65(rand(4), 1))),
         new CompUInt128Bit(rand(3), 1).subtract(new CompUInt128Bit(rand(4), 1)).toBigInteger()
     );
+    Assert.assertEquals(
+        bigInt128(bigInt65(0, 0).subtract(bigInt65(0, 1))),
+        new CompUInt128Bit(0, 0).subtract(new CompUInt128Bit(0, 1)).toBigInteger()
+    );
+    System.out.println(bigInt128(bigInt65(0, 0).subtract(bigInt65(0, 1))));
+    System.out.println(bigInt128(bigInt65(0, 0).subtract(bigInt65(1, 0))));
+    Assert.assertEquals(
+        bigInt128(bigInt65(0, 0).subtract(bigInt65(1, 0))),
+        new CompUInt128Bit(0, 0).subtract(new CompUInt128Bit(1, 0)).toBigInteger()
+    );
   }
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java
new file mode 100644
index 000000000..fb16172c0
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java
@@ -0,0 +1,27 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import org.junit.Test;
+
+public class TestSpdz2kSIntBoolean {
+
+  @Test
+  public void test() {
+//    CompUInt128 alphaA = new CompUInt128(0L, 1); // 2k - 1
+//    CompUInt128 alphaB = new CompUInt128(0L, 1); // 2k - 1
+    CompUInt128 alpha = new CompUInt128(11111L, (int) (1L << 31), 1);
+
+    CompUInt128 valueA = new CompUInt128Bit(0L, 1);
+    CompUInt128 macA = valueA.toArithmeticRep().multiply(alpha);
+
+    CompUInt128 valueB = new CompUInt128Bit(0L, 0);
+    CompUInt128 macB = valueB.toArithmeticRep().multiply(alpha);
+
+    CompUInt128 sum = valueA.add(valueB);
+    CompUInt128 macSum = macA.add(macB);
+
+    System.out.println("sum " + sum + " macSum " + macSum);
+    System.out.println("alpha * sum (regular arithmetic) " + sum.toArithmeticRep()
+        .multiply(alpha));
+    System.out.println("alpha * sum (bool arithmetic) " + sum.multiply(alpha));
+  }
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index df55a6c7c..480901abd 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -40,6 +40,31 @@ public void testAnd() {
     runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testAndXorSequence() {
+    runTest(new TestAndXorSequence<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  @Test
+  public void testSequentialAnd() {
+    runTest(new TestSequentialAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  @Test
+  public void testXor() {
+    runTest(new TestXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  @Test
+  public void testSequentialXor() {
+    runTest(new TestSequentialXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  @Test
+  public void testXorRandom() {
+    runTest(new TestXorSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Test
   public void testAndRandom() {
     runTest(new TestAndSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
@@ -48,12 +73,8 @@ public void testAndRandom() {
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
-    System.err.println("TestSpdz2kLogicalOperations change me back!");
     CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
-    Random random = new Random(playerId);
-    byte[] bytes = new byte[16];
-    random.nextBytes(bytes);
-    CompUInt128 keyShare = new CompUInt128(bytes);
+    CompUInt128 keyShare = factory.createRandom();
     Spdz2kResourcePool<CompUInt128> resourcePool =
         new Spdz2kResourcePoolImpl<>(
             playerId,
@@ -61,7 +82,7 @@ noOfParties, new AesCtrDrbg(new byte[32]),
             new Spdz2kOpenedValueStoreImpl<>(),
             new Spdz2kDummyDataSupplier<>(playerId, noOfParties, keyShare, factory),
             factory);
-//    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
+    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
     return resourcePool;
   }
 
@@ -70,7 +91,75 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128(true);
   }
 
-  public static class TestAndSpdz2k<ResourcePoolT extends ResourcePool>
+  public static class TestSequentialXorSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO,
+            BigInteger.ONE
+        );
+
+        @Override
+        public void test() {
+          Application<BigInteger, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<SInt> bit = root.conversion().toBoolean(root.numeric().input(left.get(0), 1));
+                for (int i = 1; i < left.size(); i++) {
+                  bit = root.logical().xor(bit,
+                      root.conversion().toBoolean(root.numeric().input(left.get(i), 1)));
+                }
+                DRes<OInt> result = root.logical().openAsBit(bit);
+                return () -> root.getOIntFactory().toBigInteger(result.out());
+              };
+          BigInteger actual = runApplication(app);
+          Assert.assertEquals(BigInteger.ONE, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestSequentialAndSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO,
+            BigInteger.ONE
+        );
+
+        @Override
+        public void test() {
+          Application<BigInteger, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<SInt> bit = root.conversion().toBoolean(root.numeric().input(left.get(0), 1));
+                for (int i = 1; i < left.size(); i++) {
+                  bit = root.logical().and(bit,
+                      root.conversion().toBoolean(root.numeric().input(left.get(i), 1)));
+                }
+                DRes<OInt> result = root.logical().openAsBit(bit);
+                return () -> root.getOIntFactory().toBigInteger(result.out());
+              };
+          BigInteger actual = runApplication(app);
+          Assert.assertEquals(BigInteger.ZERO, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestXorSpdz2k<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
     @Override
@@ -83,6 +172,60 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
             BigInteger.ONE,
             BigInteger.ZERO
         );
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ZERO,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ONE
+        );
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed =
+                    root.collections().closeList(left, 1);
+                DRes<List<DRes<SInt>>> rightClosed = root.collections().closeList(right, 1);
+                DRes<List<DRes<SInt>>> leftConverted = root.conversion()
+                    .toBooleanBatch(leftClosed);
+                DRes<List<DRes<SInt>>> rightConverted = root.conversion()
+                    .toBooleanBatch(rightClosed);
+                DRes<List<DRes<SInt>>> anded = root.logical().pairWiseXor(
+                    leftConverted,
+                    rightConverted
+                );
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
+                OIntFactory factory = root.getOIntFactory();
+                return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.ZERO,
+              BigInteger.ONE
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+
+  public static class TestAndSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ONE
+        );
         private final List<BigInteger> right = Arrays.asList(
             BigInteger.ONE,
             BigInteger.ONE,
@@ -122,6 +265,42 @@ public void test() {
     }
   }
 
+  public static class TestXorSpdz2kRandom<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = randomBits(100, 1);
+        private final List<BigInteger> right = randomBits(100, 2);
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
+                DRes<List<DRes<SInt>>> rightClosed = root.numeric().knownAsDRes(right);
+                DRes<List<DRes<SInt>>> leftConverted = root.conversion().toBooleanBatch(leftClosed);
+                DRes<List<DRes<SInt>>> rightConverted = root.conversion()
+                    .toBooleanBatch(rightClosed);
+                DRes<List<DRes<SInt>>> anded = root.logical().pairWiseXor(
+                    leftConverted,
+                    rightConverted
+                );
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
+                OIntFactory factory = root.getOIntFactory();
+                return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = xor(left, right);
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
   public static class TestAndSpdz2kRandom<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
@@ -158,6 +337,37 @@ public void test() {
     }
   }
 
+  public static class TestAndXorSequence<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<BigInteger, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<SInt> b = bit(root, 1);
+                b = root.logical().and(b, bit(root, 1));
+                b = root.logical().and(b, bit(root, 0));
+                b = root.logical().xor(b, bit(root, 0));
+                b = root.logical().xor(b, bit(root, 1));
+                b = root.logical().xor(b, bit(root, 1));
+                b = root.logical().and(b, bit(root, 0));
+                DRes<OInt> opened = root.logical().openAsBit(b);
+                OIntFactory factory = root.getOIntFactory();
+                return () -> factory.toBigInteger(opened.out());
+              };
+          BigInteger actual = runApplication(app);
+          Assert.assertEquals(BigInteger.ZERO, actual);
+        }
+      };
+    }
+  }
+
+
   private static List<BigInteger> randomBits(int num, int seed) {
     Random random = new Random(seed);
     List<BigInteger> bits = new ArrayList<>(num);
@@ -175,5 +385,16 @@ private static List<BigInteger> and(List<BigInteger> left, List<BigInteger> righ
     return bits;
   }
 
+  private static List<BigInteger> xor(List<BigInteger> left, List<BigInteger> right) {
+    List<BigInteger> bits = new ArrayList<>(left.size());
+    for (int i = 0; i < left.size(); i++) {
+      bits.add(left.get(i).add(right.get(i)).mod(BigInteger.valueOf(2)));
+    }
+    return bits;
+  }
+
+  private static DRes<SInt> bit(ProtocolBuilderNumeric root, int bit) {
+    return root.conversion().toBoolean(root.numeric().input(BigInteger.valueOf(bit), 1));
+  }
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
index c8a1c6c1b..7f2a98491 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/TestSpdz2kDummyDataSupplier.java
@@ -160,7 +160,7 @@ private Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>> recombineTr
   private void assertTripleValid(Spdz2kTriple<CompUInt128, Spdz2kSIntArithmetic<CompUInt128>> recombined, CompUInt128 macKey) {
     assertMacCorrect(recombined.getLeft(), macKey);
     assertMacCorrect(recombined.getRight(), macKey);
-    assertMacCorrect(recombined.getRight(), macKey);
+    assertMacCorrect(recombined.getProduct(), macKey);
     // check that a * b = c
     assertEquals(recombined.getProduct().getShare().toBigInteger(),
         recombined.getLeft().getShare().multiply(recombined.getRight().getShare()).toBigInteger());

From b4def965a594fc031e5e611279ff2a96cccbb19a Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 7 May 2018 10:09:04 +0200
Subject: [PATCH 121/231] Spdz2k or

---
 .../fresco/lib/compare/lt/PreCarryBits.java   |  5 +-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 11 ++++
 .../TestSpdz2kLogicalOperations.java          | 58 +++++++++++++++++++
 3 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 2609637a1..94e6374e2 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -26,7 +26,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     if (pairs.size() == 1) {
       return pairs.get(0).out().getSecond();
     } else {
-      DRes<List<DRes<SIntPair>>> nextRound = builder.par(par -> {
+      return builder.par(par -> {
         List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(pairs.size() / 2);
         for (int i = 0; i < pairs.size() / 2; i++) {
           DRes<SIntPair> left = pairs.get(2 * i + 1);
@@ -35,8 +35,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
         }
         Collections.reverse(nextRoundInner);
         return () -> nextRoundInner;
-      });
-      return builder.seq(new PreCarryBits(nextRound));
+      }).seq((seq, nextRound) -> new PreCarryBits(() -> nextRound).buildComputation(seq));
     }
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 3ff67fd6a..238f8ea18 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
 import dk.alexandra.fresco.framework.builder.numeric.Logical;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
@@ -32,6 +33,16 @@ public DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB) {
     return builder.append(new Spdz2kAndProtocol<>(bitA, bitB));
   }
 
+  @Override
+  public DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB) {
+    // a OR b = a XOR b XOR (a AND b)
+    return builder.par(par -> {
+      DRes<SInt> xored = par.logical().xor(bitA, bitB);
+      DRes<SInt> anded = par.logical().and(bitA, bitB);
+      return () -> new Pair<>(xored, anded);
+    }).seq((seq, pair) -> seq.logical().xor(pair.getFirst(), pair.getSecond()));
+  }
+
   @Override
   public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
     return builder.append(new Spdz2kXorProtocol<>(bitA, bitB));
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 480901abd..2e4fafdb4 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -40,6 +40,11 @@ public void testAnd() {
     runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testOr() {
+    runTest(new TestOrSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Test
   public void testAndXorSequence() {
     runTest(new TestAndXorSequence<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
@@ -159,6 +164,59 @@ public void test() {
     }
   }
 
+  public static class TestOrSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO
+        );
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ZERO,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ONE
+        );
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed =
+                    root.collections().closeList(left, 1);
+                DRes<List<DRes<SInt>>> rightClosed = root.collections().closeList(right, 1);
+                DRes<List<DRes<SInt>>> leftConverted = root.conversion()
+                    .toBooleanBatch(leftClosed);
+                DRes<List<DRes<SInt>>> rightConverted = root.conversion()
+                    .toBooleanBatch(rightClosed);
+                DRes<List<DRes<SInt>>> anded = root.logical().pairWiseOr(
+                    leftConverted,
+                    rightConverted
+                );
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
+                OIntFactory factory = root.getOIntFactory();
+                return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.ONE,
+              BigInteger.ONE
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
   public static class TestXorSpdz2k<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 

From 649688fe24b90cbeaeef74e225e091a4ad629237 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 7 May 2018 11:12:14 +0200
Subject: [PATCH 122/231] Fix incorrect close list in default collections

---
 .../fresco/framework/builder/numeric/DefaultCollections.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
index 05e8b990e..84407ec5b 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
@@ -42,7 +42,7 @@ public DRes<RowPairD<BigInteger, BigInteger>> openRowPair(DRes<RowPairD<SInt, SI
 
   @Override
   public DRes<List<DRes<SInt>>> closeList(List<BigInteger> openList, int inputParty) {
-    if (builder.getBasicNumericContext().getMyId() == 1) {
+    if (builder.getBasicNumericContext().getMyId() == inputParty) {
       return builder.par(new CloseList(openList, inputParty));
     } else {
       return builder.par(new CloseList(openList.size(), inputParty));

From 4ebd1dd8041c690d1b43c3bbd84ec1af054f23ac Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 7 May 2018 13:57:15 +0200
Subject: [PATCH 123/231] Carry out all-boolean

---
 .../framework/builder/numeric/Comparison.java |   5 +
 .../builder/numeric/DefaultComparison.java    |  23 ++-
 .../builder/numeric/DefaultLogical.java       |  10 +-
 .../fresco/framework/util/SIntPair.java       |   6 +-
 .../fresco/lib/compare/lt/CarryOut.java       |   4 +-
 .../fresco/lib/compare/lt/PreCarryBits.java   |   2 +-
 .../arithmetic/ComparisonLoggerDecorator.java |   6 +
 .../fresco/suite/spdz2k/Spdz2kComparison.java |   7 +
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |  27 +++
 .../suite/spdz2k/datatypes/CompUInt.java      |   2 +
 .../suite/spdz2k/datatypes/CompUInt128.java   |   7 +-
 .../spdz2k/datatypes/CompUInt128Bit.java      |  10 +
 .../suite/spdz2k/datatypes/CompUInt96.java    |   5 +
 .../computations/lt/CarryOutSpdz2k.java       |  82 ++++++++
 .../natives/Spdz2kXorKnownProtocol.java       |  45 +++++
 .../spdz2k/datatypes/TestCompUInt128Bit.java  |   2 -
 .../computations/TestSpdz2kComparison.java    | 175 ++++++++++++++++++
 .../TestSpdz2kLogicalOperations.java          | 139 ++++++++++++++
 18 files changed, 542 insertions(+), 15 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 627eb4d4e..029d6558d 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.List;
@@ -140,4 +141,8 @@ default DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y) {
   default DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
     return compareZero(x, bitlength, Algorithm.LOG_ROUNDS);
   }
+
+  // TODO this doesn't belong here
+  DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs);
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index f25210db8..f385acdfa 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -1,11 +1,13 @@
 package dk.alexandra.fresco.framework.builder.numeric;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
 import dk.alexandra.fresco.lib.compare.lt.LessThanOrEquals;
 import dk.alexandra.fresco.lib.compare.lt.LessThanZero;
+import dk.alexandra.fresco.lib.compare.lt.PreCarryBits;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestConstRounds;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestLogRounds;
 
@@ -46,7 +48,7 @@ public DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y, Algorithm algorithm) {
     if (algorithm == Algorithm.LOG_ROUNDS) {
       if (factoryNumeric.getBasicNumericContext().getStatisticalSecurityParam() + factoryNumeric
           .getBasicNumericContext().getMaxBitLength() > factoryNumeric.getBasicNumericContext()
-              .getModulus().bitLength()) {
+          .getModulus().bitLength()) {
         throw new IllegalArgumentException(
             "The max bitlength plus the statistical security parameter overflows the size of the modulus.");
       }
@@ -102,12 +104,19 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm)
           "The max bitlength plus the statistical security parameter overflows the size of the modulus.");
     }
     switch (algorithm) {
-    case CONST_ROUNDS:
-      return builder.seq(new ZeroTestConstRounds(x, bitlength));
-    case LOG_ROUNDS:
-      return builder.seq(new ZeroTestLogRounds(x, bitlength));
-    default:
-      throw new UnsupportedOperationException("Not implemented yet");
+      case CONST_ROUNDS:
+        return builder.seq(new ZeroTestConstRounds(x, bitlength));
+      case LOG_ROUNDS:
+        return builder.seq(new ZeroTestLogRounds(x, bitlength));
+      default:
+        throw new UnsupportedOperationException("Not implemented yet");
     }
   }
+
+  // TODO this doesn't belong here
+  @Override
+  public DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs) {
+    return builder.seq(new PreCarryBits(pairs));
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index bca8220d0..eaf4d50ee 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -37,7 +37,15 @@ public DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB) {
 
   @Override
   public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
-    throw new UnsupportedOperationException();
+    // knownBit + secretBit - 2 * knownBit * secretBit
+    return builder.seq(seq -> {
+      // mult and add could be in parallel
+      OInt two = seq.getOIntFactory().two();
+      DRes<SInt> sum = seq.numeric().add(bitA, bitB);
+      DRes<SInt> prod = seq.numeric()
+          .multByOpen(two, seq.numeric().mult(bitA, bitB));
+      return seq.numeric().sub(sum, prod);
+    });
   }
 
   @Override
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java b/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
index d09f56161..cb0c52161 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
@@ -3,11 +3,15 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.SInt;
 
-public class SIntPair extends Pair<DRes<SInt>, DRes<SInt>> {
+public class SIntPair extends Pair<DRes<SInt>, DRes<SInt>> implements DRes<SIntPair> {
 
   public SIntPair(DRes<SInt> first,
       DRes<SInt> second) {
     super(first, second);
   }
 
+  @Override
+  public SIntPair out() {
+    return this;
+  }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index ddf56ec94..24ee2de97 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -61,12 +61,12 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       // need to account for carry-in bit
       int lastIdx = pairs.size() - 1;
       SIntPair lastPair = pairs.get(lastIdx).out();
-      DRes<SInt> lastCarryPropagator = seq.numeric().add(
+      DRes<SInt> lastCarryPropagator = seq.logical().xor(
           lastPair.getSecond(),
           seq.logical().andKnown(carryIn, lastPair.getFirst()));
       pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
       Collections.reverse(pairs);
-      return seq.seq(new PreCarryBits(() -> pairs));
+      return seq.comparison().preCarry(() -> pairs);
     });
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 94e6374e2..1e18940b8 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -13,7 +13,7 @@ public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<SIntPair>>> pairsDef;
 
-  PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
+  public PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
     this.pairsDef = pairs;
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 55462c6b9..26bd319d7 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.logging.PerformanceLogger;
@@ -88,6 +89,11 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
     return this.delegate.compareZero(x, bitlength);
   }
 
+  @Override
+  public DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs) {
+    return null;
+  }
+
   @Override
   public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm) {
     comp0Count++;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index aadbaee9c..cf9ff6dc5 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -4,10 +4,12 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
+import java.util.List;
 
 /**
  * Spdz2k optimized protocols for comparison.
@@ -34,4 +36,9 @@ public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, Algorithm algorithm) {
     }
   }
 
+  @Override
+  public DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs) {
+    return super.preCarry(pairs);
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 238f8ea18..83c16341c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -11,7 +11,9 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
+import java.math.BigInteger;
 
 /**
  * Logical operators for Spdz2k on boolean shares. <p>NOTE: requires that inputs have previously
@@ -48,11 +50,36 @@ public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
     return builder.append(new Spdz2kXorProtocol<>(bitA, bitB));
   }
 
+  @Override
+  public DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
+    // TODO
+    return () -> {
+      BigInteger known = factory.toBigInteger(knownBit.out());
+      if (known.equals(BigInteger.ZERO)) {
+        return new Spdz2kSIntBoolean<>(factory.zero().toBitRep(), factory.zero());
+      } else {
+        Spdz2kSIntBoolean<PlainT> out = factory.toSpdz2kSIntBoolean(secretBit);
+        return new Spdz2kSIntBoolean<>(out.getShare(), out.getMacShare());
+      }
+    };
+  }
+
+  @Override
+  public DRes<SInt> xorKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
+    return builder.append(new Spdz2kXorKnownProtocol<>(knownBit, secretBit));
+  }
+
+  @Override
+  public DRes<SInt> not(DRes<SInt> secretBit) {
+    return xorKnown(builder.getOIntFactory().one(), secretBit);
+  }
+
   @Override
   public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
     return builder.seq(seq -> {
       Spdz2kSIntBoolean<PlainT> bit = factory.toSpdz2kSIntBoolean(secretBit);
+      System.out.println(bit);
       return seq.numeric().openAsOInt(bit.asArithmetic());
     }).seq((seq, opened) -> {
       PlainT openBit = factory.fromOInt(opened);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 15546e8ee..d542310cf 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -59,6 +59,8 @@ public interface CompUInt<
    */
   CompT toArithmeticRep();
 
+  CompT copy();
+
   /**
    * Get length of least significant bit segment, i.e., k.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index e27cbccb2..dc1b4cbeb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -205,7 +205,12 @@ public CompUInt128 toBitRep() {
 
   @Override
   public CompUInt128 toArithmeticRep() {
-    throw new UnsupportedOperationException("Already arithmetic");
+    throw new IllegalStateException("Already arithmetic");
+  }
+
+  @Override
+  public CompUInt128 copy() {
+    return new CompUInt128(high, mid, low);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index d7e2e75e8..a4531d99d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -41,6 +41,11 @@ public CompUInt128 subtract(CompUInt128 other) {
     return this.add(negated);
   }
 
+  @Override
+  public CompUInt128 negate() {
+    return new CompUInt128Bit(~high, ~mid & 0x80000000, 0).add(ONE);
+  }
+
   @Override
   public CompUInt128 toBitRep() {
     throw new IllegalStateException("Already in bit form");
@@ -61,6 +66,11 @@ public byte[] serializeLeastSignificant() {
     return new byte[]{(byte) (mid >>> 31)};
   }
 
+  @Override
+  public CompUInt128 copy() {
+    return new CompUInt128Bit(high, mid, low);
+  }
+
   public boolean getValueBit() {
     return testBit(63);
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 1e7d5abd6..4b65da6a7 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -183,6 +183,11 @@ public CompUInt96 toArithmeticRep() {
     return null;
   }
 
+  @Override
+  public CompUInt96 copy() {
+    return new CompUInt96(high, mid, low);
+  }
+
   @Override
   public int getLowBitLength() {
     return 32;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java
new file mode 100644
index 000000000..1785d40e9
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java
@@ -0,0 +1,82 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Given values a and b represented as bits, computes if a + b overflows, i.e., if the addition
+ * results in a carry.
+ */
+public class CarryOutSpdz2k implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<List<DRes<OInt>>> openBitsDef;
+  private final DRes<List<DRes<SInt>>> secretBitsDef;
+  private final DRes<OInt> carryIn;
+
+  /**
+   * Constructs new {@link dk.alexandra.fresco.lib.compare.lt.CarryOut}.
+   *
+   * @param clearBits clear bits
+   * @param secretBits secret bits
+   * @param carryIn an additional carry-in bit which we add to the least-significant bits of the
+   * inputs
+   */
+  public CarryOutSpdz2k(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
+      DRes<OInt> carryIn) {
+    this.secretBitsDef = secretBits;
+    this.openBitsDef = clearBits;
+    this.carryIn = carryIn;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    List<DRes<SInt>> secretBits = secretBitsDef.out();
+    List<DRes<OInt>> openBits = openBitsDef.out();
+    if (secretBits.size() != openBits.size()) {
+      throw new IllegalArgumentException("Number of bits must be the same");
+    }
+    return builder.par(par -> {
+      DRes<List<DRes<SInt>>> xored = par.logical().pairWiseXorKnown(openBitsDef, secretBitsDef);
+      DRes<List<DRes<SInt>>> anded = par.logical().pairWiseAndKnown(openBitsDef, secretBitsDef);
+      return () -> new Pair<>(xored.out(), anded.out());
+    }).par((par, pair) -> {
+      List<DRes<SInt>> xoredBits = pair.getFirst();
+      List<DRes<SInt>> andedBits = pair.getSecond();
+      List<DRes<SIntPair>> pairs = new ArrayList<>(andedBits.size());
+      for (int i = 0; i < secretBits.size(); i++) {
+        DRes<SInt> xoredBit = xoredBits.get(i);
+        DRes<SInt> andedBit = andedBits.get(i);
+        pairs.add(() -> new SIntPair(xoredBit, andedBit));
+      }
+      return () -> pairs;
+    }).seq((seq, pairs) -> {
+      // need to account for carry-in bit
+      int lastIdx = pairs.size() - 1;
+      SIntPair lastPair = pairs.get(lastIdx).out();
+      // TODO should be xor?
+      DRes<SInt> lastCarryPropagator = seq.numeric().add(
+          lastPair.getSecond(),
+          seq.logical().andKnown(carryIn, lastPair.getFirst()));
+      pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
+      Collections.reverse(pairs);
+//      List<DRes<SIntPair>> converted = pairs.stream().map(
+//          pair -> {
+//            return new SIntPair(
+//                seq.conversion().toBoolean(pair.out().getFirst()),
+//                seq.conversion().toBoolean(pair.out().getSecond()));
+//          }
+//      ).collect(Collectors.toList());
+      return seq.comparison().preCarry(() -> pairs);
+    });
+  }
+
+}
+
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
new file mode 100644
index 000000000..9f5a9e126
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
@@ -0,0 +1,45 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+public class Spdz2kXorKnownProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<OInt> left;
+  private final DRes<SInt> right;
+  private SInt result;
+
+  public Spdz2kXorKnownProtocol(
+      DRes<OInt> left,
+      DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+//    BigInteger value = resourcePool.getFactory().toBigInteger(left.out());
+//    PlainT leftBit = resourcePool.getFactory().fromBit();
+//    Spdz2kSIntBoolean<PlainT> rightBit = resourcePool.getFactory().toSpdz2kSIntBoolean(right);
+//    result = leftBit.add(rightBit);
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    PlainT known = factory.fromOInt(left.out()).toBitRep();
+    PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
+    result = factory.toSpdz2kSIntBoolean(right).addConstant(known,
+        secretSharedKey, factory.zero().toBitRep(), resourcePool.getMyId() == 1);
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public SInt out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index 67c6e2b4f..cb288b7e2 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -118,8 +118,6 @@ public void testSubtract() {
         bigInt128(bigInt65(0, 0).subtract(bigInt65(0, 1))),
         new CompUInt128Bit(0, 0).subtract(new CompUInt128Bit(0, 1)).toBigInteger()
     );
-    System.out.println(bigInt128(bigInt65(0, 0).subtract(bigInt65(0, 1))));
-    System.out.println(bigInt128(bigInt65(0, 0).subtract(bigInt65(1, 0))));
     Assert.assertEquals(
         bigInt128(bigInt65(0, 0).subtract(bigInt65(1, 0))),
         new CompUInt128Bit(0, 0).subtract(new CompUInt128Bit(1, 0)).toBigInteger()
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
new file mode 100644
index 000000000..b5a893478
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
@@ -0,0 +1,175 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntFactory;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.compare.lt.CarryOut;
+import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
+import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
+import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.function.Supplier;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestSpdz2kComparison extends
+    AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
+
+  @Test
+  public void testCarryOutZero() {
+    runTest(new TestCarryOutSpdz2k<>(0x00000000, 0x00000000), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        2);
+  }
+
+  @Test
+  public void testCarryOutOne() {
+    runTest(new TestCarryOutSpdz2k<>(0x80000000, 0x80000000), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        2);
+  }
+
+  @Test
+  public void testCarryOutAllOnes() {
+    runTest(new TestCarryOutSpdz2k<>(0xffffffff, 0xffffffff), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        2);
+  }
+
+  @Test
+  public void testCarryOutOneFromCarry() {
+    runTest(new TestCarryOutSpdz2k<>(0x40000000, 0xc0000000), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        2);
+  }
+
+  @Test
+  public void testCarryOutRandom() {
+    runTest(new TestCarryOutSpdz2k<>(new Random(42).nextInt(), new Random(1).nextInt()),
+        EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  @Override
+  protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
+      Supplier<Network> networkSupplier) {
+    CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+    CompUInt128 keyShare = factory.createRandom();
+    Spdz2kResourcePool<CompUInt128> resourcePool =
+        new Spdz2kResourcePoolImpl<>(
+            playerId,
+            noOfParties, new AesCtrDrbg(new byte[32]),
+            new Spdz2kOpenedValueStoreImpl<>(),
+            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, keyShare, factory),
+            factory);
+    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
+    return resourcePool;
+  }
+
+  @Override
+  protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSuite() {
+    return new Spdz2kProtocolSuite128(true);
+  }
+
+  public static class TestCarryOutSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    private final List<BigInteger> left;
+    private final List<BigInteger> right;
+    private final BigInteger expected;
+
+    public TestCarryOutSpdz2k(int l, int r) {
+      expected = carry(l, r);
+      left = intToBits(l);
+      right = new ArrayList<>(left.size());
+      right.addAll(intToBits(r));
+    }
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<BigInteger, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed =
+                    root.conversion().toBooleanBatch(root.collections().closeList(right, 1));
+                OIntFactory oIntFactory = root.getOIntFactory();
+                DRes<SInt> carry = root
+                    .seq(new CarryOut(() -> oIntFactory.fromBigInteger(right), leftClosed,
+                        oIntFactory.zero()));
+                DRes<OInt> opened = root.logical().openAsBit(carry);
+                return () -> oIntFactory.toBigInteger(opened.out());
+              };
+          BigInteger actual = runApplication(app);
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  private static BigInteger carry(int a, int b) {
+    long res = Integer.toUnsignedLong(a) + Integer.toUnsignedLong(b);
+    int carry = (int) ((res & (1L << 32)) >> 32);
+    return BigInteger.valueOf(carry);
+  }
+
+  private static List<BigInteger> intToBits(int value) {
+    int numBits = Integer.SIZE;
+    List<BigInteger> bits = new ArrayList<>(numBits);
+    for (int i = 0; i < numBits; i++) {
+      int bit = (value & (1 << i)) >>> i;
+      bits.add(BigInteger.valueOf(bit));
+    }
+    Collections.reverse(bits);
+    return bits;
+  }
+
+
+  private static List<BigInteger> and(List<BigInteger> left, List<BigInteger> right) {
+    List<BigInteger> bits = new ArrayList<>(left.size());
+    for (int i = 0; i < left.size(); i++) {
+      bits.add(left.get(i).multiply(right.get(i)).mod(BigInteger.valueOf(2)));
+    }
+    return bits;
+  }
+
+  private static List<BigInteger> xor(List<BigInteger> left, List<BigInteger> right) {
+    List<BigInteger> bits = new ArrayList<>(left.size());
+    for (int i = 0; i < left.size(); i++) {
+      bits.add(left.get(i).add(right.get(i)).mod(BigInteger.valueOf(2)));
+    }
+    return bits;
+  }
+
+  private static DRes<SInt> bit(ProtocolBuilderNumeric root, int bit) {
+    return root.conversion().toBoolean(root.numeric().input(BigInteger.valueOf(bit), 1));
+  }
+
+  private static List<BigInteger> randomBits(int num, int seed) {
+    Random random = new Random(seed);
+    List<BigInteger> bits = new ArrayList<>(num);
+    for (int i = 0; i < num; i++) {
+      bits.add(random.nextBoolean() ? BigInteger.ONE : BigInteger.ZERO);
+    }
+    return bits;
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 2e4fafdb4..4cf718cda 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -60,11 +60,21 @@ public void testXor() {
     runTest(new TestXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testXorKnown() {
+    runTest(new TestXorKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Test
   public void testSequentialXor() {
     runTest(new TestSequentialXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testSequentialAndKnown() {
+    runTest(new TestAndKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Test
   public void testXorRandom() {
     runTest(new TestXorSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
@@ -75,6 +85,12 @@ public void testAndRandom() {
     runTest(new TestAndSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testNot() {
+    runTest(new TestNotSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
@@ -96,6 +112,129 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128(true);
   }
 
+  public static class TestNotSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<SInt> notOne = root.logical().not(
+                    root.conversion().toBoolean(root.numeric().input(BigInteger.ONE, 1)));
+                DRes<SInt> notZero = root.logical().not(
+                    root.conversion().toBoolean(root.numeric().input(BigInteger.ZERO, 2)));
+                List<DRes<SInt>> notted = Arrays.asList(notOne, notZero);
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(() -> notted);
+                return () -> opened.out().stream()
+                    .map(v -> root.getOIntFactory().toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ZERO,
+              BigInteger.ONE
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestXorKnownSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.conversion()
+                    .toBooleanBatch(root.collections().closeList(left, 1));
+                OIntFactory oIntFactory = root.getOIntFactory();
+                List<DRes<OInt>> rightOInts = oIntFactory.fromBigInteger(right);
+                DRes<List<DRes<SInt>>> xored = root.logical()
+                    .pairWiseXorKnown(() -> rightOInts, leftClosed);
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(xored);
+                return () -> opened.out().stream().map(v -> oIntFactory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ZERO,
+              BigInteger.ONE,
+              BigInteger.ONE,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
+  public static class TestAndKnownSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> left = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO);
+        private final List<BigInteger> right = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.conversion()
+                    .toBooleanBatch(root.collections().closeList(left, 1));
+                OIntFactory oIntFactory = root.getOIntFactory();
+                List<DRes<OInt>> rightOInts = oIntFactory.fromBigInteger(right);
+                DRes<List<DRes<SInt>>> anded = root.logical()
+                    .pairWiseAndKnown(() -> rightOInts, leftClosed);
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
+                return () -> opened.out().stream().map(v -> oIntFactory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.ZERO,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
   public static class TestSequentialXorSpdz2k<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 

From 69be6700725868a98b26c15e02f0ffecd201fcce Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 7 May 2018 14:02:10 +0200
Subject: [PATCH 124/231] Remove unused

---
 .../framework/builder/numeric/Comparison.java |  3 -
 .../builder/numeric/DefaultComparison.java    |  8 --
 .../fresco/lib/compare/lt/CarryOut.java       |  2 +-
 .../arithmetic/ComparisonLoggerDecorator.java |  6 --
 .../fresco/suite/spdz2k/Spdz2kComparison.java |  6 --
 .../computations/lt/CarryOutSpdz2k.java       | 82 -------------------
 .../computations/TestSpdz2kComparison.java    | 32 +-------
 7 files changed, 2 insertions(+), 137 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 029d6558d..8dea9510b 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -142,7 +142,4 @@ default DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
     return compareZero(x, bitlength, Algorithm.LOG_ROUNDS);
   }
 
-  // TODO this doesn't belong here
-  DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs);
-
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index f385acdfa..5ee60f895 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -1,13 +1,11 @@
 package dk.alexandra.fresco.framework.builder.numeric;
 
 import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
 import dk.alexandra.fresco.lib.compare.lt.LessThanOrEquals;
 import dk.alexandra.fresco.lib.compare.lt.LessThanZero;
-import dk.alexandra.fresco.lib.compare.lt.PreCarryBits;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestConstRounds;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestLogRounds;
 
@@ -113,10 +111,4 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm)
     }
   }
 
-  // TODO this doesn't belong here
-  @Override
-  public DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs) {
-    return builder.seq(new PreCarryBits(pairs));
-  }
-
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 24ee2de97..ed05650d9 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -66,7 +66,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           seq.logical().andKnown(carryIn, lastPair.getFirst()));
       pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
       Collections.reverse(pairs);
-      return seq.comparison().preCarry(() -> pairs);
+      return seq.seq(new PreCarryBits(() -> pairs));
     });
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 26bd319d7..55462c6b9 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -2,7 +2,6 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
-import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.logging.PerformanceLogger;
@@ -89,11 +88,6 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
     return this.delegate.compareZero(x, bitlength);
   }
 
-  @Override
-  public DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs) {
-    return null;
-  }
-
   @Override
   public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm) {
     comp0Count++;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index cf9ff6dc5..777e2086a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -4,12 +4,10 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
-import java.util.List;
 
 /**
  * Spdz2k optimized protocols for comparison.
@@ -36,9 +34,5 @@ public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, Algorithm algorithm) {
     }
   }
 
-  @Override
-  public DRes<SInt> preCarry(DRes<List<DRes<SIntPair>>> pairs) {
-    return super.preCarry(pairs);
-  }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java
deleted file mode 100644
index 1785d40e9..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/CarryOutSpdz2k.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.util.Pair;
-import dk.alexandra.fresco.framework.util.SIntPair;
-import dk.alexandra.fresco.framework.value.OInt;
-import dk.alexandra.fresco.framework.value.SInt;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Given values a and b represented as bits, computes if a + b overflows, i.e., if the addition
- * results in a carry.
- */
-public class CarryOutSpdz2k implements Computation<SInt, ProtocolBuilderNumeric> {
-
-  private final DRes<List<DRes<OInt>>> openBitsDef;
-  private final DRes<List<DRes<SInt>>> secretBitsDef;
-  private final DRes<OInt> carryIn;
-
-  /**
-   * Constructs new {@link dk.alexandra.fresco.lib.compare.lt.CarryOut}.
-   *
-   * @param clearBits clear bits
-   * @param secretBits secret bits
-   * @param carryIn an additional carry-in bit which we add to the least-significant bits of the
-   * inputs
-   */
-  public CarryOutSpdz2k(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
-      DRes<OInt> carryIn) {
-    this.secretBitsDef = secretBits;
-    this.openBitsDef = clearBits;
-    this.carryIn = carryIn;
-  }
-
-  @Override
-  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    List<DRes<SInt>> secretBits = secretBitsDef.out();
-    List<DRes<OInt>> openBits = openBitsDef.out();
-    if (secretBits.size() != openBits.size()) {
-      throw new IllegalArgumentException("Number of bits must be the same");
-    }
-    return builder.par(par -> {
-      DRes<List<DRes<SInt>>> xored = par.logical().pairWiseXorKnown(openBitsDef, secretBitsDef);
-      DRes<List<DRes<SInt>>> anded = par.logical().pairWiseAndKnown(openBitsDef, secretBitsDef);
-      return () -> new Pair<>(xored.out(), anded.out());
-    }).par((par, pair) -> {
-      List<DRes<SInt>> xoredBits = pair.getFirst();
-      List<DRes<SInt>> andedBits = pair.getSecond();
-      List<DRes<SIntPair>> pairs = new ArrayList<>(andedBits.size());
-      for (int i = 0; i < secretBits.size(); i++) {
-        DRes<SInt> xoredBit = xoredBits.get(i);
-        DRes<SInt> andedBit = andedBits.get(i);
-        pairs.add(() -> new SIntPair(xoredBit, andedBit));
-      }
-      return () -> pairs;
-    }).seq((seq, pairs) -> {
-      // need to account for carry-in bit
-      int lastIdx = pairs.size() - 1;
-      SIntPair lastPair = pairs.get(lastIdx).out();
-      // TODO should be xor?
-      DRes<SInt> lastCarryPropagator = seq.numeric().add(
-          lastPair.getSecond(),
-          seq.logical().andKnown(carryIn, lastPair.getFirst()));
-      pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
-      Collections.reverse(pairs);
-//      List<DRes<SIntPair>> converted = pairs.stream().map(
-//          pair -> {
-//            return new SIntPair(
-//                seq.conversion().toBoolean(pair.out().getFirst()),
-//                seq.conversion().toBoolean(pair.out().getSecond()));
-//          }
-//      ).collect(Collectors.toList());
-      return seq.comparison().preCarry(() -> pairs);
-    });
-  }
-
-}
-
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
index b5a893478..a08ef71ef 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
@@ -141,35 +141,5 @@ private static List<BigInteger> intToBits(int value) {
     Collections.reverse(bits);
     return bits;
   }
-
-
-  private static List<BigInteger> and(List<BigInteger> left, List<BigInteger> right) {
-    List<BigInteger> bits = new ArrayList<>(left.size());
-    for (int i = 0; i < left.size(); i++) {
-      bits.add(left.get(i).multiply(right.get(i)).mod(BigInteger.valueOf(2)));
-    }
-    return bits;
-  }
-
-  private static List<BigInteger> xor(List<BigInteger> left, List<BigInteger> right) {
-    List<BigInteger> bits = new ArrayList<>(left.size());
-    for (int i = 0; i < left.size(); i++) {
-      bits.add(left.get(i).add(right.get(i)).mod(BigInteger.valueOf(2)));
-    }
-    return bits;
-  }
-
-  private static DRes<SInt> bit(ProtocolBuilderNumeric root, int bit) {
-    return root.conversion().toBoolean(root.numeric().input(BigInteger.valueOf(bit), 1));
-  }
-
-  private static List<BigInteger> randomBits(int num, int seed) {
-    Random random = new Random(seed);
-    List<BigInteger> bits = new ArrayList<>(num);
-    for (int i = 0; i < num; i++) {
-      bits.add(random.nextBoolean() ? BigInteger.ONE : BigInteger.ZERO);
-    }
-    return bits;
-  }
-
+  
 }

From 5269b16790ef0ae8e66d0979899ccb0a7f22112c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 7 May 2018 14:17:25 +0200
Subject: [PATCH 125/231] Bit less than tests

---
 .../lib/compare/lt/BitLessThanOpenTests.java  |  9 +-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |  1 -
 .../computations/TestSpdz2kComparison.java    | 92 ++++++++++++++++++-
 3 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
index 8631143ab..bda82dca7 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpenTests.java
@@ -37,13 +37,12 @@ public void test() {
               root -> {
                 int numBits = 32;
                 setupInputs(conf.getResourcePool().getModulus(), numBits);
-                int myId = root.getBasicNumericContext().getMyId();
                 List<DRes<BigInteger>> results = new ArrayList<>(left.size());
                 for (int i = 0; i < left.size(); i++) {
                   int finalI = i;
                   DRes<OInt> leftValue = () -> root.getOIntFactory()
                       .fromBigInteger(left.get(finalI));
-                  DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(finalI), myId,
+                  DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(finalI),
                       numBits);
                   results.add(
                       root.numeric().open(root.seq(new BitLessThanOpen(leftValue, rightValue)))
@@ -94,12 +93,10 @@ private void setupInputs(BigInteger modulus, int numBits) {
 
   private static DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root,
       BigInteger value,
-      int myId, int numBits) {
+      int numBits) {
     List<BigInteger> openList = MathUtils.toBits(value, numBits);
     Collections.reverse(openList);
-    return (myId == 1) ?
-        root.collections().closeList(openList, 1)
-        : root.collections().closeList(numBits, 1);
+    return root.collections().closeList(openList, 1);
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 83c16341c..0f4525f84 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -79,7 +79,6 @@ public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
     return builder.seq(seq -> {
       Spdz2kSIntBoolean<PlainT> bit = factory.toSpdz2kSIntBoolean(secretBit);
-      System.out.println(bit);
       return seq.numeric().openAsOInt(bit.asArithmetic());
     }).seq((seq, opened) -> {
       PlainT openBit = factory.fromOInt(opened);
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
index a08ef71ef..df5493476 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
@@ -4,11 +4,13 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
 import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.NumericResourcePool;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.framework.util.MathUtils;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -25,10 +27,12 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -65,6 +69,12 @@ public void testCarryOutRandom() {
         EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testBitLessThan() {
+    runTest(new TestBitLessThanOpenSpdz2k<>(),
+        EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
@@ -125,6 +135,86 @@ public void test() {
     }
   }
 
+  public static class TestBitLessThanOpenSpdz2k<ResourcePoolT extends NumericResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    private List<BigInteger> left;
+    private List<BigInteger> right;
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                int numBits = 32;
+                OIntFactory oIntFactory = root.getOIntFactory();
+                setupInputs(conf.getResourcePool().getModulus(), numBits);
+                List<DRes<OInt>> results = new ArrayList<>(left.size());
+                for (int i = 0; i < left.size(); i++) {
+                  OInt leftValue = oIntFactory.fromBigInteger(left.get(i));
+                  DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(i),
+                      numBits);
+                  results.add(
+                      root.logical()
+                          .openAsBit(root.comparison().compareLTBits(leftValue, rightValue))
+                  );
+                }
+                return () -> results.stream().map(v -> oIntFactory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = new ArrayList<>(left.size());
+          for (int i = 0; i < left.size(); i++) {
+            boolean leq = left.get(i).compareTo(right.get(i)) < 0;
+            expected.add(leq ? BigInteger.ONE : BigInteger.ZERO);
+          }
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+
+    private void setupInputs(BigInteger modulus, int numBits) {
+      Random random = new Random(42);
+      this.left = Arrays.asList(
+          BigInteger.ZERO,
+          BigInteger.ONE,
+          BigInteger.ZERO,
+          BigInteger.valueOf(5),
+          BigInteger.valueOf(111),
+          BigInteger.valueOf(111),
+          modulus.subtract(BigInteger.ONE),
+          modulus.subtract(BigInteger.ONE),
+          BigInteger.valueOf(2055014152),
+          new BigInteger(numBits, random).mod(modulus)
+      );
+      this.right = Arrays.asList(
+          BigInteger.ONE,
+          BigInteger.ZERO,
+          BigInteger.ZERO,
+          BigInteger.valueOf(4),
+          BigInteger.valueOf(111),
+          BigInteger.valueOf(112),
+          modulus.subtract(BigInteger.ONE),
+          modulus.subtract(BigInteger.valueOf(2)),
+          BigInteger.valueOf(2055014153),
+          new BigInteger(numBits, random).mod(modulus)
+      );
+    }
+
+  }
+
+  private static DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root,
+      BigInteger value,
+      int numBits) {
+    List<BigInteger> openList = MathUtils.toBits(value, numBits);
+    Collections.reverse(openList);
+    return root.conversion().toBooleanBatch(root.collections().closeList(openList, 1));
+  }
+
   private static BigInteger carry(int a, int b) {
     long res = Integer.toUnsignedLong(a) + Integer.toUnsignedLong(b);
     int carry = (int) ((res & (1L << 32)) >> 32);
@@ -141,5 +231,5 @@ private static List<BigInteger> intToBits(int value) {
     Collections.reverse(bits);
     return bits;
   }
-  
+
 }

From 7c0c19a49f043aac0e9fa58ba5c388b653a67a83 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 7 May 2018 15:33:13 +0200
Subject: [PATCH 126/231] Less than boolean mode

---
 .../framework/builder/numeric/Comparison.java |  5 ----
 .../builder/numeric/DefaultComparison.java    |  5 ----
 .../arithmetic/ComparisonLoggerDecorator.java |  5 ----
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  7 +++++-
 .../fresco/suite/spdz2k/Spdz2kComparison.java | 11 +++++++++
 .../suite/spdz2k/datatypes/CompUInt.java      |  2 --
 .../suite/spdz2k/datatypes/CompUInt128.java   |  5 ----
 .../spdz2k/datatypes/CompUInt128Bit.java      |  5 ----
 .../suite/spdz2k/datatypes/CompUInt96.java    |  5 ----
 .../computations/lt/MostSignBitSpdz2k.java    |  4 ++--
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  | 24 +++++++++----------
 ...cArithmetic128.java => TestSpdz2k128.java} |  4 ++--
 ...sicArithmetic96.java => TestSpdz2k96.java} |  2 +-
 .../computations/TestSpdz2kComparison.java    | 14 ++++++++---
 14 files changed, 45 insertions(+), 53 deletions(-)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/{TestSpdz2kBasicArithmetic128.java => TestSpdz2k128.java} (91%)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/{TestSpdz2kBasicArithmetic96.java => TestSpdz2k96.java} (94%)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 8dea9510b..54a78520c 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -93,11 +93,6 @@ default DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y) {
    */
   DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits);
 
-  /**
-   * Default call to {@link #compareLTBits(DRes, DRes)} with unwrapped arguments.
-   */
-  DRes<SInt> compareLTBits(OInt openValue, List<DRes<SInt>> secretBits);
-
   /**
    * Compares if x <= y, but with twice the possible bit-length. Requires that the maximum bit
    * length is set to something that can handle this scenario. It has to be at least less than half
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 5ee60f895..94de2dbd9 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -62,11 +62,6 @@ public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> sec
     return builder.seq(new BitLessThanOpen(openValue, secretBits));
   }
 
-  @Override
-  public DRes<SInt> compareLTBits(OInt openValue, List<DRes<SInt>> secretBits) {
-    return builder.seq(new BitLessThanOpen(openValue, secretBits));
-  }
-
   @Override
   public DRes<SInt> sign(DRes<SInt> x) {
     Numeric input = builder.numeric();
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 55462c6b9..b31e73998 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -65,11 +65,6 @@ public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> sec
     return this.delegate.compareLTBits(openValue, secretBits);
   }
 
-  @Override
-  public DRes<SInt> compareLTBits(OInt openValue, List<DRes<SInt>> secretBits) {
-    return this.compareLTBits(() -> openValue, () -> secretBits);
-  }
-
   @Override
   public DRes<SInt> compareLEQLong(DRes<SInt> x1, DRes<SInt> x2) {
     leqCount++;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 142b0c688..b64c49552 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -59,7 +59,12 @@ public BasicNumericContext getBasicNumericContext() {
 
   @Override
   public Comparison createComparison(ProtocolBuilderNumeric builder) {
-    return new Spdz2kComparison<>(this, builder, factory);
+    if (!useBooleanMode) {
+      throw new IllegalStateException(
+          "Need to enable boolean mode to perform comparisons in spdz2k");
+    } else {
+      return new Spdz2kComparison<>(this, builder, factory);
+    }
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index 777e2086a..4fd92e2db 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -4,10 +4,12 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
+import java.util.List;
 
 /**
  * Spdz2k optimized protocols for comparison.
@@ -34,5 +36,14 @@ public DRes<SInt> compareLT(DRes<SInt> x1, DRes<SInt> x2, Algorithm algorithm) {
     }
   }
 
+  @Override
+  public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits) {
+    DRes<List<DRes<SInt>>> converted = builder.conversion().toBooleanBatch(secretBits);
+    return super.compareLTBits(openValue, converted);
+  }
+
+  protected CompUIntFactory<PlainT> getFactory() {
+    return factory;
+  }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index d542310cf..15546e8ee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -59,8 +59,6 @@ public interface CompUInt<
    */
   CompT toArithmeticRep();
 
-  CompT copy();
-
   /**
    * Get length of least significant bit segment, i.e., k.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index dc1b4cbeb..e792fa746 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -208,11 +208,6 @@ public CompUInt128 toArithmeticRep() {
     throw new IllegalStateException("Already arithmetic");
   }
 
-  @Override
-  public CompUInt128 copy() {
-    return new CompUInt128(high, mid, low);
-  }
-
   @Override
   public int getLowBitLength() {
     return 64;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index a4531d99d..6a9738d05 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -66,11 +66,6 @@ public byte[] serializeLeastSignificant() {
     return new byte[]{(byte) (mid >>> 31)};
   }
 
-  @Override
-  public CompUInt128 copy() {
-    return new CompUInt128Bit(high, mid, low);
-  }
-
   public boolean getValueBit() {
     return testBit(63);
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 4b65da6a7..1e7d5abd6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -183,11 +183,6 @@ public CompUInt96 toArithmeticRep() {
     return null;
   }
 
-  @Override
-  public CompUInt96 copy() {
-    return new CompUInt96(high, mid, low);
-  }
-
   @Override
   public int getLowBitLength() {
     return 32;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index 864c14aae..c6cc6ebf7 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -49,10 +49,10 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           RandomBitMask mask = pair.getSecond();
           DRes<SInt> rPrime = mask.getValue();
           List<DRes<SInt>> rPrimeBits = mask.getBits().out();
-          DRes<SInt> u = seq.comparison().compareLTBits(cPrime, rPrimeBits);
+          DRes<SInt> u = seq.comparison().compareLTBits(cPrime, () -> rPrimeBits);
           DRes<SInt> aPrime = nb.add(
               nb.subFromOpen(() -> cPrime, rPrime),
-              nb.multByOpen(twoTo2k1, u)
+              () -> factory.toSpdz2kSIntBoolean(u).asArithmetic()
           );
           DRes<SInt> d = nb.sub(value, aPrime);
           DRes<SInt> b = nb.randomBit();
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 038c0f9c3..8fb3b69f6 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -4,13 +4,13 @@
 import dk.alexandra.fresco.lib.arithmetic.BasicArithmeticTests;
 import dk.alexandra.fresco.lib.collections.io.CloseListTests.TestCloseAndOpenList;
 import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
-import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
-import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAnd;
-import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestAndKnown;
-import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestNot;
-import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestOr;
-import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests.TestXorKnown;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kComparison.TestBitLessThanOpenSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestAndKnownSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestAndSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestNotSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestOrSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestXorKnownSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import org.junit.Test;
 
@@ -136,7 +136,7 @@ public void testRandomElement() {
 
   @Test
   public void testBitLessThanOpen() {
-    runTest(new TestBitLessThanOpen<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+    runTest(new TestBitLessThanOpenSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
@@ -152,27 +152,27 @@ public void testLessThanLogRounds() {
 
   @Test
   public void testAndKnown() {
-    runTest(new TestAndKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+    runTest(new TestAndKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testAnd() {
-    runTest(new TestAnd<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+    runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testOr() {
-    runTest(new TestOr<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+    runTest(new TestOrSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testNot() {
-    runTest(new TestNot<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+    runTest(new TestNotSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testXorKnown() {
-    runTest(new TestXorKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+    runTest(new TestXorKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   protected abstract int getMaxBitLength();
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k128.java
similarity index 91%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k128.java
index 98b0397d8..5040dd456 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k128.java
@@ -12,7 +12,7 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.util.function.Supplier;
 
-public class TestSpdz2kBasicArithmetic128 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt128>> {
+public class TestSpdz2k128 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt128>> {
 
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
@@ -31,7 +31,7 @@ protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int n
 
   @Override
   protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSuite() {
-    return new Spdz2kProtocolSuite128();
+    return new Spdz2kProtocolSuite128(true);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic96.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k96.java
similarity index 94%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic96.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k96.java
index a4fa2d211..5cae1e505 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBasicArithmetic96.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k96.java
@@ -12,7 +12,7 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.util.function.Supplier;
 
-public class TestSpdz2kBasicArithmetic96 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt96>> {
+public class TestSpdz2k96 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt96>> {
 
   @Override
   protected Spdz2kResourcePool<CompUInt96> createResourcePool(int playerId, int noOfParties,
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
index df5493476..cdb20fcce 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
@@ -14,6 +14,7 @@
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.compare.lt.CarryOut;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
@@ -75,6 +76,12 @@ public void testBitLessThan() {
         EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testLessThanLogRounds() {
+    runTest(new TestLessThanLogRounds<>(64),
+        EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
@@ -159,8 +166,9 @@ public void test() {
                   DRes<List<DRes<SInt>>> rightValue = toSecretBits(root, right.get(i),
                       numBits);
                   results.add(
-                      root.logical()
-                          .openAsBit(root.comparison().compareLTBits(leftValue, rightValue))
+                      root.logical().openAsBit(
+                          root.comparison().compareLTBits(leftValue, rightValue)
+                      )
                   );
                 }
                 return () -> results.stream().map(v -> oIntFactory.toBigInteger(v.out()))
@@ -212,7 +220,7 @@ private static DRes<List<DRes<SInt>>> toSecretBits(ProtocolBuilderNumeric root,
       int numBits) {
     List<BigInteger> openList = MathUtils.toBits(value, numBits);
     Collections.reverse(openList);
-    return root.conversion().toBooleanBatch(root.collections().closeList(openList, 1));
+    return root.collections().closeList(openList, 1);
   }
 
   private static BigInteger carry(int a, int b) {

From 2fc4c032efb01f62d255d45363ee4cc6526c460d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 8 May 2018 13:05:05 +0200
Subject: [PATCH 127/231] Clean up and protocol

---
 .../suite/spdz2k/datatypes/CompUInt.java      |  14 ++-
 .../suite/spdz2k/datatypes/CompUInt128.java   |   5 +
 .../spdz2k/datatypes/CompUInt128Bit.java      |  16 ++-
 .../suite/spdz2k/datatypes/CompUInt96.java    |   5 +
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   |  22 ++--
 .../protocols/natives/Spdz2kAndProtocol.java  | 102 +++++-------------
 .../natives/Spdz2kXorKnownProtocol.java       |   2 +-
 .../protocols/natives/Spdz2kXorProtocol.java  |   2 +-
 8 files changed, 74 insertions(+), 94 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 15546e8ee..4a7119d75 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -59,6 +59,18 @@ public interface CompUInt<
    */
   CompT toArithmeticRep();
 
+  /**
+   * Computes product of this and value.
+   */
+  CompT multiply(int value);
+
+  /**
+   * Returns bit value as integer of this. <p>This is only supported by bit representations of CompUInt.</p>
+   */
+  default int bitValue() {
+    throw new IllegalStateException("Only supported by bit representations");
+  }
+
   /**
    * Get length of least significant bit segment, i.e., k.
    */
@@ -84,7 +96,7 @@ default int getBitLength() {
   default byte[] serializeWhole() {
     return toByteArray();
   }
-  
+
   default byte[] serializeLeastSignificant() {
     return getLeastSignificant().toByteArray();
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index e792fa746..c30864b38 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -193,6 +193,11 @@ public CompUInt128 clearAboveBitAt(int bitPos) {
     }
   }
 
+  @Override
+  public CompUInt128 multiply(int value) {
+    return multiply(new CompUInt128(0L, 0, value));
+  }
+
   @Override
   public CompUInt128 clearHighBits() {
     return new CompUInt128(0, mid, low);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 6a9738d05..87de65444 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -18,7 +18,6 @@ private CompUInt128Bit(long high, int mid, int low) {
 
   @Override
   public CompUInt128 multiply(CompUInt128 other) {
-//    CompUInt128Bit test = ((CompUInt128Bit) other);
     int bit = mid >>> 31;
     int otherBit = other.mid >>> 31;
     return new CompUInt128Bit(
@@ -66,6 +65,21 @@ public byte[] serializeLeastSignificant() {
     return new byte[]{(byte) (mid >>> 31)};
   }
 
+  @Override
+  public CompUInt128 clearHighBits() {
+    return new CompUInt128Bit(0L, mid, 0);
+  }
+
+  @Override
+  public int bitValue() {
+    return (mid & 0x80000000) >>> 31;
+  }
+
+  @Override
+  public CompUInt128 multiply(int value) {
+    return this.multiply(new CompUInt128Bit(0L, value));
+  }
+
   public boolean getValueBit() {
     return testBit(63);
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 1e7d5abd6..8cdf30668 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -183,6 +183,11 @@ public CompUInt96 toArithmeticRep() {
     return null;
   }
 
+  @Override
+  public CompUInt96 multiply(int value) {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public int getLowBitLength() {
     return 32;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 0273861a1..94feef277 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -27,30 +27,20 @@ public Spdz2kSIntBoolean(PlainT share, PlainT macKeyShare, PlainT zero, boolean
   /**
    * Compute sum of this and other.
    */
-  public Spdz2kSIntBoolean<PlainT> add(Spdz2kSIntBoolean<PlainT> other) {
+  public Spdz2kSIntBoolean<PlainT> xor(Spdz2kSIntBoolean<PlainT> other) {
     return new Spdz2kSIntBoolean<>(
         share.add(other.share),
         macShare.add(other.macShare)
     );
   }
 
-  /**
-   * Compute difference of this and other.
-   */
-  public Spdz2kSIntBoolean<PlainT> subtract(Spdz2kSIntBoolean<PlainT> other) {
-    return new Spdz2kSIntBoolean<>(
-        share.subtract(other.share),
-        macShare.subtract(other.macShare)
-    );
-  }
-
   /**
    * Compute product of this and constant (open) value.
    */
-  public Spdz2kSIntBoolean<PlainT> multiply(PlainT other) {
+  public Spdz2kSIntBoolean<PlainT> and(int otherBit) {
     return new Spdz2kSIntBoolean<>(
-        share.multiply(other),
-        macShare.multiply(other.toArithmeticRep())
+        share.multiply(otherBit),
+        macShare.multiply(otherBit)
     );
   }
 
@@ -65,11 +55,11 @@ public Spdz2kSIntBoolean<PlainT> multiply(PlainT other) {
    * @param isPartyOne used to ensure that only one party adds value to share
    * @return result of sum
    */
-  public Spdz2kSIntBoolean<PlainT> addConstant(
+  public Spdz2kSIntBoolean<PlainT> xorOpen(
       PlainT other, PlainT macKeyShare, PlainT zero, boolean isPartyOne) {
     Spdz2kSIntBoolean<PlainT> wrapped = new Spdz2kSIntBoolean<>(other, macKeyShare, zero,
         isPartyOne);
-    return add(wrapped);
+    return xor(wrapped);
   }
 
   public Spdz2kSIntArithmetic<PlainT> asArithmetic() {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
index 889149104..28f502a4b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndProtocol.java
@@ -2,7 +2,6 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
 import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
@@ -43,49 +42,42 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
       triple = resourcePool.getDataSupplier().getNextBitTripleShares();
-      epsilon = factory.toSpdz2kSIntBoolean(left).subtract(triple.getLeft());
-      delta = factory.toSpdz2kSIntBoolean(right).subtract(triple.getRight());
-      network.sendToAll(epsilon.serializeShareLow());
-      network.sendToAll(delta.serializeShareLow());
+      epsilon = factory.toSpdz2kSIntBoolean(left).xor(triple.getLeft());
+      delta = factory.toSpdz2kSIntBoolean(right).xor(triple.getRight());
+      int packed = epsilon.serializeShareLow()[0] ^ (delta.serializeShareLow()[0] << 1);
+      final byte[] bytes = new byte[]{(byte) packed};
+      network.sendToAll(bytes);
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
       Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
           resourcePool.getNoOfParties(),
-          factory, null);
-      // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+          factory);
       PlainT e = epsilonAndDelta.getFirst();
       PlainT d = epsilonAndDelta.getSecond();
-      PlainT ed = e.multiply(d);
-      Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
-      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
-      Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
-      this.product = tripleProduct
-          .add(e.testBit(63) ? tripleRight : new Spdz2kSIntBoolean<>(factory.zero().toBitRep(), factory.zero()))
-          .add(d.testBit(63) ? tripleLeft : new Spdz2kSIntBoolean<>(factory.zero().toBitRep(), factory.zero()))
-//          .add(tripleLeft)
-//      this.product = tripleProduct
-//          .add(tripleRight.multiply(e))
-//          .add(tripleLeft.multiply(d))
-          .addConstant(ed,
-              macKeyShare,
-              factory.zero().toBitRep(),
-              resourcePool.getMyId() == 1);
-//      System.out.println(product);
-//      System.out.println();
-      // seems that shares need to be reconstructed arithmetically?
       resourcePool.getOpenedValueStore().pushOpenedValues(
           Arrays.asList(
-//              epsilon.asArithmetic(),
               epsilon.asArithmetic(),
               delta.asArithmetic()
           ),
           Arrays.asList(
               e.toArithmeticRep(),
               d.toArithmeticRep()
-//              factory.one().shiftLeft(64)
-//              e.toArithmeticRep().multiply(factory.two())
           )
       );
+      int eBit = e.bitValue();
+      int dBit = d.bitValue();
+      PlainT ed = e.multiply(d);
+      // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+      Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+      Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+      this.product = tripleProduct
+          .xor(tripleRight.and(eBit))
+          .xor(tripleLeft.and(dBit))
+          .xorOpen(ed,
+              macKeyShare,
+              factory.zero().toBitRep(),
+              resourcePool.getMyId() == 1);
       return EvaluationStatus.IS_DONE;
     }
   }
@@ -93,57 +85,19 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
   /**
    * Retrieves shares for epsilon and delta and reconstructs each.
    */
-  private int[] receiveAndReconstruct(Network network,
-      int noOfParties) {
-    int e = 0;
-    int d = 0;
-    for (int i = 1; i <= noOfParties; i++) {
-      e = e ^ network.receive(i)[0];
-      d = d ^ network.receive(i)[0];
-    }
-    return new int[]{e, d};
-  }
-
   private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
       int noOfParties, CompUIntFactory<PlainT> factory) {
-    int e = 0;
-    int d = 0;
-    for (int i = 1; i <= noOfParties; i++) {
-      e = e ^ network.receive(i)[0];
-      d = d ^ network.receive(i)[0];
-    }
-    return new Pair<>(factory.fromBit(e), factory.fromBit(d));
-  }
-
-  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
-      int noOfParties, CompUIntFactory<PlainT> factory,
-      ByteSerializer<PlainT> serializer) {
-    PlainT e = factory.zero();
-    PlainT d = factory.zero();
-    for (int i = 1; i <= noOfParties; i++) {
-      byte[] bytesE = network.receive(i);
-      byte[] tempE = new byte[16];
-      tempE[15] = bytesE[0];
-      e = e.add(factory.createFromBytes(tempE));
-      byte[] bytesD = network.receive(i);
-      byte[] tempD = new byte[16];
-      tempD[15] = bytesD[0];
-      d = d.add(factory.createFromBytes(tempD));
+    int received = network.receive(1)[0];
+    PlainT e = factory.fromBit(received & 1); // first bit
+    PlainT d = factory.fromBit((received & 2) >>> 1); // second bit
+    for (int i = 2; i <= noOfParties; i++) {
+      received = network.receive(i)[0];
+      e = e.add(factory.fromBit(received & 1));
+      d = d.add(factory.fromBit((received & 2) >>> 1));
     }
-    return new Pair<>(e.toBitRep(), d.toBitRep());
+    return new Pair<>(e, d);
   }
 
-//  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
-//      int noOfParties, CompUIntFactory<PlainT> factory) {
-//    int e = 0;
-//    int d = 0;
-//    for (int i = 1; i <= noOfParties; i++) {
-//      e = e ^ network.receive(i)[0];
-//      d = d ^ network.receive(i)[0];
-//    }
-//    return new Pair<>(factory.fromBit(e), factory.fromBit(d));
-//  }
-
   @Override
   public SInt out() {
     return product;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
index 9f5a9e126..4c5150538 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
@@ -32,7 +32,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     PlainT known = factory.fromOInt(left.out()).toBitRep();
     PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
-    result = factory.toSpdz2kSIntBoolean(right).addConstant(known,
+    result = factory.toSpdz2kSIntBoolean(right).xorOpen(known,
         secretSharedKey, factory.zero().toBitRep(), resourcePool.getMyId() == 1);
     return EvaluationStatus.IS_DONE;
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java
index e6d5c1ed5..8a890d297 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorProtocol.java
@@ -26,7 +26,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Network network) {
     Spdz2kSIntBoolean<PlainT> leftBit = resourcePool.getFactory().toSpdz2kSIntBoolean(left);
     Spdz2kSIntBoolean<PlainT> rightBit = resourcePool.getFactory().toSpdz2kSIntBoolean(right);
-    result = leftBit.add(rightBit);
+    result = leftBit.xor(rightBit);
     return EvaluationStatus.IS_DONE;
   }
 

From 9c038719718ed145ffc3d4af6d73da24cc8120a9 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 8 May 2018 17:14:31 +0200
Subject: [PATCH 128/231] Boolean conversion as native protocol

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 46 +--------------
 .../fresco/suite/spdz2k/Spdz2kConversion.java | 57 +++++++++++++++++++
 .../suite/spdz2k/datatypes/CompUInt.java      |  2 +-
 .../suite/spdz2k/datatypes/CompUInt128.java   |  2 +-
 .../spdz2k/datatypes/CompUInt128Bit.java      | 43 ++++++++++++--
 .../suite/spdz2k/datatypes/CompUInt96.java    |  2 +-
 .../spdz2k/datatypes/Spdz2kSIntBoolean.java   |  4 +-
 .../Spdz2kArithmeticToBooleanProtocol.java    | 38 +++++++++++++
 8 files changed, 139 insertions(+), 55 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index b64c49552..746258121 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -18,8 +18,6 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
@@ -30,8 +28,6 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomElementProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kSubtractFromKnownProtocol;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Basic native builder for the SPDZ2k protocol suite.
@@ -195,47 +191,7 @@ public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
 
   @Override
   public Conversion createConversion(ProtocolBuilderNumeric builder) {
-    return new Conversion() {
-      @Override
-      public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
-        return () -> {
-          Spdz2kSIntArithmetic<PlainT> value = factory.toSpdz2kSIntArithmetic(arithmeticValue);
-          return new Spdz2kSIntBoolean<>(
-              value.getShare().toBitRep(),
-              value.getMacShare().shiftLeft(63)
-          );
-        };
-      }
-
-      @Override
-      public DRes<SInt> toArithmetic(DRes<SInt> booleanValue) {
-        throw new UnsupportedOperationException();
-      }
-
-      @Override
-      public DRes<List<DRes<SInt>>> toBooleanBatch(DRes<List<DRes<SInt>>> arithmeticBatch) {
-        return builder.par(par -> {
-          List<DRes<SInt>> inner = arithmeticBatch.out();
-          List<DRes<SInt>> converted = new ArrayList<>(inner.size());
-          for (DRes<SInt> anInner : inner) {
-            converted.add(builder.conversion().toBoolean(anInner));
-          }
-          return () -> converted;
-        });
-      }
-
-      @Override
-      public DRes<List<DRes<SInt>>> toArithmeticBatch(DRes<List<DRes<SInt>>> booleanBatch) {
-        return builder.par(par -> {
-          List<DRes<SInt>> inner = booleanBatch.out();
-          List<DRes<SInt>> converted = new ArrayList<>(inner.size());
-          for (DRes<SInt> anInner : inner) {
-            converted.add(builder.conversion().toArithmetic(anInner));
-          }
-          return () -> converted;
-        });
-      }
-    };
+    return new Spdz2kConversion<>(builder);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
new file mode 100644
index 000000000..cbc69c408
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
@@ -0,0 +1,57 @@
+package dk.alexandra.fresco.suite.spdz2k;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.Conversion;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kArithmeticToBooleanProtocol;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Spdz2k optimized protocols for converting between arithmetic and boolean representations.
+ */
+public class Spdz2kConversion<PlainT extends CompUInt<?, ?, PlainT>> implements Conversion {
+
+  private final ProtocolBuilderNumeric builder;
+
+  public Spdz2kConversion(ProtocolBuilderNumeric builder) {
+    this.builder = builder;
+  }
+
+  @Override
+  public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
+    return builder.append(new Spdz2kArithmeticToBooleanProtocol<>(arithmeticValue));
+  }
+
+  @Override
+  public DRes<SInt> toArithmetic(DRes<SInt> booleanValue) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> toBooleanBatch(DRes<List<DRes<SInt>>> arithmeticBatch) {
+    return builder.par(par -> {
+      List<DRes<SInt>> inner = arithmeticBatch.out();
+      List<DRes<SInt>> converted = new ArrayList<>(inner.size());
+      for (DRes<SInt> anInner : inner) {
+        converted.add(par.conversion().toBoolean(anInner));
+      }
+      return () -> converted;
+    });
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> toArithmeticBatch(DRes<List<DRes<SInt>>> booleanBatch) {
+    return builder.par(par -> {
+      List<DRes<SInt>> inner = booleanBatch.out();
+      List<DRes<SInt>> converted = new ArrayList<>(inner.size());
+      for (DRes<SInt> anInner : inner) {
+        converted.add(par.conversion().toArithmetic(anInner));
+      }
+      return () -> converted;
+    });
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 4a7119d75..7c86078ee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -62,7 +62,7 @@ public interface CompUInt<
   /**
    * Computes product of this and value.
    */
-  CompT multiply(int value);
+  CompT multiplyByBit(int value);
 
   /**
    * Returns bit value as integer of this. <p>This is only supported by bit representations of CompUInt.</p>
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index c30864b38..3eba54374 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -194,7 +194,7 @@ public CompUInt128 clearAboveBitAt(int bitPos) {
   }
 
   @Override
-  public CompUInt128 multiply(int value) {
+  public CompUInt128 multiplyByBit(int value) {
     return multiply(new CompUInt128(0L, 0, value));
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 87de65444..70b21bc19 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -1,18 +1,21 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CompUInt128Bit extends CompUInt128 {
 
   private static final CompUInt128Bit ONE = new CompUInt128Bit(0, 0x80000000, 0);
 
-  private CompUInt128Bit(long high, int mid, int low) {
+  public CompUInt128Bit(long high, int mid, int low) {
     super(high, mid, low);
   }
 
-  CompUInt128Bit(long high, int bit) {
+  public CompUInt128Bit(long high, int bit) {
     super(high, bit << 31, 0);
   }
 
-  CompUInt128Bit(CompUInt128 other) {
+  public CompUInt128Bit(CompUInt128 other) {
     super(other);
   }
 
@@ -28,7 +31,6 @@ public CompUInt128 multiply(CompUInt128 other) {
 
   @Override
   public CompUInt128 add(CompUInt128 other) {
-//    CompUInt128Bit test = ((CompUInt128Bit) other);
     CompUInt128 sum = super.add(other);
     return new CompUInt128Bit(sum.high, sum.mid, sum.low);
   }
@@ -76,7 +78,8 @@ public int bitValue() {
   }
 
   @Override
-  public CompUInt128 multiply(int value) {
+  public CompUInt128 multiplyByBit(int value) {
+    // TODO
     return this.multiply(new CompUInt128Bit(0L, value));
   }
 
@@ -84,4 +87,34 @@ public boolean getValueBit() {
     return testBit(63);
   }
 
+  public static void main(String[] args) {
+    System.out.println("Hello world");
+    int numProds = 10000000;
+    CompUInt128Factory factory = new CompUInt128Factory();
+    List<CompUInt128> values = new ArrayList<>(numProds);
+    List<CompUInt128> bits = new ArrayList<>(numProds);
+    for (int i = 0; i < numProds; i++) {
+      CompUInt128 random = factory.createRandom();
+      values.add(random);
+      bits.add(random.toBitRep());
+    }
+
+    List<CompUInt128> result = new ArrayList<>(numProds);
+    long start = System.currentTimeMillis();
+    for (int i = 0; i < numProds; i++) {
+      result.add(values.get(i).add(values.get(i)));
+    }
+    System.out.println(
+        "time " + (System.currentTimeMillis() - start) + " " + result.get(123));
+
+    List<CompUInt128> resultBits = new ArrayList<>(numProds);
+    long startBits = System.currentTimeMillis();
+    for (int i = 0; i < numProds; i++) {
+      resultBits.add(bits.get(i).add(bits.get(i)));
+    }
+    System.out.println(
+        "time " + (System.currentTimeMillis() - startBits) + " " + resultBits.get(123));
+
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 8cdf30668..3bc70699b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -184,7 +184,7 @@ public CompUInt96 toArithmeticRep() {
   }
 
   @Override
-  public CompUInt96 multiply(int value) {
+  public CompUInt96 multiplyByBit(int value) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
index 94feef277..ad90e93bb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntBoolean.java
@@ -39,8 +39,8 @@ public Spdz2kSIntBoolean<PlainT> xor(Spdz2kSIntBoolean<PlainT> other) {
    */
   public Spdz2kSIntBoolean<PlainT> and(int otherBit) {
     return new Spdz2kSIntBoolean<>(
-        share.multiply(otherBit),
-        macShare.multiply(otherBit)
+        share.multiplyByBit(otherBit),
+        macShare.multiplyByBit(otherBit)
     );
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java
new file mode 100644
index 000000000..8a6850145
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java
@@ -0,0 +1,38 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+public class Spdz2kArithmeticToBooleanProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<SInt> arithmetic;
+  private SInt bool;
+
+  public Spdz2kArithmeticToBooleanProtocol(DRes<SInt> arithmetic) {
+    this.arithmetic = arithmetic;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    Spdz2kSIntArithmetic<PlainT> value = resourcePool.getFactory()
+        .toSpdz2kSIntArithmetic(arithmetic);
+    bool = new Spdz2kSIntBoolean<>(
+        value.getShare().toBitRep(),
+        value.getMacShare().shiftLeft(63)
+    );
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public SInt out() {
+    return bool;
+  }
+
+}

From ae3fd44fca82c94fcb069ddf837cbe95ed3461fc Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 10:32:04 +0200
Subject: [PATCH 129/231] And known native

---
 .../fresco/framework/value/OIntFactory.java   | 15 +------
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 13 +------
 .../suite/spdz2k/datatypes/CompUInt.java      |  2 +-
 .../suite/spdz2k/datatypes/CompUInt128.java   |  5 +++
 .../spdz2k/datatypes/CompUIntFactory.java     | 11 ------
 .../computations/lt/MostSignBitSpdz2k.java    |  2 +-
 .../natives/Spdz2kAndKnownProtocol.java       | 39 +++++++++++++++++++
 .../natives/Spdz2kXorKnownProtocol.java       |  4 --
 8 files changed, 49 insertions(+), 42 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
index 0169b8ef3..ca8e1f81d 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
@@ -18,29 +18,16 @@ public interface OIntFactory {
    */
   BigInteger toBigInteger(OInt value);
 
-  /**
-   * Convert open value to long.
-   */
-  default long toLong(OInt value) {
-    return toBigInteger(value).longValue();
-  }
-
   /**
    * Convert {@link BigInteger} to {@link OInt}.
    */
   OInt fromBigInteger(BigInteger value);
 
-  /**
-   * Convert long to {@link OInt}.
-   */
-  default OInt fromLong(long value) {
-    return fromBigInteger(BigInteger.valueOf(value));
-  }
-
   /**
    * Default method for converting multiple instances of {@link BigInteger}.
    */
   default List<DRes<OInt>> fromBigInteger(List<BigInteger> values) {
+    // TODO shouldn't be a DRes
     return values.stream().map(this::fromBigInteger).collect(Collectors.toList());
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 0f4525f84..561ec0a32 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -10,10 +10,10 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
-import java.math.BigInteger;
 
 /**
  * Logical operators for Spdz2k on boolean shares. <p>NOTE: requires that inputs have previously
@@ -52,16 +52,7 @@ public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
 
   @Override
   public DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
-    // TODO
-    return () -> {
-      BigInteger known = factory.toBigInteger(knownBit.out());
-      if (known.equals(BigInteger.ZERO)) {
-        return new Spdz2kSIntBoolean<>(factory.zero().toBitRep(), factory.zero());
-      } else {
-        Spdz2kSIntBoolean<PlainT> out = factory.toSpdz2kSIntBoolean(secretBit);
-        return new Spdz2kSIntBoolean<>(out.getShare(), out.getMacShare());
-      }
-    };
+    return builder.append(new Spdz2kAndKnownProtocol<>(knownBit, secretBit));
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 7c86078ee..151540778 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -65,7 +65,7 @@ public interface CompUInt<
   CompT multiplyByBit(int value);
 
   /**
-   * Returns bit value as integer of this. <p>This is only supported by bit representations of CompUInt.</p>
+   * Returns bit value of this as integer.
    */
   default int bitValue() {
     throw new IllegalStateException("Only supported by bit representations");
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 3eba54374..f3893b55d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -193,6 +193,11 @@ public CompUInt128 clearAboveBitAt(int bitPos) {
     }
   }
 
+  @Override
+  public int bitValue() {
+    return low & 1; // lowest bit
+  }
+
   @Override
   public CompUInt128 multiplyByBit(int value) {
     return multiply(new CompUInt128(0L, 0, value));
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index 4cf95bcd4..efffb99ee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -19,22 +19,11 @@ default BigInteger toBigInteger(OInt value) {
     return ((CompUInt) value).toBigInteger();
   }
 
-  @Override
-  default long toLong(OInt value) {
-    return ((CompUInt) value).toLong();
-  }
-
   @Override
   default OInt fromBigInteger(BigInteger value) {
     return createFromBigInteger(value);
   }
 
-  @Override
-  default OInt fromLong(long value) {
-    // TODO rethink this
-    return fromBigInteger(BigInteger.valueOf(value));
-  }
-
   default CompT fromBit(int bit) {
     throw new UnsupportedOperationException();
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index c6cc6ebf7..39c9d3241 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -52,7 +52,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           DRes<SInt> u = seq.comparison().compareLTBits(cPrime, () -> rPrimeBits);
           DRes<SInt> aPrime = nb.add(
               nb.subFromOpen(() -> cPrime, rPrime),
-              () -> factory.toSpdz2kSIntBoolean(u).asArithmetic()
+              () -> factory.toSpdz2kSIntBoolean(u).asArithmetic().out()
           );
           DRes<SInt> d = nb.sub(value, aPrime);
           DRes<SInt> b = nb.randomBit();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownProtocol.java
new file mode 100644
index 000000000..7cbe9ccd9
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownProtocol.java
@@ -0,0 +1,39 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+public class Spdz2kAndKnownProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<OInt> left;
+  private final DRes<SInt> right;
+  private SInt result;
+
+  public Spdz2kAndKnownProtocol(
+      DRes<OInt> left,
+      DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    int known = factory.fromOInt(left.out()).toInt();
+    result = factory.toSpdz2kSIntBoolean(right).and(known);
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public SInt out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
index 4c5150538..845772c99 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownProtocol.java
@@ -25,10 +25,6 @@ public Spdz2kXorKnownProtocol(
   @Override
   public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
       Network network) {
-//    BigInteger value = resourcePool.getFactory().toBigInteger(left.out());
-//    PlainT leftBit = resourcePool.getFactory().fromBit();
-//    Spdz2kSIntBoolean<PlainT> rightBit = resourcePool.getFactory().toSpdz2kSIntBoolean(right);
-//    result = leftBit.add(rightBit);
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     PlainT known = factory.fromOInt(left.out()).toBitRep();
     PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();

From c5b0f21851ecba6a35a4a0b1cadf30d7f72a1434 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 10:44:55 +0200
Subject: [PATCH 130/231] Use half or in pre-carry

---
 .../framework/builder/numeric/DefaultLogical.java      |  5 +++++
 .../fresco/framework/builder/numeric/Logical.java      | 10 +++++++---
 .../alexandra/fresco/lib/compare/lt/CarryHelper.java   |  2 +-
 .../fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java  |  5 +++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index eaf4d50ee..2a163990b 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -35,6 +35,11 @@ public DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB) {
     });
   }
 
+  @Override
+  public DRes<SInt> halfOr(DRes<SInt> bitA, DRes<SInt> bitB) {
+    return builder.numeric().add(bitA, bitB);
+  }
+
   @Override
   public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
     // knownBit + secretBit - 2 * knownBit * secretBit
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index a60dee9f1..9856a98e5 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -24,6 +24,12 @@ public interface Logical extends ComputationDirectory {
    */
   DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB);
 
+  /**
+   * Computes logical OR of inputs but is only safe to use when at least one of the bits is 0.
+   * <p>This allows to express and or as a linear operation and therefore far more efficient.</p>
+   */
+  DRes<SInt> halfOr(DRes<SInt> bitA, DRes<SInt> bitB);
+
   /**
    * Computes logical XOR of inputs. <p>NOTE: Inputs must represent 0 or 1 values only.</p>
    */
@@ -91,9 +97,7 @@ DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
       DRes<List<DRes<SInt>>> secretBits);
 
   /**
-   * Computes logical OR of all input bits.
-   * <p>
-   * NOTE: Inputs must represent 0 or 1 values only.
+   * Computes logical OR of all input bits. <p> NOTE: Inputs must represent 0 or 1 values only.
    * </p>
    */
   DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
index a0454a001..0a5595d8e 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
@@ -38,7 +38,7 @@ public DRes<SIntPair> buildComputation(ProtocolBuilderNumeric builder) {
       DRes<SInt> p = par.logical().and(p1, p2);
       DRes<SInt> q = par.seq(seq -> {
         DRes<SInt> temp = seq.logical().and(p2, g1);
-        return seq.logical().or(temp, g2);
+        return seq.logical().halfOr(temp, g2);
       });
       return () -> new SIntPair(p, q);
     });
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 561ec0a32..f0e7d5e44 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -50,6 +50,11 @@ public DRes<SInt> xor(DRes<SInt> bitA, DRes<SInt> bitB) {
     return builder.append(new Spdz2kXorProtocol<>(bitA, bitB));
   }
 
+  @Override
+  public DRes<SInt> halfOr(DRes<SInt> bitA, DRes<SInt> bitB) {
+    return xor(bitA, bitB);
+  }
+
   @Override
   public DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
     return builder.append(new Spdz2kAndKnownProtocol<>(knownBit, secretBit));

From 054656636cac508003e6b6d8bc59a7df33e58a9d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 11:05:34 +0200
Subject: [PATCH 131/231] Rewrite pre-carry as while-loop

---
 .../fresco/lib/compare/lt/PreCarryBits.java   | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 1e18940b8..68dbd9e92 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -13,30 +13,27 @@ public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
 
   private final DRes<List<DRes<SIntPair>>> pairsDef;
 
-  public PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
+  PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
     this.pairsDef = pairs;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    List<DRes<SIntPair>> pairs = pairsDef.out();
-    // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
-    Collections.reverse(pairs);
-    padIfUneven(pairs);
-    if (pairs.size() == 1) {
-      return pairs.get(0).out().getSecond();
-    } else {
-      return builder.par(par -> {
-        List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(pairs.size() / 2);
-        for (int i = 0; i < pairs.size() / 2; i++) {
-          DRes<SIntPair> left = pairs.get(2 * i + 1);
-          DRes<SIntPair> right = pairs.get(2 * i);
-          nextRoundInner.add(par.seq(new CarryHelper(left, right)));
-        }
-        Collections.reverse(nextRoundInner);
-        return () -> nextRoundInner;
-      }).seq((seq, nextRound) -> new PreCarryBits(() -> nextRound).buildComputation(seq));
-    }
+    return builder.seq(seq -> pairsDef)
+        .whileLoop((pairs) -> pairs.size() > 1,
+            (prevSeq, pairs) -> prevSeq.par(par -> {
+              // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
+              Collections.reverse(pairs);
+              padIfUneven(pairs);
+              List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(pairs.size() / 2);
+              for (int i = 0; i < pairs.size() / 2; i++) {
+                DRes<SIntPair> left = pairs.get(2 * i + 1);
+                DRes<SIntPair> right = pairs.get(2 * i);
+                nextRoundInner.add(par.seq(new CarryHelper(left, right)));
+              }
+              Collections.reverse(nextRoundInner);
+              return () -> nextRoundInner;
+            })).seq((ignored, out) -> out.get(0).out().getSecond());
   }
 
   /**

From cf36d48d8ff15223466ba6acc939581736da24e8 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 11:36:51 +0200
Subject: [PATCH 132/231] Optimize pre-carry

---
 .../fresco/framework/util/SIntPair.java       |  6 +--
 .../fresco/lib/compare/lt/CarryHelper.java    | 47 -------------------
 .../fresco/lib/compare/lt/CarryOut.java       |  8 ++--
 .../fresco/lib/compare/lt/PreCarryBits.java   | 35 ++++++++++----
 .../fresco/lib/compare/lt/PreCarryTests.java  | 44 ++---------------
 .../TestDummyArithmeticProtocolSuite.java     |  6 ---
 6 files changed, 35 insertions(+), 111 deletions(-)
 delete mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java b/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
index cb0c52161..d09f56161 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/SIntPair.java
@@ -3,15 +3,11 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.SInt;
 
-public class SIntPair extends Pair<DRes<SInt>, DRes<SInt>> implements DRes<SIntPair> {
+public class SIntPair extends Pair<DRes<SInt>, DRes<SInt>> {
 
   public SIntPair(DRes<SInt> first,
       DRes<SInt> second) {
     super(first, second);
   }
 
-  @Override
-  public SIntPair out() {
-    return this;
-  }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
deleted file mode 100644
index 0a5595d8e..000000000
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryHelper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package dk.alexandra.fresco.lib.compare.lt;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.util.SIntPair;
-import dk.alexandra.fresco.framework.value.SInt;
-
-/**
- * Corresponds to circle operator in paper. <p>Given (p_{2}, g_{2}) and (p_{1}, g_{1}) computes (p,
- * g) where p = p_{2} AND p_{1} and g = g_{2} OR (p_{2} AND g_{1}).</p>
- */
-public class CarryHelper implements Computation<SIntPair, ProtocolBuilderNumeric> {
-
-  private final DRes<SIntPair> leftBitPair;
-  private final DRes<SIntPair> rightBitPair;
-
-  public CarryHelper(DRes<SIntPair> leftBitPair, DRes<SIntPair> rightBitPair) {
-    this.leftBitPair = leftBitPair;
-    this.rightBitPair = rightBitPair;
-  }
-
-  @Override
-  public DRes<SIntPair> buildComputation(ProtocolBuilderNumeric builder) {
-    if (leftBitPair == null) {
-      return rightBitPair;
-    }
-    if (rightBitPair == null) {
-      return leftBitPair;
-    }
-    SIntPair left = leftBitPair.out();
-    SIntPair right = rightBitPair.out();
-    DRes<SInt> p1 = left.getFirst();
-    DRes<SInt> g1 = left.getSecond();
-    DRes<SInt> p2 = right.getFirst();
-    DRes<SInt> g2 = right.getSecond();
-    return builder.par(par -> {
-      DRes<SInt> p = par.logical().and(p1, p2);
-      DRes<SInt> q = par.seq(seq -> {
-        DRes<SInt> temp = seq.logical().and(p2, g1);
-        return seq.logical().halfOr(temp, g2);
-      });
-      return () -> new SIntPair(p, q);
-    });
-  }
-
-}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index ed05650d9..bfb389222 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -50,21 +50,21 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     }).par((par, pair) -> {
       List<DRes<SInt>> xoredBits = pair.getFirst();
       List<DRes<SInt>> andedBits = pair.getSecond();
-      List<DRes<SIntPair>> pairs = new ArrayList<>(andedBits.size());
+      List<SIntPair> pairs = new ArrayList<>(andedBits.size());
       for (int i = 0; i < secretBits.size(); i++) {
         DRes<SInt> xoredBit = xoredBits.get(i);
         DRes<SInt> andedBit = andedBits.get(i);
-        pairs.add(() -> new SIntPair(xoredBit, andedBit));
+        pairs.add(new SIntPair(xoredBit, andedBit));
       }
       return () -> pairs;
     }).seq((seq, pairs) -> {
       // need to account for carry-in bit
       int lastIdx = pairs.size() - 1;
-      SIntPair lastPair = pairs.get(lastIdx).out();
+      SIntPair lastPair = pairs.get(lastIdx);
       DRes<SInt> lastCarryPropagator = seq.logical().xor(
           lastPair.getSecond(),
           seq.logical().andKnown(carryIn, lastPair.getFirst()));
-      pairs.set(lastIdx, () -> new SIntPair(lastPair.getFirst(), lastCarryPropagator));
+      pairs.set(lastIdx, new SIntPair(lastPair.getFirst(), lastCarryPropagator));
       Collections.reverse(pairs);
       return seq.seq(new PreCarryBits(() -> pairs));
     });
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 68dbd9e92..11fbf4080 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -11,9 +11,9 @@
 
 public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<List<DRes<SIntPair>>> pairsDef;
+  private final DRes<List<SIntPair>> pairsDef;
 
-  PreCarryBits(DRes<List<DRes<SIntPair>>> pairs) {
+  PreCarryBits(DRes<List<SIntPair>> pairs) {
     this.pairsDef = pairs;
   }
 
@@ -25,21 +25,40 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
               // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
               Collections.reverse(pairs);
               padIfUneven(pairs);
-              List<DRes<SIntPair>> nextRoundInner = new ArrayList<>(pairs.size() / 2);
+              List<SIntPair> nextRoundInner = new ArrayList<>(pairs.size() / 2);
               for (int i = 0; i < pairs.size() / 2; i++) {
-                DRes<SIntPair> left = pairs.get(2 * i + 1);
-                DRes<SIntPair> right = pairs.get(2 * i);
-                nextRoundInner.add(par.seq(new CarryHelper(left, right)));
+                SIntPair left = pairs.get(2 * i + 1);
+                SIntPair right = pairs.get(2 * i);
+                nextRoundInner.add(carry(par, left, right));
               }
               Collections.reverse(nextRoundInner);
               return () -> nextRoundInner;
-            })).seq((ignored, out) -> out.get(0).out().getSecond());
+            })).seq((ignored, out) -> out.get(0).getSecond());
+  }
+
+  private SIntPair carry(ProtocolBuilderNumeric builder, SIntPair left, SIntPair right) {
+    if (left == null) {
+      return right;
+    }
+    if (right == null) {
+      return left;
+    }
+    DRes<SInt> p1 = left.getFirst();
+    DRes<SInt> g1 = left.getSecond();
+    DRes<SInt> p2 = right.getFirst();
+    DRes<SInt> g2 = right.getSecond();
+    DRes<SInt> p = builder.logical().and(p1, p2);
+    DRes<SInt> q = builder.seq(seq -> {
+      DRes<SInt> temp = seq.logical().and(p2, g1);
+      return seq.logical().halfOr(temp, g2);
+    });
+    return new SIntPair(p, q);
   }
 
   /**
    * Pad with dummy null element if number of pairs is uneven.
    */
-  private void padIfUneven(List<DRes<SIntPair>> pairs) {
+  private void padIfUneven(List<SIntPair> pairs) {
     int size = pairs.size();
     if (size % 2 != 0 && size != 1) {
       pairs.add(null);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
index 364b765c8..9ea78b7c9 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
@@ -7,7 +7,6 @@
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
-import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigInteger;
@@ -17,43 +16,6 @@
 
 public class PreCarryTests {
 
-  public static class TestCarryHelper<ResourcePoolT extends ResourcePool>
-      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
-
-    @Override
-    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
-      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
-
-        @Override
-        public void test() {
-          Application<Pair<BigInteger, BigInteger>, ProtocolBuilderNumeric> app = builder -> {
-            Numeric numeric = builder.numeric();
-            DRes<SInt> p1 = numeric.known(BigInteger.ONE);
-            DRes<SInt> g1 = numeric.known(BigInteger.ZERO);
-            DRes<SInt> p2 = numeric.known(BigInteger.ZERO);
-            DRes<SInt> g2 = numeric.known(BigInteger.ONE);
-            SIntPair pairOne = new SIntPair(p1, g1);
-            SIntPair pairTwo = new SIntPair(p2, g2);
-            DRes<SIntPair> carried = builder
-                .seq(new CarryHelper(() -> pairTwo, () -> pairOne));
-            return builder.seq(seq -> {
-              SIntPair carriedOut = carried.out();
-              DRes<BigInteger> p = seq.numeric().open(carriedOut.getFirst());
-              DRes<BigInteger> q = seq.numeric().open(carriedOut.getSecond());
-              return () -> new Pair<>(p.out(), q.out());
-            });
-          };
-          Pair<BigInteger, BigInteger> expected = new Pair<>(
-              BigInteger.ZERO, // p1 * p2
-              BigInteger.ONE  // g2 + (p1 * g1)
-          );
-          Pair<BigInteger, BigInteger> actual = runApplication(app);
-          Assert.assertEquals(expected, actual);
-        }
-      };
-    }
-  }
-
   public static class TestPreCarryBits<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
@@ -71,9 +33,9 @@ public void test() {
             DRes<SInt> g2 = numeric.known(BigInteger.ONE);
             SIntPair pairOne = new SIntPair(p1, g1);
             SIntPair pairTwo = new SIntPair(p2, g2);
-            List<DRes<SIntPair>> pairs = Arrays.asList(
-                () -> pairOne,
-                () -> pairTwo
+            List<SIntPair> pairs = Arrays.asList(
+                pairOne,
+                pairTwo
             );
             DRes<SInt> carried = builder.seq(new PreCarryBits(() -> pairs));
             return builder.numeric().open(carried);
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 9e98abd24..71589e3b4 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -26,7 +26,6 @@
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpenTests.TestBitLessThanOpen;
 import dk.alexandra.fresco.lib.compare.lt.CarryOutTests.TestCarryOut;
 import dk.alexandra.fresco.lib.compare.lt.LessThanZeroTests.TestLessThanZero;
-import dk.alexandra.fresco.lib.compare.lt.PreCarryTests.TestCarryHelper;
 import dk.alexandra.fresco.lib.compare.lt.PreCarryTests.TestPreCarryBits;
 import dk.alexandra.fresco.lib.conditional.ConditionalSelectTests;
 import dk.alexandra.fresco.lib.conditional.ConditionalSwapNeighborsTests;
@@ -828,11 +827,6 @@ public void testMod2mBaseCase() {
     runTest(new TestMod2mBaseCase<>(), params);
   }
 
-  @Test
-  public void testCarryHelper() {
-    runTest(new TestCarryHelper<>(), new TestParameters());
-  }
-
   @Test
   public void testPreCarryBits() {
     runTest(new TestPreCarryBits<>(), new TestParameters());

From 41fdeb72f6e39760b7c9a3c0894b7919a9fb72f6 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 12:16:28 +0200
Subject: [PATCH 133/231] Remove unnecessary reverse ops

---
 .../dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java   | 4 ----
 .../java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java     | 2 --
 .../java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index 0422e914c..73e7d17bd 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -23,10 +23,6 @@ public BitLessThanOpen(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits)
     this.secretBitsDef = secretBits;
   }
 
-  public BitLessThanOpen(OInt openValue, List<DRes<SInt>> secretBits) {
-    this(() -> openValue, () -> secretBits);
-  }
-
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     OIntFactory oIntFactory = builder.getOIntFactory();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index bfb389222..f7946126f 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -8,7 +8,6 @@
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -65,7 +64,6 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           lastPair.getSecond(),
           seq.logical().andKnown(carryIn, lastPair.getFirst()));
       pairs.set(lastIdx, new SIntPair(lastPair.getFirst(), lastCarryPropagator));
-      Collections.reverse(pairs);
       return seq.seq(new PreCarryBits(() -> pairs));
     });
   }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 11fbf4080..2ad388197 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -6,7 +6,6 @@
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
@@ -22,8 +21,6 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     return builder.seq(seq -> pairsDef)
         .whileLoop((pairs) -> pairs.size() > 1,
             (prevSeq, pairs) -> prevSeq.par(par -> {
-              // TODO this will reverse the actual list, not just the view. more efficient to only reverse the view
-              Collections.reverse(pairs);
               padIfUneven(pairs);
               List<SIntPair> nextRoundInner = new ArrayList<>(pairs.size() / 2);
               for (int i = 0; i < pairs.size() / 2; i++) {
@@ -31,7 +28,6 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
                 SIntPair right = pairs.get(2 * i);
                 nextRoundInner.add(carry(par, left, right));
               }
-              Collections.reverse(nextRoundInner);
               return () -> nextRoundInner;
             })).seq((ignored, out) -> out.get(0).getSecond());
   }

From 501760fc5ddbf68eec26f427a67cd483f39660ef Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 12:35:17 +0200
Subject: [PATCH 134/231] WIP clean up compuin128bit

---
 .../spdz2k/datatypes/CompUInt128Bit.java      | 40 +------------------
 .../computations/lt/MostSignBitSpdz2k.java    |  4 +-
 .../spdz2k/datatypes/TestCompUInt128Bit.java  | 22 +++++-----
 3 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 70b21bc19..31fb8df29 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -1,8 +1,5 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class CompUInt128Bit extends CompUInt128 {
 
   private static final CompUInt128Bit ONE = new CompUInt128Bit(0, 0x80000000, 0);
@@ -79,42 +76,7 @@ public int bitValue() {
 
   @Override
   public CompUInt128 multiplyByBit(int value) {
-    // TODO
-    return this.multiply(new CompUInt128Bit(0L, value));
-  }
-
-  public boolean getValueBit() {
-    return testBit(63);
-  }
-
-  public static void main(String[] args) {
-    System.out.println("Hello world");
-    int numProds = 10000000;
-    CompUInt128Factory factory = new CompUInt128Factory();
-    List<CompUInt128> values = new ArrayList<>(numProds);
-    List<CompUInt128> bits = new ArrayList<>(numProds);
-    for (int i = 0; i < numProds; i++) {
-      CompUInt128 random = factory.createRandom();
-      values.add(random);
-      bits.add(random.toBitRep());
-    }
-
-    List<CompUInt128> result = new ArrayList<>(numProds);
-    long start = System.currentTimeMillis();
-    for (int i = 0; i < numProds; i++) {
-      result.add(values.get(i).add(values.get(i)));
-    }
-    System.out.println(
-        "time " + (System.currentTimeMillis() - start) + " " + result.get(123));
-
-    List<CompUInt128> resultBits = new ArrayList<>(numProds);
-    long startBits = System.currentTimeMillis();
-    for (int i = 0; i < numProds; i++) {
-      resultBits.add(bits.get(i).add(bits.get(i)));
-    }
-    System.out.println(
-        "time " + (System.currentTimeMillis() - startBits) + " " + resultBits.get(123));
-
+    return new CompUInt128Bit(high * value, mid & (value << 31), 0);
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index 39c9d3241..9231c0699 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -11,7 +11,6 @@
 import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import java.util.List;
 
 /**
  * Extract the value of the most significant bit of value.
@@ -48,8 +47,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           PlainT cPrime = cOpen.clearAboveBitAt(k - 1);
           RandomBitMask mask = pair.getSecond();
           DRes<SInt> rPrime = mask.getValue();
-          List<DRes<SInt>> rPrimeBits = mask.getBits().out();
-          DRes<SInt> u = seq.comparison().compareLTBits(cPrime, () -> rPrimeBits);
+          DRes<SInt> u = seq.comparison().compareLTBits(cPrime, mask.getBits());
           DRes<SInt> aPrime = nb.add(
               nb.subFromOpen(() -> cPrime, rPrime),
               () -> factory.toSpdz2kSIntBoolean(u).asArithmetic().out()
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index cb288b7e2..e92ceab2c 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -36,22 +36,22 @@ public void testConstruct() {
   }
 
   @Test
-  public void testValueBit() {
+  public void testBitValue() {
     Assert.assertEquals(
-        false,
-        new CompUInt128Bit(111, 0).getValueBit());
+        0,
+        new CompUInt128Bit(111, 0).bitValue());
     Assert.assertEquals(
-        false,
-        new CompUInt128Bit(rand(1), 0).getValueBit());
+        0,
+        new CompUInt128Bit(rand(1), 0).bitValue());
     Assert.assertEquals(
-        true,
-        new CompUInt128Bit(rand(2), 1).getValueBit());
+        1,
+        new CompUInt128Bit(rand(2), 1).bitValue());
     Assert.assertEquals(
-        true,
-        new CompUInt128Bit(0, 1).getValueBit());
+        1,
+        new CompUInt128Bit(0, 1).bitValue());
     Assert.assertEquals(
-        false,
-        new CompUInt128Bit(0, 0).getValueBit());
+        0,
+        new CompUInt128Bit(0, 0).bitValue());
   }
 
   @Test

From fccce1d9f1ea2163c03d01db5e99aa00d5e1266a Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 13:08:11 +0200
Subject: [PATCH 135/231] Remove subtraction and negation

---
 .../spdz2k/datatypes/CompUInt128Bit.java      | 10 +++----
 .../spdz2k/datatypes/TestCompUInt128Bit.java  | 29 -------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 31fb8df29..4cf9e2e22 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -28,20 +28,18 @@ public CompUInt128 multiply(CompUInt128 other) {
 
   @Override
   public CompUInt128 add(CompUInt128 other) {
-    CompUInt128 sum = super.add(other);
-    return new CompUInt128Bit(sum.high, sum.mid, sum.low);
+    int carry = ((mid >>> 31) + (other.mid >>> 31)) >> 1;
+    return new CompUInt128Bit(high + other.high + carry, mid ^ other.mid, 0);
   }
 
   @Override
   public CompUInt128 subtract(CompUInt128 other) {
-//    CompUInt128Bit test = ((CompUInt128Bit) other);
-    CompUInt128 negated = new CompUInt128Bit(~other.high, ~other.mid & 0x80000000, 0).add(ONE);
-    return this.add(negated);
+    throw new UnsupportedOperationException("Subtraction not supported by bit representation");
   }
 
   @Override
   public CompUInt128 negate() {
-    return new CompUInt128Bit(~high, ~mid & 0x80000000, 0).add(ONE);
+    throw new UnsupportedOperationException("Negation not supported by bit representation");
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
index e92ceab2c..8385ef198 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128Bit.java
@@ -95,35 +95,6 @@ public void testAdd() {
     );
   }
 
-  @Test
-  public void testSubtract() {
-    Assert.assertEquals(
-        bigInt128(bigInt65(rand(3), 0).subtract(bigInt65(rand(4), 0))),
-        new CompUInt128Bit(rand(3), 0).subtract(new CompUInt128Bit(rand(4), 0)).toBigInteger()
-    );
-    Assert.assertEquals(
-        bigInt128(bigInt65(rand(3), 1).subtract(bigInt65(rand(4), 0))).toString(2),
-        new CompUInt128Bit(rand(3), 1).subtract(new CompUInt128Bit(rand(4), 0)).toBigInteger()
-            .toString(2)
-    );
-    Assert.assertEquals(
-        bigInt128(bigInt65(1, 1).subtract(bigInt65(1, 1))),
-        new CompUInt128Bit(1, 1).subtract(new CompUInt128Bit(1, 1)).toBigInteger()
-    );
-    Assert.assertEquals(
-        bigInt128(bigInt65(rand(3), 1).subtract(bigInt65(rand(4), 1))),
-        new CompUInt128Bit(rand(3), 1).subtract(new CompUInt128Bit(rand(4), 1)).toBigInteger()
-    );
-    Assert.assertEquals(
-        bigInt128(bigInt65(0, 0).subtract(bigInt65(0, 1))),
-        new CompUInt128Bit(0, 0).subtract(new CompUInt128Bit(0, 1)).toBigInteger()
-    );
-    Assert.assertEquals(
-        bigInt128(bigInt65(0, 0).subtract(bigInt65(1, 0))),
-        new CompUInt128Bit(0, 0).subtract(new CompUInt128Bit(1, 0)).toBigInteger()
-    );
-  }
-
   @Test
   public void testSerializeLeastSignificant() {
     Assert.assertArrayEquals(

From ce4b3af7cbd3aac00c5018e8d32207305662846a Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 13:24:46 +0200
Subject: [PATCH 136/231] To bit rep conversion

---
 .../fresco/suite/spdz2k/datatypes/CompUInt128.java         | 7 +++++--
 .../fresco/suite/spdz2k/datatypes/CompUInt128Bit.java      | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index f3893b55d..983d85d2c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -122,7 +122,7 @@ public CompUInt128 multiply(CompUInt128 other) {
         + (newMid >>> 32);
     return new CompUInt128(newHigh, (int) newMid, (int) t1);
   }
-  
+
   @Override
   public CompUInt128 subtract(CompUInt128 other) {
     return this.add(other.negate());
@@ -210,7 +210,10 @@ public CompUInt128 clearHighBits() {
 
   @Override
   public CompUInt128 toBitRep() {
-    return new CompUInt128Bit(shiftLeft(63));
+    return new CompUInt128Bit(
+        (high << 63) + (UInt.toUnLong(mid) << 31) + (UInt.toUnLong(low) >>> 1),
+        low << 31,
+        0);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 4cf9e2e22..547175d43 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -2,8 +2,6 @@
 
 public class CompUInt128Bit extends CompUInt128 {
 
-  private static final CompUInt128Bit ONE = new CompUInt128Bit(0, 0x80000000, 0);
-
   public CompUInt128Bit(long high, int mid, int low) {
     super(high, mid, low);
   }

From 0c47f641044a030028eae8f400ff89b60fe761d2 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 14:07:26 +0200
Subject: [PATCH 137/231] Update conversion

---
 .../java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java   | 2 +-
 .../dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java     | 3 +--
 .../protocols/natives/Spdz2kArithmeticToBooleanProtocol.java   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 746258121..95b54983b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -191,7 +191,7 @@ public DRes<BigInteger> open(DRes<SInt> secretShare, int outputParty) {
 
   @Override
   public Conversion createConversion(ProtocolBuilderNumeric builder) {
-    return new Spdz2kConversion<>(builder);
+    return new Spdz2kConversion(builder);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
index cbc69c408..670cce92c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
@@ -4,7 +4,6 @@
 import dk.alexandra.fresco.framework.builder.numeric.Conversion;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kArithmeticToBooleanProtocol;
 import java.util.ArrayList;
 import java.util.List;
@@ -12,7 +11,7 @@
 /**
  * Spdz2k optimized protocols for converting between arithmetic and boolean representations.
  */
-public class Spdz2kConversion<PlainT extends CompUInt<?, ?, PlainT>> implements Conversion {
+public class Spdz2kConversion implements Conversion {
 
   private final ProtocolBuilderNumeric builder;
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java
index 8a6850145..590e4013c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kArithmeticToBooleanProtocol.java
@@ -25,7 +25,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
         .toSpdz2kSIntArithmetic(arithmetic);
     bool = new Spdz2kSIntBoolean<>(
         value.getShare().toBitRep(),
-        value.getMacShare().shiftLeft(63)
+        value.getMacShare().toBitRep().toArithmeticRep() // results in shift
     );
     return EvaluationStatus.IS_DONE;
   }

From fd03502ed563c3a59143d19c3340923a6ce4f36f Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 15:04:44 +0200
Subject: [PATCH 138/231] Native mult by public

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  5 ++-
 .../natives/Spdz2kMultKnownProtocol.java      | 45 +++++++++++++++++++
 .../Spdz2kSubtractFromKnownProtocol.java      | 12 ++---
 3 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultKnownProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 95b54983b..ad1eade74 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -21,6 +21,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultiplyProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputSinglePartyProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
@@ -128,12 +129,12 @@ public DRes<SInt> mult(DRes<SInt> a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> mult(BigInteger a, DRes<SInt> b) {
-        return () -> factory.toSpdz2kSIntArithmetic(b).multiply(factory.createFromBigInteger(a));
+        return multByOpen(factory.createFromBigInteger(a), b);
       }
 
       @Override
       public DRes<SInt> multByOpen(DRes<OInt> a, DRes<SInt> b) {
-        return () -> factory.toSpdz2kSIntArithmetic(b).multiply(factory.fromOInt(a));
+        return builder.append(new Spdz2kMultKnownProtocol<>(a, b));
       }
 
       @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultKnownProtocol.java
new file mode 100644
index 000000000..092a6a167
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kMultKnownProtocol.java
@@ -0,0 +1,45 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+/**
+ * Native protocol from computing the product of a secret value and a public constant.
+ */
+public class Spdz2kMultKnownProtocol<PlainT extends CompUInt<?, ?, PlainT>>
+    extends Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<OInt> left;
+  private final DRes<SInt> right;
+  private SInt out;
+
+  /**
+   * Creates new {@link Spdz2kMultKnownProtocol}.
+   *
+   * @param left public factor
+   * @param right secret factor
+   */
+  public Spdz2kMultKnownProtocol(DRes<OInt> left, DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    out = factory.toSpdz2kSIntArithmetic(right).multiply(factory.fromOInt(left));
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public SInt out() {
+    return out;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
index 7621db9da..e6512a42b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractFromKnownProtocol.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
@@ -9,13 +10,13 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 
 /**
- * Native protocol for subtracting a secret value from a known public value. <p>Note that the
- * result is a secret value.</p>
+ * Native protocol for subtracting a secret value from a known public value. <p>Note that the result
+ * is a secret value.</p>
  */
 public class Spdz2kSubtractFromKnownProtocol<PlainT extends CompUInt<?, ?, PlainT>>
     extends Spdz2kNativeProtocol<SInt, PlainT> {
 
-  private final PlainT left;
+  private final DRes<OInt> left;
   private final DRes<SInt> right;
   private SInt difference;
 
@@ -25,7 +26,7 @@ public class Spdz2kSubtractFromKnownProtocol<PlainT extends CompUInt<?, ?, Plain
    * @param left plain value
    * @param right secret value to be subtracted
    */
-  public Spdz2kSubtractFromKnownProtocol(PlainT left, DRes<SInt> right) {
+  public Spdz2kSubtractFromKnownProtocol(DRes<OInt> left, DRes<SInt> right) {
     this.left = left;
     this.right = right;
   }
@@ -36,7 +37,8 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
     PlainT zero = resourcePool.getFactory().zero();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    Spdz2kSIntArithmetic<PlainT> leftSInt = new Spdz2kSIntArithmetic<>(left, secretSharedKey, zero,
+    Spdz2kSIntArithmetic<PlainT> leftSInt = new Spdz2kSIntArithmetic<>(factory.fromOInt(left),
+        secretSharedKey, zero,
         resourcePool.getMyId() == 1);
     difference = leftSInt.subtract(factory.toSpdz2kSIntArithmetic(right));
     return EvaluationStatus.IS_DONE;

From b4a8185cb6db298510ceb01a00792643fe9eb8cb Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 15:25:10 +0200
Subject: [PATCH 139/231] test bit as uint

---
 .../dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java   | 4 +---
 .../alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java | 5 +++++
 .../fresco/suite/spdz2k/datatypes/CompUInt128.java        | 8 +++++++-
 .../fresco/suite/spdz2k/datatypes/CompUInt96.java         | 5 +++++
 .../protocols/computations/lt/MostSignBitSpdz2k.java      | 7 +++----
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index ad1eade74..bd2e48d5c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -105,9 +105,7 @@ public DRes<SInt> sub(BigInteger a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> subFromOpen(DRes<OInt> a, DRes<SInt> b) {
-        // TODO should call .out inside evaluate instead
-        return builder.append(
-            new Spdz2kSubtractFromKnownProtocol<>(factory.fromOInt(a), b));
+        return builder.append(new Spdz2kSubtractFromKnownProtocol<>(a, b));
       }
 
       @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 151540778..fd5e81781 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -64,6 +64,11 @@ public interface CompUInt<
    */
   CompT multiplyByBit(int value);
 
+  /**
+   * Returns result of {@link #testBit(int)} as UInt.
+   */
+  CompT testBitAsUInt(int bit);
+
   /**
    * Returns bit value of this as integer.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 983d85d2c..f6b2ec020 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -11,9 +11,10 @@
 public class CompUInt128 implements CompUInt<UInt64, UInt64, CompUInt128> {
 
   private static final CompUInt128 ONE = new CompUInt128(1);
+  private static final CompUInt128 ZERO = new CompUInt128(0);
   protected final long high;
   protected final int mid;
-  protected final int low;
+  final int low;
 
   /**
    * Creates new {@link CompUInt128}. <p>Do <b>not</b> pad bytes by default.</p>
@@ -263,6 +264,11 @@ public boolean testBit(int bit) {
     return (((1L << relative) & section) >>> relative) == 1;
   }
 
+  @Override
+  public CompUInt128 testBitAsUInt(int bit) {
+    return testBit(bit) ? ONE : ZERO;
+  }
+
   @Override
   public OInt out() {
     return this;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
index 3bc70699b..c4774c32f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
@@ -188,6 +188,11 @@ public CompUInt96 multiplyByBit(int value) {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public CompUInt96 testBitAsUInt(int bit) {
+    return testBit(bit) ? new CompUInt96(1) : new CompUInt96(0);
+  }
+
   @Override
   public int getLowBitLength() {
     return 32;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index 9231c0699..ec1ddcf3c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -50,7 +50,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           DRes<SInt> u = seq.comparison().compareLTBits(cPrime, mask.getBits());
           DRes<SInt> aPrime = nb.add(
               nb.subFromOpen(() -> cPrime, rPrime),
-              () -> factory.toSpdz2kSIntBoolean(u).asArithmetic().out()
+              seq.seq(ignored -> factory.toSpdz2kSIntBoolean(u).asArithmetic().out())
           );
           DRes<SInt> d = nb.sub(value, aPrime);
           DRes<SInt> b = nb.randomBit();
@@ -61,11 +61,10 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           Numeric nb = seq.numeric();
           PlainT eOpen = factory.fromOInt(pair.getFirst());
           DRes<SInt> b = pair.getSecond();
-          // TODO move into its own method
-          PlainT eMsb = eOpen.testBit(k - 1) ? factory.one() : factory.zero();
+          PlainT eMsb = eOpen.testBitAsUInt(k - 1);
           PlainT eMsbByTwo = eMsb.multiply(factory.two());
           return nb.sub(
-              nb.addOpen(() -> eMsb, b),
+              nb.addOpen(eMsb, b),
               nb.multByOpen(eMsbByTwo, b)
           );
         });

From 03c61d83edb407192ac2605fdfde42511d7d9c51 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 15:29:19 +0200
Subject: [PATCH 140/231] Cleaner toBits

---
 .../fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index 166141cc6..1cbba6035 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -27,12 +27,10 @@ public DRes<OInt> one() {
 
   @Override
   public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
-    CompUInt value = (CompUInt) openValue;
+    CompT value = factory.fromOInt(openValue);
     List<DRes<OInt>> bits = new ArrayList<>(numBits);
     for (int b = 0; b < numBits; b++) {
-      boolean boolBit = value.testBit(b);
-      OInt bit = boolBit ? factory.one() : factory.zero();
-      bits.add(() -> bit);
+      bits.add(value.testBitAsUInt(b));
     }
     Collections.reverse(bits);
     return bits;

From 5e5b404cc72af635a4b2e975d9549433517c6958 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 15:51:34 +0200
Subject: [PATCH 141/231] DRes<OInt> -> OInt where it makes sense

---
 .../builder/numeric/AdvancedNumeric.java      |  2 +-
 .../numeric/DefaultAdvancedNumeric.java       |  2 +-
 .../builder/numeric/DefaultLogical.java       |  8 +++----
 .../framework/builder/numeric/Logical.java    |  4 ++--
 .../value/BigIntegerOIntArithmetic.java       | 23 +++++++++---------
 .../framework/value/OIntArithmetic.java       | 13 +++++-----
 .../fresco/framework/value/OIntFactory.java   |  4 +---
 .../lib/compare/lt/BitLessThanOpen.java       |  2 +-
 .../fresco/lib/compare/lt/CarryOut.java       |  6 ++---
 .../compare/zerotest/ZeroTestLogRounds.java   |  2 +-
 .../integer/binary/GenerateRandomBitMask.java |  2 +-
 .../integer/linalg/InnerProductWithOInt.java  |  6 ++---
 .../logical/LogicalOperationsTests.java       |  4 ++--
 .../spdz2k/datatypes/CompUIntArithmetic.java  | 24 +++++++++----------
 .../TestSpdz2kLogicalOperations.java          |  4 ++--
 15 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
index 63e7f55ea..ed62d8558 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
@@ -155,7 +155,7 @@ public interface AdvancedNumeric extends ComputationDirectory {
    * @param vectorB The secret vector
    * @return A deferred result computing the inner product of the two given vectors
    */
-  DRes<SInt> innerProductWithPublicPart(DRes<List<DRes<OInt>>> vectorA,
+  DRes<SInt> innerProductWithPublicPart(DRes<List<OInt>> vectorA,
       DRes<List<DRes<SInt>>> vectorB);
 
   /**
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
index 6e26bffe5..6891c3b93 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
@@ -115,7 +115,7 @@ public DRes<SInt> innerProductWithPublicPart(List<BigInteger> vectorA, List<DRes
   }
 
   @Override
-  public DRes<SInt> innerProductWithPublicPart(DRes<List<DRes<OInt>>> vectorA,
+  public DRes<SInt> innerProductWithPublicPart(DRes<List<OInt>> vectorA,
       DRes<List<DRes<SInt>>> vectorB) {
     return builder.seq(new InnerProductWithOInt(vectorA, vectorB));
   }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 2a163990b..2430ad575 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -112,10 +112,10 @@ private DRes<List<DRes<SInt>>> pairWise(
   }
 
   private DRes<List<DRes<SInt>>> pairWiseKnown(
-      DRes<List<DRes<OInt>>> knownBits,
+      DRes<List<OInt>> knownBits,
       DRes<List<DRes<SInt>>> secretBits,
       BiFunction<DRes<OInt>, DRes<SInt>, DRes<SInt>> op) {
-    List<DRes<OInt>> knownOut = knownBits.out();
+    List<OInt> knownOut = knownBits.out();
     List<DRes<SInt>> secretOut = secretBits.out();
     List<DRes<SInt>> resultBits = new ArrayList<>(secretOut.size());
     for (int i = 0; i < secretOut.size(); i++) {
@@ -128,7 +128,7 @@ private DRes<List<DRes<SInt>>> pairWiseKnown(
   }
 
   @Override
-  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
+  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
       DRes<List<DRes<SInt>>> secretBits) {
     return builder.par(par -> {
       BiFunction<DRes<OInt>, DRes<SInt>, DRes<SInt>> f = (left, right) -> par.logical()
@@ -138,7 +138,7 @@ public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
   }
 
   @Override
-  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
+  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
       DRes<List<DRes<SInt>>> secretBits) {
     return builder.par(par -> {
       BiFunction<DRes<OInt>, DRes<SInt>, DRes<SInt>> f = (left, right) -> par.logical()
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index 9856a98e5..8da18a746 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -65,7 +65,7 @@ public interface Logical extends ComputationDirectory {
    * Computes pairwise logical AND of input bits. <p>NOTE: Inputs must represent 0 or 1 values
    * only.</p>
    */
-  DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<DRes<OInt>>> knownBits,
+  DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
       DRes<List<DRes<SInt>>> secretBits);
 
   /**
@@ -93,7 +93,7 @@ DRes<List<DRes<SInt>>> pairWiseXor(DRes<List<DRes<SInt>>> bitsA,
    * Computes pairwise logical XOR of input bits. <p>NOTE: Inputs must represent 0 or 1 values
    * only.</p>
    */
-  DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<DRes<OInt>>> knownBits,
+  DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
       DRes<List<DRes<SInt>>> secretBits);
 
   /**
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index ed1f4a63d..055f53356 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -1,6 +1,5 @@
 package dk.alexandra.fresco.framework.value;
 
-import dk.alexandra.fresco.framework.DRes;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -12,41 +11,40 @@
  */
 public class BigIntegerOIntArithmetic implements OIntArithmetic {
   private static final BigInteger TWO = new BigInteger("2");
-  // TODO wrapping all OInts in DRes seems like a bad idea
-  private List<DRes<OInt>> twoPowersList;
+  private List<OInt> twoPowersList;
   private final OIntFactory factory;
 
   public BigIntegerOIntArithmetic(OIntFactory factory) {
     this.factory = factory;
     twoPowersList = new ArrayList<>(1);
-    twoPowersList.add(() -> new BigIntegerOInt(BigInteger.ONE));
+    twoPowersList.add(new BigIntegerOInt(BigInteger.ONE));
   }
 
   @Override
-  public DRes<OInt> one() {
+  public OInt one() {
     return factory.one();
   }
 
   @Override
-  public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
+  public List<OInt> toBits(OInt openValue, int numBits) {
     BigInteger value = factory.toBigInteger(openValue);
-    List<DRes<OInt>> bits = new ArrayList<>(numBits);
+    List<OInt> bits = new ArrayList<>(numBits);
     for (int b = 0; b < numBits; b++) {
       boolean boolBit = value.testBit(b);
       OInt bit = boolBit ? factory.one() : factory.zero();
-      bits.add(() -> bit);
+      bits.add(bit);
     }
     Collections.reverse(bits);
     return bits;
   }
 
   @Override
-  public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
+  public List<OInt> getPowersOfTwo(int numPowers) {
     // TODO do we need modular reduction in here?
     // TODO taken from MiscBigIntegerGenerators, clean up
     int currentLength = twoPowersList.size();
     if (numPowers > currentLength) {
-      ArrayList<DRes<OInt>> newTwoPowersList = new ArrayList<>(numPowers);
+      ArrayList<OInt> newTwoPowersList = new ArrayList<>(numPowers);
       newTwoPowersList.addAll(twoPowersList);
       BigInteger currentValue = ((BigIntegerOInt) newTwoPowersList.get(currentLength - 1).out())
           .getValue();
@@ -60,12 +58,13 @@ public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
   }
 
   @Override
-  public DRes<OInt> twoTo(int power) {
+  public OInt twoTo(int power) {
+    // TODO look up in pre-computed powers
     return factory.fromBigInteger(TWO.pow(power));
   }
 
   @Override
-  public DRes<OInt> modTwoTo(OInt input, int power) {
+  public OInt modTwoTo(OInt input, int power) {
     return factory.fromBigInteger(factory.toBigInteger(input).mod(TWO.pow(
         power)));
   }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index 832a712f9..abdfb5551 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -1,6 +1,5 @@
 package dk.alexandra.fresco.framework.value;
 
-import dk.alexandra.fresco.framework.DRes;
 import java.util.List;
 
 /**
@@ -11,7 +10,7 @@ public interface OIntArithmetic {
   /**
    * Returns the number one as a deferred opened int.
    */
-  DRes<OInt> one();
+  OInt one();
 
   /**
    * Turns input value into bits in big-endian order.
@@ -20,21 +19,21 @@ public interface OIntArithmetic {
    * the bit length is larger only the first numBits bits are used.
    * </p>
    */
-  List<DRes<OInt>> toBits(OInt openValue, int numBits);
+  List<OInt> toBits(OInt openValue, int numBits);
 
   /**
    * Returns a list of powers of two in ascending order, up to numPowers - 1 ([2^0, 2^1, ...,
    * 2^{numPowers - 1}]).
    */
-  List<DRes<OInt>> getPowersOfTwo(int numPowers);
+  List<OInt> getPowersOfTwo(int numPowers);
 
   /**
    * Computes 2^{power}.
    */
-  DRes<OInt> twoTo(int power);
+  OInt twoTo(int power);
 
   /**
-   * Reduces {@link input} modulo 2^{power}.
+   * Reduces {@code input} modulo 2^{power}.
    *
    * @param input
    *          the input to reduce
@@ -42,6 +41,6 @@ public interface OIntArithmetic {
    *          the two-power to reduce against
    * @return the reduced input modulo the two-power
    */
-  DRes<OInt> modTwoTo(OInt input, int power);
+  OInt modTwoTo(OInt input, int power);
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
index ca8e1f81d..9896e6fe4 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
@@ -1,6 +1,5 @@
 package dk.alexandra.fresco.framework.value;
 
-import dk.alexandra.fresco.framework.DRes;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -26,8 +25,7 @@ public interface OIntFactory {
   /**
    * Default method for converting multiple instances of {@link BigInteger}.
    */
-  default List<DRes<OInt>> fromBigInteger(List<BigInteger> values) {
-    // TODO shouldn't be a DRes
+  default List<OInt> fromBigInteger(List<BigInteger> values) {
     return values.stream().map(this::fromBigInteger).collect(Collectors.toList());
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index 73e7d17bd..d3b4d6ac9 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -29,7 +29,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
     OInt openValueA = openValueDef.out();
     int numBits = secretBits.size();
-    List<DRes<OInt>> openBits = builder.getOIntArithmetic().toBits(openValueA, numBits);
+    List<OInt> openBits = builder.getOIntArithmetic().toBits(openValueA, numBits);
     DRes<List<DRes<SInt>>> secretBitsNegated = builder.par(par -> {
       List<DRes<SInt>> negatedBits = new ArrayList<>(numBits);
       for (DRes<SInt> secretBit : secretBits) {
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index f7946126f..291379913 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -16,7 +16,7 @@
  */
 public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<List<DRes<OInt>>> openBitsDef;
+  private final DRes<List<OInt>> openBitsDef;
   private final DRes<List<DRes<SInt>>> secretBitsDef;
   private final DRes<OInt> carryIn;
 
@@ -28,7 +28,7 @@ public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
    * @param carryIn an additional carry-in bit which we add to the least-significant bits of the
    * inputs
    */
-  public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretBits,
+  public CarryOut(DRes<List<OInt>> clearBits, DRes<List<DRes<SInt>>> secretBits,
       DRes<OInt> carryIn) {
     this.secretBitsDef = secretBits;
     this.openBitsDef = clearBits;
@@ -38,7 +38,7 @@ public CarryOut(DRes<List<DRes<OInt>>> clearBits, DRes<List<DRes<SInt>>> secretB
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
-    List<DRes<OInt>> openBits = openBitsDef.out();
+    List<OInt> openBits = openBitsDef.out();
     if (secretBits.size() != openBits.size()) {
       throw new IllegalArgumentException("Number of bits must be the same");
     }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index 99df10ad7..13657a3b5 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -32,7 +32,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
                   input, r.getValue())));
           return () -> new Pair<>(r.getBits(), c);
         }).seq((seq, pair) -> {
-          List<DRes<OInt>> cbits = seq.getOIntArithmetic().toBits(pair
+          List<OInt> cbits = seq.getOIntArithmetic().toBits(pair
               .getSecond().out(), maxBitlength);
           // Reverse the bits of c as they are stored in big endian whereas the
           // composed r values from random bit mask will be in little endian as
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
index 3217b5cf1..b02ae0ee0 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
@@ -37,7 +37,7 @@ public DRes<RandomBitMask> buildComputation(ProtocolBuilderNumeric builder) {
       });
     }
 
-    List<DRes<OInt>> powersOfTwo = builder.getOIntArithmetic().getPowersOfTwo(
+    List<OInt> powersOfTwo = builder.getOIntArithmetic().getPowersOfTwo(
         numBits);
     DRes<SInt> recombined = builder.advancedNumeric()
         .innerProductWithPublicPart(() -> powersOfTwo, randomBits);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java
index dc1e86f99..78c60aab5 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/linalg/InnerProductWithOInt.java
@@ -15,11 +15,11 @@
  */
 public class InnerProductWithOInt implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<List<DRes<OInt>>> vectorADef;
+  private final DRes<List<OInt>> vectorADef;
   private final DRes<List<DRes<SInt>>> vectorBDef;
 
   public InnerProductWithOInt(
-      DRes<List<DRes<OInt>>> vectorA,
+      DRes<List<OInt>> vectorA,
       DRes<List<DRes<SInt>>> vectorB) {
     this.vectorADef = vectorA;
     this.vectorBDef = vectorB;
@@ -27,7 +27,7 @@ public InnerProductWithOInt(
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    List<DRes<OInt>> vectorA = vectorADef.out();
+    List<OInt> vectorA = vectorADef.out();
     List<DRes<SInt>> vectorB = vectorBDef.out();
     DRes<List<DRes<SInt>>> product = builder.par(parallel -> {
       List<DRes<SInt>> result = new ArrayList<>(vectorA.size());
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
index b53712ec6..7dd9265ae 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
@@ -39,7 +39,7 @@ public void test() {
           Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
               root -> {
                 DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
-                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
+                List<OInt> rightOInts = root.getOIntFactory().fromBigInteger(right);
                 DRes<List<DRes<SInt>>> xored = root.logical()
                     .pairWiseXorKnown(() -> rightOInts, leftClosed);
                 return root.collections().openList(xored);
@@ -81,7 +81,7 @@ public void test() {
           Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
               root -> {
                 DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(left);
-                List<DRes<OInt>> rightOInts = root.getOIntFactory().fromBigInteger(right);
+                List<OInt> rightOInts = root.getOIntFactory().fromBigInteger(right);
                 DRes<List<DRes<SInt>>> anded = root.logical()
                     .pairWiseAndKnown(() -> rightOInts, leftClosed);
                 return root.collections().openList(anded);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index 1cbba6035..e0105134e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -1,6 +1,5 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
-import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import java.util.ArrayList;
@@ -13,7 +12,7 @@
 public class CompUIntArithmetic<CompT extends CompUInt<?, ?, CompT>> implements OIntArithmetic {
 
   private final CompUIntFactory<CompT> factory;
-  private final List<DRes<OInt>> powersOfTwo;
+  private final List<OInt> powersOfTwo;
 
   public CompUIntArithmetic(CompUIntFactory<CompT> factory) {
     this.factory = factory;
@@ -21,14 +20,14 @@ public CompUIntArithmetic(CompUIntFactory<CompT> factory) {
   }
 
   @Override
-  public DRes<OInt> one() {
+  public OInt one() {
     return factory.one();
   }
 
   @Override
-  public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
+  public List<OInt> toBits(OInt openValue, int numBits) {
     CompT value = factory.fromOInt(openValue);
-    List<DRes<OInt>> bits = new ArrayList<>(numBits);
+    List<OInt> bits = new ArrayList<>(numBits);
     for (int b = 0; b < numBits; b++) {
       bits.add(value.testBitAsUInt(b));
     }
@@ -37,7 +36,7 @@ public List<DRes<OInt>> toBits(OInt openValue, int numBits) {
   }
 
   @Override
-  public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
+  public List<OInt> getPowersOfTwo(int numPowers) {
     if (numPowers > factory.getLowBitLength()) {
       throw new UnsupportedOperationException();
     } else {
@@ -46,7 +45,7 @@ public List<DRes<OInt>> getPowersOfTwo(int numPowers) {
   }
 
   @Override
-  public DRes<OInt> twoTo(int power) {
+  public OInt twoTo(int power) {
     if (power > factory.getLowBitLength()) {
       throw new UnsupportedOperationException();
     } else {
@@ -55,7 +54,7 @@ public DRes<OInt> twoTo(int power) {
   }
 
   @Override
-  public DRes<OInt> modTwoTo(OInt input, int power) {
+  public OInt modTwoTo(OInt input, int power) {
     if (power > factory.getLowBitLength()) {
       throw new UnsupportedOperationException();
     } else {
@@ -63,16 +62,15 @@ public DRes<OInt> modTwoTo(OInt input, int power) {
     }
   }
 
-
-  private List<DRes<OInt>> initializePowersOfTwo(int numPowers) {
-    List<DRes<OInt>> powers = new ArrayList<>(numPowers);
+  private List<OInt> initializePowersOfTwo(int numPowers) {
+    List<OInt> powers = new ArrayList<>(numPowers);
     CompT current = factory.one();
     final CompT tempOuter = current;
-    powers.add(() -> tempOuter);
+    powers.add(tempOuter);
     for (int i = 1; i < numPowers; i++) {
       current = current.multiply(factory.two());
       final CompT temp = current;
-      powers.add(() -> temp);
+      powers.add(temp);
     }
     return powers;
   }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 4cf718cda..734827e00 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -170,7 +170,7 @@ public void test() {
                 DRes<List<DRes<SInt>>> leftClosed = root.conversion()
                     .toBooleanBatch(root.collections().closeList(left, 1));
                 OIntFactory oIntFactory = root.getOIntFactory();
-                List<DRes<OInt>> rightOInts = oIntFactory.fromBigInteger(right);
+                List<OInt> rightOInts = oIntFactory.fromBigInteger(right);
                 DRes<List<DRes<SInt>>> xored = root.logical()
                     .pairWiseXorKnown(() -> rightOInts, leftClosed);
                 DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(xored);
@@ -215,7 +215,7 @@ public void test() {
                 DRes<List<DRes<SInt>>> leftClosed = root.conversion()
                     .toBooleanBatch(root.collections().closeList(left, 1));
                 OIntFactory oIntFactory = root.getOIntFactory();
-                List<DRes<OInt>> rightOInts = oIntFactory.fromBigInteger(right);
+                List<OInt> rightOInts = oIntFactory.fromBigInteger(right);
                 DRes<List<DRes<SInt>>> anded = root.logical()
                     .pairWiseAndKnown(() -> rightOInts, leftClosed);
                 DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);

From b8c6b48b36b629ce231290af636099b4bbf25750 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 9 May 2018 17:15:33 +0200
Subject: [PATCH 142/231] Zero test spdz2k

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  4 +-
 .../computations/eq/ZeroTestSpdz2k.java       | 57 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index bd2e48d5c..8214b70da 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -41,10 +41,12 @@ public class Spdz2kBuilder<PlainT extends CompUInt<?, ?, PlainT>> implements
   private final CompUIntFactory<PlainT> factory;
   private final BasicNumericContext numericContext;
   private final boolean useBooleanMode;
+  private final CompUIntArithmetic<PlainT> uIntArithmetic;
 
   public Spdz2kBuilder(CompUIntFactory<PlainT> factory, BasicNumericContext numericContext,
       boolean useBooleanMode) {
     this.factory = factory;
+    this.uIntArithmetic = new CompUIntArithmetic<>(factory);
     this.numericContext = numericContext;
     this.useBooleanMode = useBooleanMode;
   }
@@ -205,7 +207,7 @@ public OIntFactory getOIntFactory() {
 
   @Override
   public OIntArithmetic getOIntArithmetic() {
-    return new CompUIntArithmetic<>(factory);
+    return uIntArithmetic;
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
new file mode 100644
index 000000000..09301c03b
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
@@ -0,0 +1,57 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations.eq;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.OIntArithmetic;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import java.util.List;
+
+/**
+ * Computes if given value equals 0 (result remains secret).
+ */
+public class ZeroTestSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
+    Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<SInt> value;
+  private final CompUIntFactory<PlainT> factory;
+  private final int k;
+
+  public ZeroTestSpdz2k(DRes<SInt> value, CompUIntFactory<PlainT> factory) {
+    this.value = value;
+    this.factory = factory;
+    this.k = factory.getLowBitLength();
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    OIntArithmetic arithmetic = builder.getOIntArithmetic();
+    return builder.seq(seq -> {
+      PlainT twoTo2k1 = factory.fromOInt(arithmetic.twoTo(k - 1)).negate();
+      DRes<RandomBitMask> mask = seq.advancedNumeric().randomBitMask(k - 2);
+      DRes<SInt> r = seq.numeric().multByOpen(twoTo2k1, seq.numeric().randomBit());
+      Pair<DRes<RandomBitMask>, DRes<SInt>> pair = new Pair<>(mask, r);
+      return () -> pair;
+    }).seq((seq, pair) -> {
+      RandomBitMask mask = pair.getFirst().out();
+      List<DRes<SInt>> bits = mask.getBits().out();
+      bits.add(pair.getSecond());
+      DRes<SInt> r = seq.numeric().add(mask.getValue(), pair.getSecond());
+      DRes<SInt> c = seq.numeric().add(value, r);
+      DRes<OInt> cOpen = seq.numeric().openAsOInt(c);
+      Pair<List<DRes<SInt>>, DRes<OInt>> res = new Pair<>(bits, cOpen);
+      return () -> res;
+    }).seq((seq, pair) -> {
+      List<DRes<SInt>> rBits = pair.getFirst();
+      List<OInt> cBits = arithmetic.toBits(pair.getSecond().out(), k - 1);
+      DRes<List<DRes<SInt>>> xored = seq.logical().pairWiseXorKnown(() -> cBits, () -> rBits);
+      DRes<SInt> or = seq.logical().orOfList(xored);
+      return seq.logical().not(or);
+    });
+  }
+}

From 2fc7de47d8f936d370060e964b7da3739e18191a Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 10 May 2018 17:43:22 +0200
Subject: [PATCH 143/231] Boolean to arithmetic conversion

---
 .../fresco/suite/spdz2k/Spdz2kConversion.java |  3 +-
 .../datatypes/Spdz2kSIntArithmetic.java       | 12 +++-
 .../Spdz2kBooleanToArithmeticProtocol.java    | 66 +++++++++++++++++++
 .../suite/spdz2k/TestSpdz2kBuilder.java       |  4 +-
 .../computations/TestSpdz2kConversion.java    | 43 +++++++++++-
 5 files changed, 123 insertions(+), 5 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
index 670cce92c..4bf9ad3c9 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kConversion.java
@@ -5,6 +5,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kArithmeticToBooleanProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kBooleanToArithmeticProtocol;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,7 +27,7 @@ public DRes<SInt> toBoolean(DRes<SInt> arithmeticValue) {
 
   @Override
   public DRes<SInt> toArithmetic(DRes<SInt> booleanValue) {
-    throw new UnsupportedOperationException();
+    return builder.append(new Spdz2kBooleanToArithmeticProtocol<>(booleanValue));
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
index d25b0b370..6a05c93db 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -63,7 +63,17 @@ public Spdz2kSIntArithmetic<PlainT> addConstant(
         isPartyOne);
     return add(wrapped);
   }
-  
+
+  /**
+   * Converts this to boolean representation ({@link Spdz2kSIntBoolean}).
+   */
+  public Spdz2kSIntBoolean<PlainT> toBoolean() {
+    return new Spdz2kSIntBoolean<>(
+        share.toBitRep(),
+        macShare.toBitRep().toArithmeticRep() // results in right-shift but keeps arithmetic rep
+    );
+  }
+
   @Override
   public String toString() {
     return "Spdz2kSIntArithmetic{" +
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
new file mode 100644
index 000000000..73b2b0707
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
@@ -0,0 +1,66 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+/**
+ * Native protocol for converting boolean shares to arithmetic shares.
+ */
+public class Spdz2kBooleanToArithmeticProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<SInt> bool;
+  private SInt arithmetic;
+  private Spdz2kSIntArithmetic<PlainT> arithmeticR;
+  private Spdz2kSIntBoolean<PlainT> c;
+
+  public Spdz2kBooleanToArithmeticProtocol(DRes<SInt> bool) {
+    this.bool = bool;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    if (round == 0) {
+      arithmeticR = resourcePool.getDataSupplier().getNextBitShare();
+      Spdz2kSIntBoolean<PlainT> booleanR = arithmeticR.toBoolean();
+      c = factory.toSpdz2kSIntBoolean(bool).xor(booleanR);
+      network.sendToAll(c.serializeShareLow());
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      PlainT openC = receiveAndReconstruct(network, resourcePool.getNoOfParties(), factory);
+      resourcePool.getOpenedValueStore().pushOpenedValue(
+          c.asArithmetic(),
+          openC.toArithmeticRep()
+      );
+      int openCBit = openC.bitValue();
+      // equivalent to xor
+      arithmetic = (openCBit == 0) ? arithmeticR : arithmeticR.multiply(factory.one().negate());
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  private PlainT receiveAndReconstruct(Network network, int noOfParties,
+      CompUIntFactory<PlainT> factory) {
+    int received = network.receive(1)[0];
+    PlainT opened = factory.fromBit(received);
+    for (int i = 2; i <= noOfParties; i++) {
+      received = network.receive(i)[0];
+      opened = opened.add(factory.fromBit(received));
+    }
+    return opened;
+  }
+
+  @Override
+  public SInt out() {
+    return arithmetic;
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
index 7ca102063..55e84824d 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
@@ -1,13 +1,13 @@
 package dk.alexandra.fresco.suite.spdz2k;
 
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
 import org.junit.Test;
 
 public class TestSpdz2kBuilder {
 
   @Test(expected = UnsupportedOperationException.class)
   public void getBigIntegerHelper() {
-    new Spdz2kBuilder<CompUInt128>(null, null, false).getBigIntegerHelper();
+    new Spdz2kBuilder<>(new CompUInt128Factory(), null, false).getBigIntegerHelper();
   }
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
index c1621c6e1..81b1e43d6 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
@@ -38,6 +38,11 @@ public void testArithmeticToBool() {
     runTest(new TestArithmeticToBool<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
+  @Test
+  public void testBoolToArithmetic() {
+    runTest(new TestBoolToArithmetic<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
@@ -76,7 +81,7 @@ public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app =
               root -> {
                 OIntFactory factory = root.getOIntFactory();
-                DRes<List<DRes<SInt>>> inputClosed = root.numeric().knownAsDRes(input);
+                DRes<List<DRes<SInt>>> inputClosed = root.collections().closeList(input, 1);
                 DRes<List<DRes<SInt>>> inputBool = root.conversion().toBooleanBatch(inputClosed);
                 DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(inputBool);
                 return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
@@ -93,5 +98,41 @@ public void test() {
     }
   }
 
+  public static class TestBoolToArithmetic<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        private final List<BigInteger> input = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO
+        );
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> inputClosed = root.collections().closeList(input, 1);
+                DRes<List<DRes<SInt>>> inputBool = root.conversion().toBooleanBatch(inputClosed);
+                DRes<List<DRes<SInt>>> inputArithmetic = root.conversion()
+                    .toArithmeticBatch(inputBool);
+                DRes<List<DRes<BigInteger>>> opened = root.collections().openList(inputArithmetic);
+                return () -> opened.out().stream().map(DRes::out)
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
 
 }

From c4d21bb7c0c197a2c47d773334d8a4cbe2820bd8 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 10 May 2018 17:45:43 +0200
Subject: [PATCH 144/231] Add comment to conversion

---
 .../protocols/natives/Spdz2kBooleanToArithmeticProtocol.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
index 73b2b0707..9ef96d276 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
@@ -47,6 +47,10 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     }
   }
 
+  /**
+   * Receive shares of value and reconstruct. <p>Note that this includes overflow into top s
+   * bits.</p>
+   */
   private PlainT receiveAndReconstruct(Network network, int noOfParties,
       CompUIntFactory<PlainT> factory) {
     int received = network.receive(1)[0];

From 4deaaabf8c091dcad19584a256e81d4a0d8e466e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 11 May 2018 11:21:58 +0200
Subject: [PATCH 145/231] Spdz2k equality tests and fixes

---
 .../framework/builder/numeric/Comparison.java |  2 +-
 .../fresco/suite/spdz2k/Spdz2kComparison.java | 22 +++++++-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |  1 +
 .../computations/eq/ZeroTestSpdz2k.java       | 53 +++++++++++--------
 .../Spdz2kBooleanToArithmeticProtocol.java    | 10 ++--
 .../suite/spdz2k/AbstractSpdz2kTest.java      |  2 +-
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  | 18 +++++++
 .../computations/TestSpdz2kConversion.java    |  4 +-
 .../TestSpdz2kLogicalOperations.java          | 22 ++++----
 9 files changed, 92 insertions(+), 42 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 54a78520c..3bd779fb2 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -17,7 +17,7 @@ public interface Comparison extends ComputationDirectory {
    * algorithm running in constant rounds or logarithmic rounds should be used. In general the
    * logarithmic round choice is the fastest.
    */
-  public enum Algorithm {
+  enum Algorithm {
     LOG_ROUNDS, CONST_ROUNDS
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index 4fd92e2db..d6f81f733 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -8,6 +8,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.eq.ZeroTestSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
 import java.util.List;
 
@@ -18,7 +19,7 @@ public class Spdz2kComparison<PlainT extends CompUInt<?, ?, PlainT>> extends Def
 
   private final CompUIntFactory<PlainT> factory;
 
-  public Spdz2kComparison(
+  protected Spdz2kComparison(
       BuilderFactoryNumeric factoryNumeric,
       ProtocolBuilderNumeric builder, CompUIntFactory<PlainT> factory) {
     super(factoryNumeric, builder);
@@ -42,6 +43,25 @@ public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> sec
     return super.compareLTBits(openValue, converted);
   }
 
+  @Override
+  public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm) {
+    if (bitlength > factory.getLowBitLength()) {
+      throw new IllegalArgumentException(
+          "Only support bit lengths up to " + factory.getLowBitLength());
+    }
+    if (algorithm == Algorithm.CONST_ROUNDS) {
+      throw new UnsupportedOperationException(
+          "No constant round zero test protocol implemented for Spdz2k");
+    } else {
+      return builder.seq(new ZeroTestSpdz2k<>(x, factory));
+    }
+  }
+
+  @Override
+  public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm algorithm) {
+    return compareZero(builder.numeric().sub(x, y), bitlength, algorithm);
+  }
+
   protected CompUIntFactory<PlainT> getFactory() {
     return factory;
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index f0e7d5e44..62ce0ab49 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -78,6 +78,7 @@ public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
       return seq.numeric().openAsOInt(bit.asArithmetic());
     }).seq((seq, opened) -> {
       PlainT openBit = factory.fromOInt(opened);
+      // TODO clean up
       return openBit.testBit(factory.getLowBitLength() - 1) ? factory.one() : factory.zero();
     });
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
index 09301c03b..a76f0384c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
@@ -2,14 +2,17 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Conversion;
+import dk.alexandra.fresco.framework.builder.numeric.Logical;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntArithmetic;
 import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -31,27 +34,31 @@ public ZeroTestSpdz2k(DRes<SInt> value, CompUIntFactory<PlainT> factory) {
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     OIntArithmetic arithmetic = builder.getOIntArithmetic();
-    return builder.seq(seq -> {
-      PlainT twoTo2k1 = factory.fromOInt(arithmetic.twoTo(k - 1)).negate();
-      DRes<RandomBitMask> mask = seq.advancedNumeric().randomBitMask(k - 2);
-      DRes<SInt> r = seq.numeric().multByOpen(twoTo2k1, seq.numeric().randomBit());
-      Pair<DRes<RandomBitMask>, DRes<SInt>> pair = new Pair<>(mask, r);
-      return () -> pair;
-    }).seq((seq, pair) -> {
-      RandomBitMask mask = pair.getFirst().out();
-      List<DRes<SInt>> bits = mask.getBits().out();
-      bits.add(pair.getSecond());
-      DRes<SInt> r = seq.numeric().add(mask.getValue(), pair.getSecond());
-      DRes<SInt> c = seq.numeric().add(value, r);
-      DRes<OInt> cOpen = seq.numeric().openAsOInt(c);
-      Pair<List<DRes<SInt>>, DRes<OInt>> res = new Pair<>(bits, cOpen);
-      return () -> res;
-    }).seq((seq, pair) -> {
-      List<DRes<SInt>> rBits = pair.getFirst();
-      List<OInt> cBits = arithmetic.toBits(pair.getSecond().out(), k - 1);
-      DRes<List<DRes<SInt>>> xored = seq.logical().pairWiseXorKnown(() -> cBits, () -> rBits);
-      DRes<SInt> or = seq.logical().orOfList(xored);
-      return seq.logical().not(or);
-    });
+    return builder.seq(seq -> seq.advancedNumeric().randomBitMask(k - 1))
+        .seq((seq, mask) -> {
+          Numeric numeric = seq.numeric();
+          PlainT twoTo2k1 = factory.fromOInt(arithmetic.twoTo(k - 1)).negate();
+          DRes<SInt> extraBit = numeric.randomBit();
+          List<DRes<SInt>> bits = mask.getBits().out();
+          bits.add(extraBit);
+          Collections.reverse(bits);
+          DRes<SInt> r = numeric.add(
+              mask.getValue(),
+              numeric.multByOpen(twoTo2k1, extraBit)
+          );
+          DRes<SInt> c = numeric.add(value, r);
+          DRes<OInt> cOpen = numeric.openAsOInt(c);
+          Pair<List<DRes<SInt>>, DRes<OInt>> res = new Pair<>(bits, cOpen);
+          return () -> res;
+        }).seq((seq, pair) -> {
+          Logical logical = seq.logical();
+          Conversion conversion = seq.conversion();
+          List<DRes<SInt>> rBits = pair.getFirst();
+          List<OInt> cBits = arithmetic.toBits(pair.getSecond().out(), k);
+          DRes<List<DRes<SInt>>> rBitsBoolean = conversion.toBooleanBatch(() -> rBits);
+          DRes<List<DRes<SInt>>> xored = logical.pairWiseXorKnown(() -> cBits, rBitsBoolean);
+          DRes<SInt> or = logical.orOfList(xored);
+          return conversion.toArithmetic(logical.not(or));
+        });
   }
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
index 9ef96d276..75d72c29c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
@@ -32,6 +32,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       arithmeticR = resourcePool.getDataSupplier().getNextBitShare();
       Spdz2kSIntBoolean<PlainT> booleanR = arithmeticR.toBoolean();
       c = factory.toSpdz2kSIntBoolean(bool).xor(booleanR);
+      System.out.println("bool " + factory.toSpdz2kSIntBoolean(bool));
       network.sendToAll(c.serializeShareLow());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
@@ -40,9 +41,12 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
           c.asArithmetic(),
           openC.toArithmeticRep()
       );
-      int openCBit = openC.bitValue();
-      // equivalent to xor
-      arithmetic = (openCBit == 0) ? arithmeticR : arithmeticR.multiply(factory.one().negate());
+      // TODO
+      PlainT openCBit = openC.bitValue() == 1 ? factory.one() : factory.zero();
+      PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+      boolean isPartyOne = resourcePool.getMyId() == 1;
+      arithmetic = arithmeticR.addConstant(openCBit, macKeyShare, factory.zero(),
+          isPartyOne).subtract(arithmeticR.multiply(factory.two().multiply(openCBit)));
       return EvaluationStatus.IS_DONE;
     }
   }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/AbstractSpdz2kTest.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/AbstractSpdz2kTest.java
index f0355e624..8b2fa96fd 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/AbstractSpdz2kTest.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/AbstractSpdz2kTest.java
@@ -28,7 +28,7 @@ public abstract class AbstractSpdz2kTest<Spdz2kResourcePoolT extends Spdz2kResou
 
   private final List<Integer> partyNumbers = Arrays.asList(2, 3);
 
-  void runTest(
+  protected void runTest(
       TestThreadRunner.TestThreadFactory<Spdz2kResourcePoolT, ProtocolBuilderNumeric> f,
       EvaluationStrategy evalStrategy) {
     for (Integer numberOfParties : partyNumbers) {
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 8fb3b69f6..c0b79ffca 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -3,6 +3,9 @@
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
 import dk.alexandra.fresco.lib.arithmetic.BasicArithmeticTests;
 import dk.alexandra.fresco.lib.collections.io.CloseListTests.TestCloseAndOpenList;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestCompareEQ;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestCompareEQEdgeCases;
+import dk.alexandra.fresco.lib.compare.CompareTests.TestCompareEQZero;
 import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kComparison.TestBitLessThanOpenSpdz2k;
@@ -175,6 +178,21 @@ public void testXorKnown() {
     runTest(new TestXorKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testCompareZeroLogRounds() {
+    runTest(new TestCompareEQZero<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testEqualsLogRounds() {
+    runTest(new TestCompareEQ<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testEqualsEdgeCasesLogRounds() {
+    runTest(new TestCompareEQEdgeCases<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+  
   protected abstract int getMaxBitLength();
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
index 81b1e43d6..6f126fb57 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
@@ -35,12 +35,12 @@ public class TestSpdz2kConversion extends
 
   @Test
   public void testArithmeticToBool() {
-    runTest(new TestArithmeticToBool<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestArithmeticToBool<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testBoolToArithmetic() {
-    runTest(new TestBoolToArithmetic<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestBoolToArithmetic<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
index 734827e00..78cafd424 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
@@ -37,57 +37,57 @@ public class TestSpdz2kLogicalOperations extends
 
   @Test
   public void testAnd() {
-    runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testOr() {
-    runTest(new TestOrSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestOrSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testAndXorSequence() {
-    runTest(new TestAndXorSequence<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestAndXorSequence<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testSequentialAnd() {
-    runTest(new TestSequentialAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestSequentialAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testXor() {
-    runTest(new TestXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testXorKnown() {
-    runTest(new TestXorKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestXorKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testSequentialXor() {
-    runTest(new TestSequentialXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestSequentialXorSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testSequentialAndKnown() {
-    runTest(new TestAndKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestAndKnownSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testXorRandom() {
-    runTest(new TestXorSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestXorSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testAndRandom() {
-    runTest(new TestAndSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestAndSpdz2kRandom<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
   public void testNot() {
-    runTest(new TestNotSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+    runTest(new TestNotSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
 

From ae38fdc5a857ec3026ba7f464aa2e7942b5ce37d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 11 May 2018 11:24:23 +0200
Subject: [PATCH 146/231] Stray sout

---
 .../protocols/natives/Spdz2kBooleanToArithmeticProtocol.java    | 1 -
 .../java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
index 75d72c29c..425d58219 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
@@ -32,7 +32,6 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       arithmeticR = resourcePool.getDataSupplier().getNextBitShare();
       Spdz2kSIntBoolean<PlainT> booleanR = arithmeticR.toBoolean();
       c = factory.toSpdz2kSIntBoolean(bool).xor(booleanR);
-      System.out.println("bool " + factory.toSpdz2kSIntBoolean(bool));
       network.sendToAll(c.serializeShareLow());
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index c0b79ffca..37affcf0d 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -192,7 +192,7 @@ public void testEqualsLogRounds() {
   public void testEqualsEdgeCasesLogRounds() {
     runTest(new TestCompareEQEdgeCases<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
-  
+
   protected abstract int getMaxBitLength();
 
 }

From b91dcf2b223f492553294aacc5f4fe044ad2595e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 11 May 2018 11:26:43 +0200
Subject: [PATCH 147/231] Fix comments in comparison

---
 .../fresco/framework/builder/numeric/Comparison.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 3bd779fb2..742587391 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -2,7 +2,6 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
-import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.List;
@@ -40,7 +39,7 @@ enum Algorithm {
   DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm algorithm);
 
   /**
-   * Call to {@link #equals(DRes, DRes, int, ComparisonAlgorithm)} with default comparison
+   * Call to {@link #equals(DRes, DRes, int, Algorithm)} with default comparison
    * algorithm.
    */
   default DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength) {
@@ -48,7 +47,7 @@ default DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength) {
   }
 
   /**
-   * Call to {@link #equals(DRes, DRes, int, ComparisonAlgorithm)} with default comparison
+   * Call to {@link #equals(DRes, DRes, int, Algorithm)} with default comparison
    * algorithm, checking equality of all bits.
    */
   DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y);

From e91f6f9bb6e252e6a6cf166bf866db9c741a7641 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 11 May 2018 14:27:20 +0200
Subject: [PATCH 148/231] Use native protocol in output

---
 .../fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 62ce0ab49..6cb181078 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -12,6 +12,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
 
@@ -75,7 +76,7 @@ public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
     return builder.seq(seq -> {
       Spdz2kSIntBoolean<PlainT> bit = factory.toSpdz2kSIntBoolean(secretBit);
-      return seq.numeric().openAsOInt(bit.asArithmetic());
+      return seq.append(new Spdz2kOutputToAll<>(bit.asArithmetic()));
     }).seq((seq, opened) -> {
       PlainT openBit = factory.fromOInt(opened);
       // TODO clean up

From 886ebc64fa40b9998f65a51a8190a7a051b148f4 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 11 May 2018 14:40:51 +0200
Subject: [PATCH 149/231] Native or protocol

---
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |   9 +-
 .../protocols/natives/Spdz2kOrProtocol.java   | 108 ++++++++++++++++++
 2 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 6cb181078..d9c03c862 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -4,7 +4,6 @@
 import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
 import dk.alexandra.fresco.framework.builder.numeric.Logical;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
@@ -12,6 +11,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
@@ -38,12 +38,7 @@ public DRes<SInt> and(DRes<SInt> bitA, DRes<SInt> bitB) {
 
   @Override
   public DRes<SInt> or(DRes<SInt> bitA, DRes<SInt> bitB) {
-    // a OR b = a XOR b XOR (a AND b)
-    return builder.par(par -> {
-      DRes<SInt> xored = par.logical().xor(bitA, bitB);
-      DRes<SInt> anded = par.logical().and(bitA, bitB);
-      return () -> new Pair<>(xored, anded);
-    }).seq((seq, pair) -> seq.logical().xor(pair.getFirst(), pair.getSecond()));
+    return builder.append(new Spdz2kOrProtocol<>(bitA, bitB));
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrProtocol.java
new file mode 100644
index 000000000..d85c04b02
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrProtocol.java
@@ -0,0 +1,108 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.Arrays;
+
+/**
+ * Native protocol for computing logical OR of two values in boolean form.
+ */
+public class Spdz2kOrProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<SInt> left;
+  private final DRes<SInt> right;
+  private Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple;
+  private Spdz2kSIntBoolean<PlainT> epsilon;
+  private Spdz2kSIntBoolean<PlainT> delta;
+  private SInt result;
+
+  /**
+   * Creates new {@link Spdz2kMultiplyProtocol}.
+   *
+   * @param left left factor
+   * @param right right factor
+   */
+  public Spdz2kOrProtocol(DRes<SInt> left, DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    if (round == 0) {
+      triple = resourcePool.getDataSupplier().getNextBitTripleShares();
+      epsilon = factory.toSpdz2kSIntBoolean(left).xor(triple.getLeft());
+      delta = factory.toSpdz2kSIntBoolean(right).xor(triple.getRight());
+      int packed = epsilon.serializeShareLow()[0] ^ (delta.serializeShareLow()[0] << 1);
+      final byte[] bytes = new byte[]{(byte) packed};
+      network.sendToAll(bytes);
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
+          resourcePool.getNoOfParties(),
+          factory);
+      PlainT e = epsilonAndDelta.getFirst();
+      PlainT d = epsilonAndDelta.getSecond();
+      resourcePool.getOpenedValueStore().pushOpenedValues(
+          Arrays.asList(
+              epsilon.asArithmetic(),
+              delta.asArithmetic()
+          ),
+          Arrays.asList(
+              e.toArithmeticRep(),
+              d.toArithmeticRep()
+          )
+      );
+      int eBit = e.bitValue();
+      int dBit = d.bitValue();
+      PlainT ed = e.multiply(d);
+      // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+      Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+      Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+      Spdz2kSIntBoolean<PlainT> anded = tripleProduct
+          .xor(tripleRight.and(eBit))
+          .xor(tripleLeft.and(dBit))
+          .xorOpen(ed,
+              macKeyShare,
+              factory.zero().toBitRep(),
+              resourcePool.getMyId() == 1);
+      Spdz2kSIntBoolean<PlainT> xored = factory.toSpdz2kSIntBoolean(left)
+          .xor(factory.toSpdz2kSIntBoolean(right));
+      result = anded.xor(xored);
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  /**
+   * Retrieves shares for epsilon and delta and reconstructs each.
+   */
+  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
+      int noOfParties, CompUIntFactory<PlainT> factory) {
+    int received = network.receive(1)[0];
+    PlainT e = factory.fromBit(received & 1); // first bit
+    PlainT d = factory.fromBit((received & 2) >>> 1); // second bit
+    for (int i = 2; i <= noOfParties; i++) {
+      received = network.receive(i)[0];
+      e = e.add(factory.fromBit(received & 1));
+      d = d.add(factory.fromBit((received & 2) >>> 1));
+    }
+    return new Pair<>(e, d);
+  }
+
+  @Override
+  public SInt out() {
+    return result;
+  }
+}

From cd5bad8cd9888db944a84af48f92aabe0b8c8274 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 15 May 2018 12:28:57 +0200
Subject: [PATCH 150/231] Remove uint96

---
 .../suite/spdz2k/Spdz2kProtocolSuite96.java   |  21 --
 .../suite/spdz2k/datatypes/CompUInt96.java    | 246 -------------
 .../spdz2k/datatypes/CompUInt96Factory.java   |  44 ---
 .../spdz2k/datatypes/CompUIntConverter96.java |  15 -
 .../fresco/suite/spdz2k/TestSpdz2k96.java     |  42 ---
 .../spdz2k/datatypes/TestCompUInt96.java      | 327 ------------------
 6 files changed, 695 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter96.java
 delete mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k96.java
 delete mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java
deleted file mode 100644
index b1782ede3..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite96.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k;
-
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt96;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter96;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt32;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt64;
-
-/**
- * Protocol suite using {@link CompUInt96} as the underlying plain-value type.
- */
-public class Spdz2kProtocolSuite96 extends Spdz2kProtocolSuite<UInt64, UInt32, CompUInt96> {
-
-  public Spdz2kProtocolSuite96(boolean useBooleanMode) {
-    super(new CompUIntConverter96(), useBooleanMode);
-  }
-
-  public Spdz2kProtocolSuite96() {
-    this(false);
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
deleted file mode 100644
index c4774c32f..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-import dk.alexandra.fresco.framework.value.OInt;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-public class CompUInt96 implements CompUInt<UInt64, UInt32, CompUInt96> {
-  private static final CompUInt96 ONE = new CompUInt96((int) 1);
-
-  private final int high;
-  private final int mid;
-  private final int low;
-
-  /**
-   * Creates new {@link CompUInt96}.
-   *
-   * @param bytes bytes interpreted in big-endian order.
-   */
-  public CompUInt96(byte[] bytes) {
-    byte[] padded = CompUInt.pad(bytes, 96);
-    ByteBuffer buffer = ByteBuffer.wrap(padded);
-    buffer.order(ByteOrder.BIG_ENDIAN);
-    this.high = buffer.getInt();
-    this.mid = buffer.getInt();
-    this.low = buffer.getInt();
-  }
-
-  CompUInt96(int high, int mid, int low) {
-    this.high = high;
-    this.mid = mid;
-    this.low = low;
-  }
-
-  CompUInt96(BigInteger value) {
-    this(value.shiftRight(64).intValue(), value.shiftRight(32).intValue(), value.intValue());
-  }
-
-  CompUInt96(UInt64 value) {
-    this(value.toLong());
-  }
-
-  CompUInt96(UInt32 value) {
-    this(value.toInt());
-  }
-
-  CompUInt96(long value) {
-    this.high = 0;
-    this.mid = (int) (value >>> 32);
-    this.low = (int) value;
-  }
-
-  CompUInt96(int value) {
-    this.high = 0;
-    this.mid = 0;
-    this.low = value;
-  }
-
-  CompUInt96(CompUInt96 other) {
-    this.high = other.high;
-    this.mid = other.mid;
-    this.low = other.low;
-  }
-
-  @Override
-  public CompUInt96 add(CompUInt96 other) {
-    long newLow = Integer.toUnsignedLong(this.low) + Integer.toUnsignedLong(other.low);
-    long lowOverflow = newLow >>> 32;
-    long newMid = Integer.toUnsignedLong(this.mid)
-        + Integer.toUnsignedLong(other.mid)
-        + lowOverflow;
-    long midOverflow = newMid >>> 32;
-    long newHigh = UInt.toUnLong(this.high) + UInt.toUnLong(other.high) + midOverflow;
-    return new CompUInt96((int) newHigh, (int) newMid, (int) newLow);
-  }
-
-  @Override
-  public CompUInt96 multiply(CompUInt96 other) {
-    long thisLowAsLong = UInt.toUnLong(this.low);
-    long thisMidAsLong = UInt.toUnLong(this.mid);
-    long otherLowAsLong = UInt.toUnLong(other.low);
-    long otherMidAsLong = UInt.toUnLong(other.mid);
-
-    // low
-    long t1 = thisLowAsLong * otherLowAsLong;
-    long t2 = thisLowAsLong * otherMidAsLong;
-    long t3 = thisLowAsLong * other.high;
-
-    // mid
-    long t4 = thisMidAsLong * otherLowAsLong;
-    long t5 = thisMidAsLong * otherMidAsLong;
-    int t6 = this.mid * other.high;
-
-    // high
-    long t7 = this.high * otherLowAsLong;
-    int t8 = this.high * other.mid;
-    // we don't need the product of this.high and other.high since those overflow 2^128
-
-    long m1 = (t1 >>> 32) + (t2 & 0xffffffffL);
-    int m2 = (int) m1;
-    long newMid = UInt.toUnLong(m2) + (t4 & 0xffffffffL);
-
-    long newHigh = (t2 >>> 32)
-        + t3
-        + (t4 >>> 32)
-        + t5
-        + (UInt.toUnLong(t6) << 32)
-        + t7
-        + (UInt.toUnLong(t8) << 32)
-        + (m1 >>> 32)
-        + (newMid >>> 32);
-    return new CompUInt96((int) newHigh, (int) newMid, (int) t1);
-  }
-
-  @Override
-  public CompUInt96 subtract(CompUInt96 other) {
-    return this.add(other.negate());
-  }
-
-  @Override
-  public CompUInt96 negate() {
-    return new CompUInt96(~high, ~mid, ~low).add(ONE);
-  }
-
-  @Override
-  public boolean isZero() {
-    return high == 0 && mid == 0 && low == 0;
-  }
-
-  @Override
-  public BigInteger toBigInteger() {
-    return new BigInteger(1, toByteArray());
-  }
-
-  @Override
-  public UInt32 getLeastSignificant() {
-    return new UInt32(low);
-  }
-
-  @Override
-  public UInt64 getMostSignificant() {
-    return new UInt64((UInt.toUnLong(high) << 32) + UInt.toUnLong(mid));
-  }
-
-  @Override
-  public UInt64 getLeastSignificantAsHigh() {
-    return new UInt64(toLong());
-  }
-
-  @Override
-  public CompUInt96 shiftLeft(int n) {
-    // TODO hack hack hack
-    return new CompUInt96(high, mid, low << 31);
-  }
-
-  @Override
-  public long toLong() {
-    return (UInt.toUnLong(mid) << 32) + (UInt.toUnLong(this.low));
-  }
-
-  @Override
-  public int toInt() {
-    return low;
-  }
-
-  @Override
-  public CompUInt96 shiftLowIntoHigh() {
-    return new CompUInt96(mid, low, 0);
-  }
-
-  @Override
-  public CompUInt96 clearHighBits() {
-    return new CompUInt96(0, 0, low);
-  }
-
-  @Override
-  public CompUInt96 toBitRep() {
-    return null;
-  }
-
-  @Override
-  public CompUInt96 toArithmeticRep() {
-    return null;
-  }
-
-  @Override
-  public CompUInt96 multiplyByBit(int value) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public CompUInt96 testBitAsUInt(int bit) {
-    return testBit(bit) ? new CompUInt96(1) : new CompUInt96(0);
-  }
-
-  @Override
-  public int getLowBitLength() {
-    return 32;
-  }
-
-  @Override
-  public int getHighBitLength() {
-    return 64;
-  }
-
-  @Override
-  public String toString() {
-    return toBigInteger().toString();
-  }
-
-  @Override
-  public int getBitLength() {
-    return 96;
-  }
-
-  @Override
-  public CompUInt96 clearAboveBitAt(int bitPos) {
-    if (bitPos < Integer.SIZE) {
-      int mask = ~(0x80000000 >> (31 - bitPos));
-      return new CompUInt96(0, 0, low & mask);
-    } else if (bitPos < Long.SIZE) {
-      int mask = ~(0x80000000 >> (63 - bitPos));
-      return new CompUInt96(0, mid & mask, low);
-    } else {
-      int mask = ~(0x80000000 >> (95 - bitPos));
-      return new CompUInt96(high & mask, mid, low);
-    }
-  }
-
-  @Override
-  public byte[] toByteArray() {
-    ByteBuffer buffer = ByteBuffer.allocate(getBitLength() / 8);
-    buffer.order(ByteOrder.BIG_ENDIAN);
-    buffer.putInt(high);
-    buffer.putInt(mid);
-    buffer.putInt(low);
-    buffer.flip();
-    return buffer.array();
-  }
-
-  @Override
-  public OInt out() {
-    return this;
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java
deleted file mode 100644
index db3eea4c2..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt96Factory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
-import dk.alexandra.fresco.suite.spdz2k.util.UIntSerializer;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-public class CompUInt96Factory implements CompUIntFactory<CompUInt96> {
-
-  private final SecureRandom random = new SecureRandom();
-
-  @Override
-  public CompUInt96 createFromBytes(byte[] bytes) {
-    return new CompUInt96(bytes);
-  }
-
-  @Override
-  public CompUInt96 createFromBigInteger(BigInteger value) {
-    return value == null ? null : new CompUInt96(value);
-  }
-
-  @Override
-  public CompUInt96 createRandom() {
-    byte[] bytes = new byte[12];
-    this.random.nextBytes(bytes);
-    return createFromBytes(bytes);
-  }
-
-  @Override
-  public ByteSerializer<CompUInt96> createSerializer() {
-    return new UIntSerializer<>(this);
-  }
-
-  @Override
-  public int getLowBitLength() {
-    return 32;
-  }
-
-  @Override
-  public int getHighBitLength() {
-    return 64;
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter96.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter96.java
deleted file mode 100644
index 81924e30b..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter96.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-public class CompUIntConverter96 implements CompUIntConverter<UInt64, UInt32, CompUInt96> {
-
-  @Override
-  public CompUInt96 createFromHigh(UInt64 value) {
-    return new CompUInt96(value);
-  }
-
-  @Override
-  public CompUInt96 createFromLow(UInt32 value) {
-    return new CompUInt96(value);
-  }
-
-}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k96.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k96.java
deleted file mode 100644
index 5cae1e505..000000000
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k96.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k;
-
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.util.AesCtrDrbg;
-import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt96;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt96Factory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
-import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
-import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
-import java.util.function.Supplier;
-
-public class TestSpdz2k96 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt96>> {
-
-  @Override
-  protected Spdz2kResourcePool<CompUInt96> createResourcePool(int playerId, int noOfParties,
-      Supplier<Network> networkSupplier) {
-    CompUIntFactory<CompUInt96> factory = new CompUInt96Factory();
-    Spdz2kResourcePool<CompUInt96> resourcePool =
-        new Spdz2kResourcePoolImpl<>(
-            playerId,
-            noOfParties, null,
-            new Spdz2kOpenedValueStoreImpl<>(),
-            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, factory.createRandom(), factory),
-            factory);
-    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
-    return resourcePool;
-  }
-
-  @Override
-  protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt96>> createProtocolSuite() {
-    return new Spdz2kProtocolSuite96();
-  }
-
-  @Override
-  protected int getMaxBitLength() {
-    return 32;
-  }
-
-}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
deleted file mode 100644
index 07792123c..000000000
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt96.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigInteger;
-import java.util.Random;
-import org.junit.Test;
-
-public class TestCompUInt96 {
-
-  private final BigInteger two = BigInteger.valueOf(2);
-  private final BigInteger twoTo32 = BigInteger.ONE.shiftLeft(32);
-  private final BigInteger twoTo64 = BigInteger.ONE.shiftLeft(64);
-  private final BigInteger twoTo96 = BigInteger.ONE.shiftLeft(96);
-
-  @Test
-  public void testConstruct() {
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(BigInteger.ZERO).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new CompUInt96(BigInteger.ONE).toBigInteger()
-    );
-    assertEquals(
-        new BigInteger("42"),
-        new CompUInt96(new BigInteger("42")).toBigInteger()
-    );
-    assertEquals(
-        twoTo32,
-        new CompUInt96(twoTo32).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.subtract(BigInteger.ONE),
-        new CompUInt96(twoTo32.subtract(BigInteger.ONE)).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.add(BigInteger.ONE),
-        new CompUInt96(twoTo32.add(BigInteger.ONE)).toBigInteger()
-    );
-    assertEquals(
-        twoTo64.subtract(BigInteger.ONE),
-        new CompUInt96(twoTo64.subtract(BigInteger.ONE)).toBigInteger()
-    );
-    assertEquals(
-        twoTo64,
-        new CompUInt96(twoTo64).toBigInteger()
-    );
-    assertEquals(
-        twoTo64.add(BigInteger.ONE),
-        new CompUInt96(twoTo64.add(BigInteger.ONE)).toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(BigInteger.ONE),
-        new CompUInt96(twoTo96.subtract(BigInteger.ONE)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.valueOf(-1).mod(twoTo96),
-        new CompUInt96(BigInteger.valueOf(-1)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.valueOf(-2).mod(twoTo96),
-        new CompUInt96(BigInteger.valueOf(-2)).toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(BigInteger.ONE).negate().mod(twoTo96),
-        new CompUInt96(twoTo96.subtract(BigInteger.ONE).negate()).toBigInteger()
-    );
-  }
-
-  @Test
-  public void testAdd() {
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(0).add(new CompUInt96(0)).toBigInteger()
-    );
-    assertEquals(
-        two,
-        new CompUInt96(1).add(new CompUInt96(1)).toBigInteger()
-    );
-    assertEquals(
-        twoTo32,
-        new CompUInt96(twoTo32).add(new CompUInt96(0)).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.add(BigInteger.ONE),
-        new CompUInt96(twoTo32).add(new CompUInt96(1)).toBigInteger()
-    );
-    assertEquals(
-        twoTo64,
-        new CompUInt96(twoTo64).add(new CompUInt96(0)).toBigInteger()
-    );
-    assertEquals(
-        twoTo64.add(BigInteger.ONE),
-        new CompUInt96(twoTo64).add(new CompUInt96(1)).toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(BigInteger.ONE),
-        new CompUInt96(twoTo96.subtract(BigInteger.ONE)).add(new CompUInt96(0))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(twoTo96.subtract(BigInteger.ONE))
-            .add(new CompUInt96(BigInteger.ONE)).toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(new BigInteger("10000000")).add(twoTo32.add(twoTo64)).mod(twoTo96),
-        new CompUInt96(twoTo96.subtract(new BigInteger("10000000")))
-            .add(new CompUInt96(twoTo32.add(twoTo64))).toBigInteger()
-    );
-    assertEquals(
-        twoTo32.add(twoTo64).mod(twoTo96),
-        new CompUInt96(twoTo32).add(new CompUInt96(twoTo64)).toBigInteger()
-    );
-  }
-
-  @Test
-  public void testMultiply() {
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(0).multiply(new CompUInt96(0)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(1).multiply(new CompUInt96(0)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(0).multiply(new CompUInt96(1)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(1024).multiply(new CompUInt96(0)).toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(twoTo96.subtract(BigInteger.ONE)).multiply(new CompUInt96(0))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new CompUInt96(1).multiply(new CompUInt96(1)).toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(BigInteger.ONE),
-        new CompUInt96(new CompUInt96(1))
-            .multiply(new CompUInt96(twoTo96.subtract(BigInteger.ONE)))
-            .toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(BigInteger.ONE),
-        new CompUInt96(twoTo96.subtract(BigInteger.ONE)).multiply(new CompUInt96(1))
-            .toBigInteger()
-    );
-    assertEquals(
-        new BigInteger("4294967306").multiply(new BigInteger("7415541639366192187")).mod(twoTo96),
-        new CompUInt96(new BigInteger("4294967306"))
-            .multiply(new CompUInt96(new BigInteger("7415541639366192187")))
-            .toBigInteger()
-    );
-    // multiply no overflow
-    assertEquals(
-        new BigInteger("42").multiply(new BigInteger("7")),
-        new CompUInt96(new BigInteger("42")).multiply(new CompUInt96(new BigInteger("7")))
-            .toBigInteger()
-    );
-    // multiply with overflow
-    assertEquals(
-        new BigInteger("42").multiply(twoTo96.subtract(BigInteger.ONE)).mod(twoTo96),
-        new CompUInt96(new BigInteger("42"))
-            .multiply(new CompUInt96(twoTo96.subtract(BigInteger.ONE)))
-            .toBigInteger()
-    );
-    assertEquals(
-        twoTo64.multiply(twoTo64.add(BigInteger.TEN)).mod(twoTo96),
-        new CompUInt96(twoTo64)
-            .multiply(new CompUInt96(twoTo64.add(BigInteger.TEN)))
-            .toBigInteger()
-    );
-  }
-
-  @Test
-  public void testNegate() {
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(BigInteger.ZERO).negate().toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new CompUInt96(twoTo96.subtract(BigInteger.ONE)).negate().toBigInteger()
-    );
-    assertEquals(
-        two,
-        new CompUInt96(twoTo96.subtract(two)).negate().toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(two),
-        new CompUInt96(two).negate().toBigInteger()
-    );
-  }
-
-  @Test
-  public void testSubtract() {
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(BigInteger.ZERO).subtract(new CompUInt96(BigInteger.ZERO))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ONE,
-        new CompUInt96(BigInteger.ONE).subtract(new CompUInt96(BigInteger.ZERO))
-            .toBigInteger()
-    );
-    assertEquals(
-        BigInteger.ZERO,
-        new CompUInt96(BigInteger.ONE).subtract(new CompUInt96(BigInteger.ONE))
-            .toBigInteger()
-    );
-    assertEquals(
-        twoTo96.subtract(BigInteger.ONE),
-        new CompUInt96(BigInteger.ONE).subtract(new CompUInt96(two))
-            .toBigInteger()
-    );
-  }
-
-  @Test
-  public void testToByteArrayWithPadding() {
-    byte[] bytes = new byte[]{0x42};
-    UInt<CompUInt96> uint = new CompUInt96(bytes);
-    byte[] expected = new byte[12];
-    expected[expected.length - 1] = 0x42;
-    byte[] actual = uint.toByteArray();
-    assertArrayEquals(expected, actual);
-  }
-
-  @Test
-  public void testToByteArray() {
-    byte[] bytes = new byte[12];
-    new Random(1).nextBytes(bytes);
-    UInt<CompUInt96> uint = new CompUInt96(bytes);
-    byte[] actual = uint.toByteArray();
-    assertArrayEquals(bytes, actual);
-  }
-
-  @Test
-  public void testToByteArrayMore() {
-    byte[] bytes = new byte[]{
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, // high
-        0x02, 0x02, 0x02, 0x02, // low
-    };
-    UInt<CompUInt96> uint = new CompUInt96(bytes);
-    byte[] actual = uint.toByteArray();
-    assertArrayEquals(bytes, actual);
-  }
-
-  @Test
-  public void testToLong() {
-    assertEquals(Long.MAX_VALUE, new CompUInt96(Long.MAX_VALUE).toLong());
-    assertEquals(0, new CompUInt96(0).toLong());
-    assertEquals(1, new CompUInt96(1).toLong());
-    assertEquals(twoTo64.longValue(), new CompUInt96(twoTo64).toLong());
-  }
-
-  @Test
-  public void testGetBitLength() {
-    CompUInt96 uint = new CompUInt96(1);
-    assertEquals(96, uint.getBitLength());
-    assertEquals(64, uint.getHighBitLength());
-    assertEquals(32, uint.getLowBitLength());
-  }
-
-  @Test
-  public void testToInt() {
-    UInt<CompUInt96> uint = new CompUInt96(1);
-    assertEquals(1, uint.toInt());
-  }
-
-  @Test
-  public void testToString() {
-    UInt<CompUInt96> uint = new CompUInt96(12135);
-    assertEquals("12135", uint.toString());
-  }
-
-  @Test
-  public void testIsZero() {
-    assertTrue(new CompUInt96(0, 0,0).isZero());
-    assertFalse(new CompUInt96(0, 0,1).isZero());
-    assertFalse(new CompUInt96(0, 1,0).isZero());
-    assertFalse(new CompUInt96(1, 0,0).isZero());
-  }
-
-  @Test
-  public void testClearAboveBitAt() {
-    assertEquals(new CompUInt96(0, 0, 0).toBigInteger(),
-        new CompUInt96(0, 0, 0).clearAboveBitAt(63).toBigInteger());
-    assertEquals(new CompUInt96(0, 0, 123123).toBigInteger(),
-        new CompUInt96(0, 0, 123123).clearAboveBitAt(63).toBigInteger());
-    assertEquals(new CompUInt96(0, 0, 123123).toBigInteger(),
-        new CompUInt96(1, 0, 123123).clearAboveBitAt(63).toBigInteger());
-    assertEquals(new CompUInt96(0, 0x70001001, 123123).toBigInteger(),
-        new CompUInt96(1, 0xf0001001, 123123).clearAboveBitAt(63).toBigInteger());
-    assertEquals(new CompUInt96(0, 0x00000021, 123123).toBigInteger(),
-        new CompUInt96(1, 0xf0001021, 123123).clearAboveBitAt(44).toBigInteger());
-    assertEquals(new CompUInt96(0x70001001, 0x70001001, 123123).toBigInteger(),
-        new CompUInt96(0xf0001001, 0x70001001, 123123).clearAboveBitAt(95)
-            .toBigInteger());
-    assertEquals(new CompUInt96(0, 0, 0x00000001).toBigInteger(),
-        new CompUInt96(1, 1, 0xff001021).clearAboveBitAt(5).toBigInteger());
-  }
-
-  @Test
-  public void testShiftLeft() {
-    // TODO more tests
-    assertEquals(new BigInteger("0").shiftLeft(31),
-        new CompUInt96(new BigInteger("0")).shiftLeft(31).toBigInteger());
-    assertEquals(new BigInteger("1").shiftLeft(31),
-        new CompUInt96(new BigInteger("1")).shiftLeft(31).toBigInteger());
-    assertEquals(new BigInteger("12312").shiftLeft(12),
-        new CompUInt96(new BigInteger("12312")).shiftLeft(12).toBigInteger());
-  }
-
-}

From 7da613a842fd19ba172e612145f1e7d902d95816 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 17 May 2018 08:54:02 +0200
Subject: [PATCH 151/231] WIP left shift

---
 .../suite/spdz2k/datatypes/CompUInt128.java   | 11 ++++++++--
 .../spdz2k/datatypes/TestCompUInt128.java     | 20 ++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index f6b2ec020..6d9578983 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -161,8 +161,10 @@ public UInt64 getLeastSignificantAsHigh() {
 
   @Override
   public CompUInt128 shiftLeft(int n) {
-    // TODO hack hack hack
-    return new CompUInt128(this.toBigInteger().shiftLeft(n));
+    int nInv = Integer.SIZE - n;
+    long newHigh = (high << n) + UInt.toUnLong(mid >>> nInv);
+    int newMid = (mid << n) + (low >>> nInv);
+    return new CompUInt128(newHigh, newMid, low << n);
   }
 
   @Override
@@ -310,4 +312,9 @@ private static int toInt(byte[] bytes, int start) {
         | (bytes[flipped - 3] & 0xFF) << 24;
   }
 
+  public static void main(String args[]) {
+    int n = 32;
+    System.out.println(100 << n);
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 9fa988ec9..10d9628ea 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -322,13 +322,19 @@ public void testClearAboveBitAt() {
 
   @Test
   public void testShiftLeft() {
-    // TODO more tests
-    assertEquals(new BigInteger("0").shiftLeft(63),
-        new CompUInt128(new BigInteger("0")).shiftLeft(63).toBigInteger());
-    assertEquals(new BigInteger("1").shiftLeft(63),
-        new CompUInt128(new BigInteger("1")).shiftLeft(63).toBigInteger());
-    assertEquals(new BigInteger("12312").shiftLeft(12),
-        new CompUInt128(new BigInteger("12312")).shiftLeft(12).toBigInteger());
+    byte[] bytes = new byte[16];
+    new Random(1).nextBytes(bytes);
+    CompUInt128 r = new CompUInt128(bytes);
+    for (int i = 1; i < 32; i++) {
+      assertEquals("Number of shifts " + i, r.toBigInteger().shiftLeft(i).mod(twoTo128).toString(2),
+          r.shiftLeft(i).toBigInteger().toString(2));
+    }
+//    assertEquals(new BigInteger("1").shiftLeft(63),
+//        new CompUInt128(new BigInteger("1")).shiftLeft(63).toBigInteger());
+//    assertEquals(new BigInteger("12312").shiftLeft(12),
+//        new CompUInt128(new BigInteger("12312")).shiftLeft(12).toBigInteger());
+//    assertEquals(new BigInteger("12312").shiftLeft(68),
+//        new CompUInt128(new BigInteger("12312")).shiftLeft(68).toBigInteger());
   }
 
   @Test

From b06ab0c494892fb80e2ad6f40f5c7e57945db2cc Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 17 May 2018 13:06:35 +0200
Subject: [PATCH 152/231] Small left shift

---
 .../suite/spdz2k/datatypes/CompUInt.java      |  5 +++--
 .../suite/spdz2k/datatypes/CompUInt128.java   | 17 ++++++++++------
 .../spdz2k/datatypes/TestCompUInt128.java     | 20 ++++++++++---------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index fd5e81781..da33ad661 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -29,9 +29,10 @@ public interface CompUInt<
   HighT getLeastSignificantAsHigh();
 
   /**
-   * Shift left by n bits.
+   * Shift left by n bits where n < k. <p>Result of a shift by n >= k is undefined. A shift for n <=
+   * 0 returns this, unchanged.</p>
    */
-  CompT shiftLeft(int n);
+  CompT shiftLeftSmall(int n);
 
   /**
    * Left-shift the k least significant bits by k.
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 6d9578983..0e379edf4 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -160,11 +160,15 @@ public UInt64 getLeastSignificantAsHigh() {
   }
 
   @Override
-  public CompUInt128 shiftLeft(int n) {
-    int nInv = Integer.SIZE - n;
-    long newHigh = (high << n) + UInt.toUnLong(mid >>> nInv);
-    int newMid = (mid << n) + (low >>> nInv);
-    return new CompUInt128(newHigh, newMid, low << n);
+  public CompUInt128 shiftLeftSmall(int n) {
+    if (n <= 0) {
+      return this;
+    }
+    int nInv = (Long.SIZE - n);
+    long midAndLow = (UInt.toUnLong(mid) << 32) | UInt.toUnLong(low);
+    long newHigh = (high << n) + (midAndLow >>> nInv);
+    long midAndLowShifted = midAndLow << n;
+    return new CompUInt128(newHigh, (int) (midAndLowShifted >>> 32), (int) midAndLowShifted);
   }
 
   @Override
@@ -313,7 +317,8 @@ private static int toInt(byte[] bytes, int start) {
   }
 
   public static void main(String args[]) {
-    int n = 32;
+    int n = (Long.SIZE - 1);
+    System.out.println(n);
     System.out.println(100 << n);
   }
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 10d9628ea..264cf0e76 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -321,20 +321,22 @@ public void testClearAboveBitAt() {
   }
 
   @Test
-  public void testShiftLeft() {
+  public void testShiftLeftSmall() {
     byte[] bytes = new byte[16];
     new Random(1).nextBytes(bytes);
     CompUInt128 r = new CompUInt128(bytes);
-    for (int i = 1; i < 32; i++) {
+    for (int i = 0; i < 64; i++) {
       assertEquals("Number of shifts " + i, r.toBigInteger().shiftLeft(i).mod(twoTo128).toString(2),
-          r.shiftLeft(i).toBigInteger().toString(2));
+          r.shiftLeftSmall(i).toBigInteger().toString(2));
     }
-//    assertEquals(new BigInteger("1").shiftLeft(63),
-//        new CompUInt128(new BigInteger("1")).shiftLeft(63).toBigInteger());
-//    assertEquals(new BigInteger("12312").shiftLeft(12),
-//        new CompUInt128(new BigInteger("12312")).shiftLeft(12).toBigInteger());
-//    assertEquals(new BigInteger("12312").shiftLeft(68),
-//        new CompUInt128(new BigInteger("12312")).shiftLeft(68).toBigInteger());
+    assertEquals(new BigInteger("1").shiftLeft(63),
+        new CompUInt128(new BigInteger("1")).shiftLeftSmall(63).toBigInteger());
+    assertEquals(new BigInteger("12312").shiftLeft(12),
+        new CompUInt128(new BigInteger("12312")).shiftLeftSmall(12).toBigInteger());
+    assertEquals(new BigInteger("12312"),
+        new CompUInt128(new BigInteger("12312")).shiftLeftSmall(0).toBigInteger());
+    assertEquals(new BigInteger("12312"),
+        new CompUInt128(new BigInteger("12312")).shiftLeftSmall(-1).toBigInteger());
   }
 
   @Test

From 2a2bca5b5d0391b3a9ac1d81c330feb9488e8267 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 17 May 2018 13:18:48 +0200
Subject: [PATCH 153/231] Use left shift in conversion

---
 .../fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
index 6a05c93db..0256e2275 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSIntArithmetic.java
@@ -70,7 +70,7 @@ public Spdz2kSIntArithmetic<PlainT> addConstant(
   public Spdz2kSIntBoolean<PlainT> toBoolean() {
     return new Spdz2kSIntBoolean<>(
         share.toBitRep(),
-        macShare.toBitRep().toArithmeticRep() // results in right-shift but keeps arithmetic rep
+        macShare.shiftLeftSmall(macShare.getLowBitLength() - 1)
     );
   }
 

From c77afa227f6e70c21cef33462bb2b929aeea2f8c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 17 May 2018 13:27:27 +0200
Subject: [PATCH 154/231] Or instead of add

---
 .../alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java | 8 +++++++-
 .../fresco/suite/spdz2k/datatypes/CompUInt128.java        | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index da33ad661..213d5afff 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -29,11 +29,17 @@ public interface CompUInt<
   HighT getLeastSignificantAsHigh();
 
   /**
-   * Shift left by n bits where n < k. <p>Result of a shift by n >= k is undefined. A shift for n <=
+   * Left shift by n bits where n < k. <p>Result of a shift by n >= k is undefined. A shift for n <=
    * 0 returns this, unchanged.</p>
    */
   CompT shiftLeftSmall(int n);
 
+  /**
+   * Unsigned right shift by n bits where n < k. <p>Result of a shift by n >= k is undefined. A
+   * shift for n <= 0 returns this, unchanged.</p>
+   */
+  CompT shiftRightSmall(int n);
+
   /**
    * Left-shift the k least significant bits by k.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 0e379edf4..a2eadd74a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -166,11 +166,16 @@ public CompUInt128 shiftLeftSmall(int n) {
     }
     int nInv = (Long.SIZE - n);
     long midAndLow = (UInt.toUnLong(mid) << 32) | UInt.toUnLong(low);
-    long newHigh = (high << n) + (midAndLow >>> nInv);
+    long newHigh = (high << n) | (midAndLow >>> nInv);
     long midAndLowShifted = midAndLow << n;
     return new CompUInt128(newHigh, (int) (midAndLowShifted >>> 32), (int) midAndLowShifted);
   }
 
+  @Override
+  public CompUInt128 shiftRightSmall(int n) {
+    return null;
+  }
+
   @Override
   public long toLong() {
     return (UInt.toUnLong(this.mid) << 32) + UInt.toUnLong(this.low);

From 4d58fb0152436db7b97aa3d6170cbf81a97bc511 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 17 May 2018 13:37:40 +0200
Subject: [PATCH 155/231] Small right shift

---
 .../suite/spdz2k/datatypes/CompUInt128.java   |  9 ++++++++-
 .../spdz2k/datatypes/TestCompUInt128.java     | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index a2eadd74a..6811ff2cf 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -173,7 +173,14 @@ public CompUInt128 shiftLeftSmall(int n) {
 
   @Override
   public CompUInt128 shiftRightSmall(int n) {
-    return null;
+    if (n <= 0) {
+      return this;
+    }
+    int nInv = (Long.SIZE - n);
+    long midAndLow = (UInt.toUnLong(mid) << 32) | UInt.toUnLong(low);
+    long newHigh = high >>> n;
+    long midAndLowShifted = (high << nInv) | (midAndLow >>> n);
+    return new CompUInt128(newHigh, (int) (midAndLowShifted >>> 32), (int) midAndLowShifted);
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 264cf0e76..102c7b11b 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -339,6 +339,26 @@ public void testShiftLeftSmall() {
         new CompUInt128(new BigInteger("12312")).shiftLeftSmall(-1).toBigInteger());
   }
 
+  @Test
+  public void testShiftRightSmall() {
+    byte[] bytes = new byte[16];
+    new Random(2).nextBytes(bytes);
+    CompUInt128 r = new CompUInt128(bytes);
+    for (int i = 0; i < 64; i++) {
+      assertEquals("Number of shifts " + i, r.toBigInteger().shiftRight(i).mod(twoTo128).toString(2),
+          r.shiftRightSmall(i).toBigInteger().toString(2));
+    }
+    for (int i = 0; i < 64; i++) {
+      CompUInt128 element = new CompUInt128(1L << i);
+      assertEquals("Number of shifts " + i, BigInteger.ONE,
+          element.shiftRightSmall(i).toBigInteger());
+    }
+    assertEquals(new BigInteger("12312"),
+        new CompUInt128(new BigInteger("12312")).shiftRightSmall(0).toBigInteger());
+    assertEquals(new BigInteger("12312"),
+        new CompUInt128(new BigInteger("12312")).shiftRightSmall(-1).toBigInteger());
+  }
+
   @Test
   public void testToBit() {
     assertEquals(BigInteger.ZERO, new CompUInt128(0).toBitRep().toBigInteger());

From 80b11f84a0b6bbe0e42cec94517f9731779d31bd Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 15 Jun 2018 12:55:09 +0200
Subject: [PATCH 156/231] Truncation pairs

---
 .../util/ArithmeticDummyDataSupplier.java     | 13 +++++
 .../framework/util/TruncationPairShares.java  | 29 ++++++++++
 .../util/TestArithmeticDummyDataSupplier.java | 54 +++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/framework/util/TruncationPairShares.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
index 94eaee2f7..20224031e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
@@ -71,6 +71,19 @@ public MultiplicationTripleShares getMultiplicationBitTripleShares() {
     );
   }
 
+  /**
+   * Computes pair of values r and r^{prime} such that r^{prime} is a random element and r =
+   * r^{prime} / 2^{d}, i.e., r right-shifted by d.
+   */
+  public TruncationPairShares getTruncationPairShares(int d) {
+    BigInteger rPrime = sampleRandomBigInteger();
+    BigInteger r = rPrime.shiftRight(d);
+    return new TruncationPairShares(
+        new Pair<>(rPrime, sharer.share(rPrime, noOfParties).get(myId - 1)),
+        new Pair<>(r, sharer.share(r, noOfParties).get(myId - 1))
+    );
+  }
+
   /**
    * Constructs an exponentiation pipe. <p>An exponentiation pipe is a list of numbers in the
    * following format: r^{-1}, r, r^{2}, r^{3}, ..., r^{expPipeLength}, where r is a random element
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/TruncationPairShares.java b/core/src/main/java/dk/alexandra/fresco/framework/util/TruncationPairShares.java
new file mode 100644
index 000000000..a413aa205
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/TruncationPairShares.java
@@ -0,0 +1,29 @@
+package dk.alexandra.fresco.framework.util;
+
+import java.math.BigInteger;
+
+/**
+ * Generic representation of a truncation pair. <p> A truncation pair is pre-processing material
+ * used for probabilistic truncation. A truncation pair consists of a value r and r^{prime} such
+ * that r^{prime} is a random element and r = r^{prime} / 2^{d}, i.e., r right-shifted by d.</p>
+ */
+public class TruncationPairShares {
+
+  private final Pair<BigInteger, BigInteger> rPrime;
+  private final Pair<BigInteger, BigInteger> r;
+
+  public TruncationPairShares(Pair<BigInteger, BigInteger> rPrime,
+      Pair<BigInteger, BigInteger> r) {
+    this.rPrime = rPrime;
+    this.r = r;
+  }
+
+  public Pair<BigInteger, BigInteger> getR() {
+    return r;
+  }
+
+  public Pair<BigInteger, BigInteger> getRPrime() {
+    return rPrime;
+  }
+
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/framework/util/TestArithmeticDummyDataSupplier.java b/core/src/test/java/dk/alexandra/fresco/framework/util/TestArithmeticDummyDataSupplier.java
index 22102f8b9..08efddf3d 100644
--- a/core/src/test/java/dk/alexandra/fresco/framework/util/TestArithmeticDummyDataSupplier.java
+++ b/core/src/test/java/dk/alexandra/fresco/framework/util/TestArithmeticDummyDataSupplier.java
@@ -123,6 +123,24 @@ private void testGetExpPipe(int noOfParties) {
     }
   }
 
+  private void testGetTruncationPairShares(int noOfParties, BigInteger modulus) {
+    List<ArithmeticDummyDataSupplier> suppliers = new ArrayList<>(noOfParties);
+    for (int i = 0; i < noOfParties; i++) {
+      suppliers.add(new ArithmeticDummyDataSupplier(i + 1, noOfParties, modulus));
+    }
+    List<TruncationPairShares> actual = new ArrayList<>();
+    for (ArithmeticDummyDataSupplier supplier : suppliers) {
+      actual.add(supplier.getTruncationPairShares(modulus.bitLength() / 2));
+    }
+    assertTruncationPairValid(actual, modulus, modulus.bitLength() / 2);
+  }
+
+  private void testGetTruncationPairShares(int noOfParties) {
+    for (BigInteger modulus : moduli) {
+      testGetTruncationPairShares(noOfParties, modulus);
+    }
+  }
+
   @Test
   public void testGetRandomElementShareTwoParties() {
     testGetRandomElementShare(2);
@@ -175,6 +193,13 @@ public void testGetExpPipes() {
     testGetExpPipe(5);
   }
 
+  @Test
+  public void testGetTruncationPairShares() {
+    testGetTruncationPairShares(2);
+    testGetTruncationPairShares(3);
+    testGetTruncationPairShares(5);
+  }
+
   @Test
   public void testBitsNotAllSame() {
     int noOfParties = 2;
@@ -280,4 +305,33 @@ private void assertMultiplicationTriplesValid(List<MultiplicationTripleShares> t
     assertAllDifferent(productShares);
   }
 
+  private void assertTruncationPairValid(List<TruncationPairShares> pairs,
+      BigInteger modulus, int d) {
+    List<BigInteger> pPrimeValues = new ArrayList<>(pairs.size());
+    List<BigInteger> rPrimeShares = new ArrayList<>(pairs.size());
+    List<BigInteger> rValues = new ArrayList<>(pairs.size());
+    List<BigInteger> rShares = new ArrayList<>(pairs.size());
+    for (TruncationPairShares pair : pairs) {
+      Pair<BigInteger, BigInteger> rPrime = pair.getRPrime();
+      Pair<BigInteger, BigInteger> r = pair.getR();
+      pPrimeValues.add(rPrime.getFirst());
+      rPrimeShares.add(rPrime.getSecond());
+      rValues.add(r.getFirst());
+      rShares.add(r.getSecond());
+    }
+    // sizes are the same
+    assertEquals(rValues.size(), pPrimeValues.size());
+    // r = r^{prime} >> d
+    for (int i = 0; i < pPrimeValues.size(); i++) {
+      assertEquals(rValues.get(i), pPrimeValues.get(i).shiftRight(d));
+    }
+    // all left values the same; left = recombine([left]); all left shares different
+    pPrimeValues.add(MathUtils.sum(rPrimeShares, modulus));
+    assertAllEqual(pPrimeValues);
+    assertAllDifferent(rPrimeShares);
+    rValues.add(MathUtils.sum(rShares, modulus));
+    assertAllEqual(rValues);
+    assertAllDifferent(rShares);
+  }
+
 }

From 019392611fd74bcc9dcb1a20ba6f51fb89462fbf Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 15 Jun 2018 15:13:33 +0200
Subject: [PATCH 157/231] WIP spdz2k truncation

---
 .../builder/numeric/AdvancedNumeric.java      | 21 ++++++++++----
 .../numeric/DefaultAdvancedNumeric.java       | 10 +++++--
 .../suite/spdz2k/Spdz2kAdvancedNumeric.java   | 24 +++++++++++++++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 10 +++++--
 .../suite/spdz2k/Spdz2kProtocolSuite.java     |  4 +--
 .../datatypes/Spdz2kTruncationPair.java       | 26 +++++++++++++++++
 .../computations/CoinTossingComputation.java  |  2 +-
 ....java => CommitmentComputationSpdz2k.java} |  4 +--
 ...ation.java => InputComputationSpdz2k.java} |  4 +--
 ...on.java => MacCheckComputationSpdz2k.java} |  8 ++---
 .../computations/advanced/TruncateSpdz2k.java | 29 +++++++++++++++++++
 .../natives/Spdz2kInputOnlyProtocol.java      |  3 +-
 .../resource/storage/Spdz2kDataSupplier.java  | 10 ++++++-
 .../storage/Spdz2kDummyDataSupplier.java      |  8 +++++
 .../Spdz2kRoundSynchronization.java           |  4 +--
 .../TestSpdz2kCommitmentComputation.java      |  2 +-
 16 files changed, 143 insertions(+), 26 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java
 rename suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{Spdz2kCommitmentComputation.java => CommitmentComputationSpdz2k.java} (94%)
 rename suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{Spdz2kInputComputation.java => InputComputationSpdz2k.java} (92%)
 rename suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{Spdz2kMacCheckComputation.java => MacCheckComputationSpdz2k.java} (96%)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
index ed62d8558..01798f5e3 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
@@ -19,8 +19,8 @@ public interface AdvancedNumeric extends ComputationDirectory {
    * Calculates the sum of all elements in the list.
    *
    * @param elements the elements to sum
-   * @return A deferred result computing the sum of the elements
-   * inputs should be wrapped in {@link DRes}, use {@link #sum(DRes)} instead
+   * @return A deferred result computing the sum of the elements inputs should be wrapped in {@link
+   * DRes}, use {@link #sum(DRes)} instead
    */
   @Deprecated
   DRes<SInt> sum(List<DRes<SInt>> elements);
@@ -178,15 +178,24 @@ DRes<SInt> innerProductWithPublicPart(DRes<List<OInt>> vectorA,
   DRes<RandomBitMask> randomBitMask(int noOfBits);
 
   /**
-   * Takes a list of random bits [b0, ..., bn] and generates a random bit mask along with a
-   * {@link SInt} representing the recombined bits, i.e., sum(2^{i} * bi).
+   * Takes a list of random bits [b0, ..., bn] and generates a random bit mask along with a {@link
+   * SInt} representing the recombined bits, i.e., sum(2^{i} * bi).
    *
-   * @param randomBits
-   *          The bits to use for the bit mask
+   * @param randomBits The bits to use for the bit mask
    * @return A container holding the bit mask
    */
   DRes<RandomBitMask> randomBitMask(DRes<List<DRes<SInt>>> randomBits);
 
+  /**
+   * Right-shifts input by {@code shifts}. <p>Note that this is a probabilistic method which may
+   * produce an error in the least-significant bit.</p>
+   *
+   * @param input secret value to right shift
+   * @param shifts number of shifts
+   * @return shifted result
+   */
+  DRes<SInt> truncate(DRes<SInt> input, int shifts);
+
   /**
    * @param input input.
    * @return A deferred result computing input >> 1
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
index 6891c3b93..c42c5030f 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
@@ -25,6 +25,7 @@
 import dk.alexandra.fresco.lib.math.integer.linalg.InnerProductWithOInt;
 import dk.alexandra.fresco.lib.math.integer.log.Logarithm;
 import dk.alexandra.fresco.lib.math.integer.sqrt.SquareRoot;
+import dk.alexandra.fresco.lib.real.fixed.utils.Truncate;
 import java.math.BigInteger;
 import java.util.List;
 
@@ -35,8 +36,8 @@
  */
 public class DefaultAdvancedNumeric implements AdvancedNumeric {
 
-  private final BuilderFactoryNumeric factoryNumeric;
-  private final ProtocolBuilderNumeric builder;
+  protected final BuilderFactoryNumeric factoryNumeric;
+  protected final ProtocolBuilderNumeric builder;
 
   protected DefaultAdvancedNumeric(BuilderFactoryNumeric factoryNumeric,
       ProtocolBuilderNumeric builder) {
@@ -135,6 +136,11 @@ public DRes<RandomBitMask> randomBitMask(DRes<List<DRes<SInt>>> randomBits) {
     return builder.seq(new GenerateRandomBitMask(randomBits));
   }
 
+  @Override
+  public DRes<SInt> truncate(DRes<SInt> input, int shifts) {
+    return builder.seq(new Truncate(input, shifts));
+  }
+
   @Override
   public DRes<SInt> rightShift(DRes<SInt> input) {
     DRes<RightShiftResult> rightShiftResult = builder.seq(
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
new file mode 100644
index 000000000..8ccd81074
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
@@ -0,0 +1,24 @@
+package dk.alexandra.fresco.suite.spdz2k;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.advanced.TruncateSpdz2k;
+
+public class Spdz2kAdvancedNumeric extends DefaultAdvancedNumeric {
+
+  Spdz2kAdvancedNumeric(
+      BuilderFactoryNumeric factoryNumeric,
+      ProtocolBuilderNumeric builder) {
+    super(factoryNumeric, builder);
+  }
+
+  @Override
+  public DRes<SInt> truncate(DRes<SInt> input, int shifts) {
+//    return new Sp
+    return builder.seq(new TruncateSpdz2k<>(input, shifts));
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 8214b70da..fe9a61656 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -1,6 +1,7 @@
 package dk.alexandra.fresco.suite.spdz2k;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
 import dk.alexandra.fresco.framework.builder.numeric.Conversion;
@@ -18,7 +19,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.InputComputationSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultKnownProtocol;
@@ -75,6 +76,11 @@ public Logical createLogical(ProtocolBuilderNumeric builder) {
     }
   }
 
+  @Override
+  public AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
+    return new Spdz2kAdvancedNumeric(this, builder);
+  }
+
   @Override
   public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
@@ -155,7 +161,7 @@ public DRes<SInt> known(BigInteger value) {
       @Override
       public DRes<SInt> input(BigInteger value, int inputParty) {
         return builder.seq(
-            new Spdz2kInputComputation<>(factory.createFromBigInteger(value), inputParty)
+            new InputComputationSpdz2k<>(factory.createFromBigInteger(value), inputParty)
         );
       }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
index 3e3bd35e2..3d63faf49 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
@@ -7,7 +7,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.MacCheckComputationSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.synchronization.Spdz2kRoundSynchronization;
 
@@ -17,7 +17,7 @@
  * HighT} and {@link LowT}, i.e., a most significant bit portion and a least significant bit
  * portion. The least-significant bit portion is used to store the actual value (or secret-share
  * thereof) we are computing on. The most-significant bit portion is required for security and is
- * used in the mac-check protocol implemented in {@link Spdz2kMacCheckComputation}.</p>
+ * used in the mac-check protocol implemented in {@link MacCheckComputationSpdz2k}.</p>
  *
  * @param <HighT> type representing most significant bit portion of open values
  * @param <LowT> type representing least significant bit portion of open values
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java
new file mode 100644
index 000000000..92ae92cb4
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java
@@ -0,0 +1,26 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+/**
+ * Sdpz2k representation of a truncation pair. <p> A truncation pair is pre-processing material
+ * used for probabilistic truncation. A truncation pair consists of a value r and r^{prime} such
+ * that r^{prime} is a random element and r = r^{prime} / 2^{d}, i.e., r right-shifted by d.</p>
+ */
+public class Spdz2kTruncationPair<PlainT extends CompUInt<?, ?, PlainT>> {
+  private final Spdz2kSIntArithmetic<PlainT> rPrime;
+  private final Spdz2kSIntArithmetic<PlainT> r;
+
+  public Spdz2kTruncationPair(
+      Spdz2kSIntArithmetic<PlainT> rPrime,
+      Spdz2kSIntArithmetic<PlainT> r) {
+    this.rPrime = rPrime;
+    this.r = r;
+  }
+
+  public Spdz2kSIntArithmetic<PlainT> getR() {
+    return r;
+  }
+
+  public Spdz2kSIntArithmetic<PlainT> getRPrime() {
+    return rPrime;
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CoinTossingComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CoinTossingComputation.java
index 0daea842c..b0bb7ddb0 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CoinTossingComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CoinTossingComputation.java
@@ -35,7 +35,7 @@ public CoinTossingComputation(int seedLength, ByteSerializer<HashBasedCommitment
 
   @Override
   public DRes<byte[]> buildComputation(ProtocolBuilderNumeric builder) {
-    return builder.seq(new Spdz2kCommitmentComputation(serializer, ownSeed, noOfParties, localDrbg))
+    return builder.seq(new CommitmentComputationSpdz2k(serializer, ownSeed, noOfParties, localDrbg))
         .seq((seq, seeds) -> {
           byte[] jointSeed = new byte[ownSeed.length];
           for (byte[] seed : seeds) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kCommitmentComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CommitmentComputationSpdz2k.java
similarity index 94%
rename from suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kCommitmentComputation.java
rename to suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CommitmentComputationSpdz2k.java
index d263e79e8..16f7d3b62 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kCommitmentComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CommitmentComputationSpdz2k.java
@@ -13,7 +13,7 @@
 /**
  * Protocol for all parties to commit to a value and open it to the other parties.
  */
-public class Spdz2kCommitmentComputation implements
+public class CommitmentComputationSpdz2k implements
     Computation<List<byte[]>, ProtocolBuilderNumeric> {
 
   private final ByteSerializer<HashBasedCommitment> commitmentSerializer;
@@ -21,7 +21,7 @@ public class Spdz2kCommitmentComputation implements
   private final int noOfParties;
   private final Drbg localDrbg;
 
-  public Spdz2kCommitmentComputation(ByteSerializer<HashBasedCommitment> commitmentSerializer,
+  public CommitmentComputationSpdz2k(ByteSerializer<HashBasedCommitment> commitmentSerializer,
       byte[] value, int noOfParties, Drbg localDrbg) {
     this.commitmentSerializer = commitmentSerializer;
     this.value = value;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kInputComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/InputComputationSpdz2k.java
similarity index 92%
rename from suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kInputComputation.java
rename to suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/InputComputationSpdz2k.java
index 0f89672bc..743479ea2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kInputComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/InputComputationSpdz2k.java
@@ -16,13 +16,13 @@
  * validation of the bytes of the masked input (if more than two parties are carrying out the
  * computation).</p>
  */
-public class Spdz2kInputComputation<PlainT extends CompUInt<?, ?, PlainT>> implements
+public class InputComputationSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
     Computation<SInt, ProtocolBuilderNumeric> {
 
   private final PlainT input;
   private final int inputPartyId;
 
-  public Spdz2kInputComputation(PlainT input, int inputPartyId) {
+  public InputComputationSpdz2k(PlainT input, int inputPartyId) {
     this.inputPartyId = inputPartyId;
     this.input = input;
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
similarity index 96%
rename from suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
rename to suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
index 9b6ba172a..2ebfb9e97 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
@@ -22,7 +22,7 @@
 /**
  * Computation for performing batched mac-check on all currently opened, unchecked values.
  */
-public class Spdz2kMacCheckComputation<
+public class MacCheckComputationSpdz2k<
     HighT extends UInt<HighT>,
     LowT extends UInt<LowT>,
     PlainT extends CompUInt<HighT, LowT, PlainT>>
@@ -39,14 +39,14 @@ public class Spdz2kMacCheckComputation<
   private final Drbg localDrbg;
 
   /**
-   * Creates new {@link Spdz2kMacCheckComputation}.
+   * Creates new {@link MacCheckComputationSpdz2k}.
    *
    * @param toCheck authenticated elements and open values that must be checked
    * @param resourcePool resources for running Spdz2k
    * @param converter utility class for converting between {@link HighT} and {@link PlainT}, {@link
    * LowT} and {@link PlainT}
    */
-  public Spdz2kMacCheckComputation(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<PlainT>> toCheck,
+  public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<PlainT>> toCheck,
       Spdz2kResourcePool<PlainT> resourcePool,
       CompUIntConverter<HighT, LowT, PlainT> converter) {
     this.authenticatedElements = toCheck.getFirst();
@@ -130,7 +130,7 @@ private DRes<List<byte[]>> computeZValues(ProtocolBuilderNumeric builder,
         .subtract(mj)
         .subtract(p.multiply(macKeyShare).shiftLowIntoHigh())
         .add(r.getMacShare().shiftLowIntoHigh());
-    return new Spdz2kCommitmentComputation(commitmentSerializer, serializer.serialize(zj),
+    return new CommitmentComputationSpdz2k(commitmentSerializer, serializer.serialize(zj),
         noOfParties, localDrbg).buildComputation(builder);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
new file mode 100644
index 000000000..74e63803f
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
@@ -0,0 +1,29 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations.advanced;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+
+/**
+ * Probabilistic truncation protocol.
+ *
+ * Described by Mohassel and Rindal in https://eprint.iacr.org/2018/403.pdf (Figure 3).
+ */
+public class TruncateSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
+    Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<SInt> value;
+  private final int d;
+
+  public TruncateSpdz2k(DRes<SInt> value, int d) {
+    this.value = value;
+    this.d = d;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    return null;
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java
index 6c4f56228..441a1892d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kInputOnlyProtocol.java
@@ -9,12 +9,13 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.InputComputationSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
 
 /**
  * Native protocol for inputting data. <p>This is used by native computation {@link
- * dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kInputComputation}. The result of
+ * InputComputationSpdz2k}. The result of
  * this protocol is this party's share of the input, as well as the bytes of the masked input which
  * are later used in a broadcast validation.</p>
  */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
index da9698c88..9ff7ef08a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
@@ -5,6 +5,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
 
 /**
  * Interface for a supplier of pre-processing material. <p>Material includes random elements shares,
@@ -45,8 +46,15 @@ public interface Spdz2kDataSupplier<T extends CompUInt<?, ?, T>> {
   T getSecretSharedKey();
 
   /**
-   * Returns the next random field element.
+   * Supplies the next random field element.
    */
   Spdz2kSIntArithmetic<T> getNextRandomElementShare();
 
+  /**
+   * Supplies the next truncation pair (r^{prime}, r) where r = r^{prime} / 2^{d}.
+   *
+   * @param d number of shifts
+   */
+  Spdz2kTruncationPair<T> getNextTruncationPair(int d);
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index 471aed69f..159fc1440 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -3,12 +3,14 @@
 import dk.alexandra.fresco.framework.util.ArithmeticDummyDataSupplier;
 import dk.alexandra.fresco.framework.util.MultiplicationTripleShares;
 import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.TruncationPairShares;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
 import java.math.BigInteger;
 
 /**
@@ -77,6 +79,12 @@ public Spdz2kSIntArithmetic<PlainT> getNextRandomElementShare() {
     return toSpdz2kSInt(supplier.getRandomElementShare());
   }
 
+  @Override
+  public Spdz2kTruncationPair<PlainT> getNextTruncationPair(int d) {
+    TruncationPairShares pair = supplier.getTruncationPairShares(d);
+    return new Spdz2kTruncationPair<>(toSpdz2kSInt(pair.getRPrime()), toSpdz2kSInt(pair.getR()));
+  }
+
   private Spdz2kSIntArithmetic<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> raw) {
     PlainT openValue = factory.createFromBigInteger(raw.getFirst());
     PlainT share = factory.createFromBigInteger(raw.getSecond());
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 83fbe28ee..726336062 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -14,7 +14,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.MacCheckComputationSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.RequiresMacCheck;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.stream.StreamSupport;
@@ -60,7 +60,7 @@ private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network
         protocolSuite,
         batchSize);
     OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
-    Spdz2kMacCheckComputation<HighT, LowT, PlainT> macCheck = new Spdz2kMacCheckComputation<>(
+    MacCheckComputationSpdz2k<HighT, LowT, PlainT> macCheck = new MacCheckComputationSpdz2k<>(
         store.popValues(),
         resourcePool, converter);
     ProtocolBuilderNumeric sequential = builder.createSequential();
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kCommitmentComputation.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kCommitmentComputation.java
index b3e83b6a4..d3c7f9357 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kCommitmentComputation.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kCommitmentComputation.java
@@ -76,7 +76,7 @@ public void test() {
             inputs.add(bytes);
           }
           Application<List<byte[]>, ProtocolBuilderNumeric> testApplication =
-              root -> new Spdz2kCommitmentComputation(
+              root -> new CommitmentComputationSpdz2k(
                   conf.getResourcePool().getCommitmentSerializer(),
                   inputs.get(root.getBasicNumericContext().getMyId() - 1), noParties,
                   conf.getResourcePool().getLocalRandomGenerator())

From 15e16c2e5a919ea839c148bbd0cd380b5724e0b9 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Sun, 17 Jun 2018 17:39:46 +0200
Subject: [PATCH 158/231] Renaming

---
 ...va => TestBroadcastComputationSpdz2k.java} |  2 +-
 ...a => TestCommitmentComputationSpdz2k.java} |  2 +-
 ...parison.java => TestComparisonSpdz2k.java} |  2 +-
 ...version.java => TestConversionSpdz2k.java} |  2 +-
 ....java => TestLogicalOperationsSpdz2k.java} |  2 +-
 ...ava => TestMacCheckComputationSpdz2k.java} |  2 +-
 .../computations/TestTruncateSpdz2k.java      | 80 +++++++++++++++++++
 7 files changed, 86 insertions(+), 6 deletions(-)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{TestSpdz2kBroadcastComputation.java => TestBroadcastComputationSpdz2k.java} (99%)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{TestSpdz2kCommitmentComputation.java => TestCommitmentComputationSpdz2k.java} (98%)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{TestSpdz2kComparison.java => TestComparisonSpdz2k.java} (99%)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{TestSpdz2kConversion.java => TestConversionSpdz2k.java} (99%)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{TestSpdz2kLogicalOperations.java => TestLogicalOperationsSpdz2k.java} (99%)
 rename suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{TestSpdz2kMacCheckComputation.java => TestMacCheckComputationSpdz2k.java} (98%)
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java

diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kBroadcastComputation.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestBroadcastComputationSpdz2k.java
similarity index 99%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kBroadcastComputation.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestBroadcastComputationSpdz2k.java
index 0fbac54ca..a8da81540 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kBroadcastComputation.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestBroadcastComputationSpdz2k.java
@@ -35,7 +35,7 @@
 import java.util.stream.Collectors;
 import org.junit.Test;
 
-public class TestSpdz2kBroadcastComputation extends
+public class TestBroadcastComputationSpdz2k extends
     AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kCommitmentComputation.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestCommitmentComputationSpdz2k.java
similarity index 98%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kCommitmentComputation.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestCommitmentComputationSpdz2k.java
index d3c7f9357..d7616a2fa 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kCommitmentComputation.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestCommitmentComputationSpdz2k.java
@@ -26,7 +26,7 @@
 import java.util.function.Supplier;
 import org.junit.Test;
 
-public class TestSpdz2kCommitmentComputation extends
+public class TestCommitmentComputationSpdz2k extends
     AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestComparisonSpdz2k.java
similarity index 99%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestComparisonSpdz2k.java
index cdb20fcce..640bcfd15 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kComparison.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestComparisonSpdz2k.java
@@ -37,7 +37,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class TestSpdz2kComparison extends
+public class TestComparisonSpdz2k extends
     AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestConversionSpdz2k.java
similarity index 99%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestConversionSpdz2k.java
index 6f126fb57..0320f34d0 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kConversion.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestConversionSpdz2k.java
@@ -30,7 +30,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class TestSpdz2kConversion extends
+public class TestConversionSpdz2k extends
     AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
similarity index 99%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
index 78cafd424..52809aa6d 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kLogicalOperations.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
@@ -32,7 +32,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class TestSpdz2kLogicalOperations extends
+public class TestLogicalOperationsSpdz2k extends
     AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kMacCheckComputation.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestMacCheckComputationSpdz2k.java
similarity index 98%
rename from suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kMacCheckComputation.java
rename to suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestMacCheckComputationSpdz2k.java
index 00335627a..2c617919e 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestSpdz2kMacCheckComputation.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestMacCheckComputationSpdz2k.java
@@ -28,7 +28,7 @@
 import java.util.function.Supplier;
 import org.junit.Test;
 
-public class TestSpdz2kMacCheckComputation extends
+public class TestMacCheckComputationSpdz2k extends
     AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
new file mode 100644
index 000000000..4716a71c8
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
@@ -0,0 +1,80 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
+import dk.alexandra.fresco.suite.spdz2k.AbstractSpdz2kTest;
+import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
+import java.math.BigInteger;
+import java.util.function.Supplier;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestTruncateSpdz2k extends
+    AbstractSpdz2kTest<Spdz2kResourcePool<CompUInt128>> {
+
+  @Override
+  protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
+      Supplier<Network> networkSupplier) {
+    CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+    CompUInt128 keyShare = factory.createRandom();
+    Spdz2kResourcePool<CompUInt128> resourcePool =
+        new Spdz2kResourcePoolImpl<>(
+            playerId,
+            noOfParties, new AesCtrDrbg(new byte[32]),
+            new Spdz2kOpenedValueStoreImpl<>(),
+            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, keyShare, factory),
+            factory);
+    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
+    return resourcePool;
+  }
+
+  @Override
+  protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSuite() {
+    return new Spdz2kProtocolSuite128(true);
+  }
+
+  @Test
+  public void testTruncate() {
+    runTest(new TestTruncate<>(), EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
+  }
+
+  public static class TestTruncate<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() {
+          final BigInteger input = BigInteger.valueOf(723121121381238012L);
+          Application<BigInteger, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<SInt> left = root.numeric().input(input, 1);
+                DRes<SInt> shifted = root.advancedNumeric().truncate(left, 42);
+                return root.numeric().open(shifted);
+              };
+          BigInteger actual = runApplication(app);
+          Assert.assertEquals(input.shiftRight(42).mod(BigInteger.ONE.shiftLeft(42)), actual);
+        }
+      };
+    }
+  }
+}

From f1762a77edbd94f681a601839487cbbfe84a78c9 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Sun, 17 Jun 2018 17:40:13 +0200
Subject: [PATCH 159/231] Spdz2k truncation fix

---
 .../util/ArithmeticDummyDataSupplier.java     | 11 +++++--
 .../suite/spdz2k/Spdz2kAdvancedNumeric.java   | 12 ++++++--
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  2 +-
 .../suite/spdz2k/datatypes/CompUInt.java      |  6 ++++
 .../suite/spdz2k/datatypes/CompUInt128.java   | 29 +++++++++++++++++++
 .../computations/advanced/TruncateSpdz2k.java | 22 ++++++++++++--
 .../natives/Spdz2kTruncationPairProtocol.java | 29 +++++++++++++++++++
 .../storage/Spdz2kDummyDataSupplier.java      |  7 +++--
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  | 12 ++++----
 .../spdz2k/datatypes/TestCompUInt128.java     |  9 +++++-
 10 files changed, 122 insertions(+), 17 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
index 20224031e..284df1594 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
@@ -17,19 +17,26 @@ public class ArithmeticDummyDataSupplier {
   private final int myId;
   private final int noOfParties;
   private final BigInteger modulus;
+  private final BigInteger maxOpenValue;
   private final int modBitLength;
   private final Random random;
   private final SecretSharer<BigInteger> sharer;
 
-  public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus) {
+  public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus,
+      BigInteger maxOpenValue) {
     this.myId = myId;
     this.noOfParties = noOfParties;
     this.modulus = modulus;
+    this.maxOpenValue = maxOpenValue;
     this.modBitLength = modulus.bitLength();
     random = new Random(42);
     sharer = new DummyBigIntegerSharer(modulus, random);
   }
 
+  public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus) {
+    this(myId, noOfParties, modulus, modulus);
+  }
+
   /**
    * Computes the next random element and this party's share.
    */
@@ -97,7 +104,7 @@ public List<Pair<BigInteger, BigInteger>> getExpPipe(int expPipeLength) {
   }
 
   private BigInteger sampleRandomBigInteger() {
-    return new BigInteger(modBitLength, random).mod(modulus);
+    return new BigInteger(modBitLength, random).mod(maxOpenValue);
   }
 
   private List<BigInteger> getOpenExpPipe(int expPipeLength) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
index 8ccd81074..8c93667e2 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
@@ -5,20 +5,26 @@
 import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.advanced.TruncateSpdz2k;
 
-public class Spdz2kAdvancedNumeric extends DefaultAdvancedNumeric {
+public class Spdz2kAdvancedNumeric<PlainT extends CompUInt<?, ?, PlainT>>  extends DefaultAdvancedNumeric {
+
+  private final CompUIntFactory<PlainT> compUIntFactory;
 
   Spdz2kAdvancedNumeric(
       BuilderFactoryNumeric factoryNumeric,
-      ProtocolBuilderNumeric builder) {
+      ProtocolBuilderNumeric builder,
+      CompUIntFactory<PlainT> compUIntFactory) {
     super(factoryNumeric, builder);
+    this.compUIntFactory = compUIntFactory;
   }
 
   @Override
   public DRes<SInt> truncate(DRes<SInt> input, int shifts) {
 //    return new Sp
-    return builder.seq(new TruncateSpdz2k<>(input, shifts));
+    return builder.seq(new TruncateSpdz2k<>(input, shifts, compUIntFactory));
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index fe9a61656..01032ce43 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -78,7 +78,7 @@ public Logical createLogical(ProtocolBuilderNumeric builder) {
 
   @Override
   public AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
-    return new Spdz2kAdvancedNumeric(this, builder);
+    return new Spdz2kAdvancedNumeric<>(this, builder, factory);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 213d5afff..470c945b5 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -40,6 +40,12 @@ public interface CompUInt<
    */
   CompT shiftRightSmall(int n);
 
+  /**
+   * Signed right shift by n bits where n < k in the least significant bits only. <p>NOTE: this
+   * performs sign extension and only affects least significant bits.</p>
+   */
+  CompT shiftRightLowOnly(int n);
+
   /**
    * Left-shift the k least significant bits by k.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 6811ff2cf..8704fdbcb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -126,6 +126,14 @@ public CompUInt128 multiply(CompUInt128 other) {
 
   @Override
   public CompUInt128 subtract(CompUInt128 other) {
+//    long newLow = Integer.toUnsignedLong(this.low) - Integer.toUnsignedLong(other.low);
+//    long lowOverflow = newLow >>> 32;
+//    long newMid = Integer.toUnsignedLong(this.mid)
+//        - Integer.toUnsignedLong(other.mid)
+//        - lowOverflow;
+//    long midOverflow = newMid >>> 32;
+//    long newHigh = this.high - other.high - midOverflow;
+//    return new CompUInt128(newHigh, (int) newMid, (int) newLow);
     return this.add(other.negate());
   }
 
@@ -161,6 +169,10 @@ public UInt64 getLeastSignificantAsHigh() {
 
   @Override
   public CompUInt128 shiftLeftSmall(int n) {
+    if (n >= Long.SIZE) {
+      throw new IllegalArgumentException(
+          "Shift step must be less than " + Long.SIZE + " but was " + n);
+    }
     if (n <= 0) {
       return this;
     }
@@ -173,6 +185,10 @@ public CompUInt128 shiftLeftSmall(int n) {
 
   @Override
   public CompUInt128 shiftRightSmall(int n) {
+    if (n >= Long.SIZE) {
+      throw new IllegalArgumentException(
+          "Shift step must be less than " + Long.SIZE + " but was " + n);
+    }
     if (n <= 0) {
       return this;
     }
@@ -183,6 +199,19 @@ public CompUInt128 shiftRightSmall(int n) {
     return new CompUInt128(newHigh, (int) (midAndLowShifted >>> 32), (int) midAndLowShifted);
   }
 
+  @Override
+  public CompUInt128 shiftRightLowOnly(int n) {
+    if (n >= Long.SIZE) {
+      throw new IllegalArgumentException(
+          "Shift step must be less than " + Long.SIZE + " but was " + n);
+    }
+    if (n <= 0) {
+      return this;
+    }
+    long midAndLow = ((UInt.toUnLong(mid) << 32) | UInt.toUnLong(low)) >> n;
+    return new CompUInt128(high, (int) (midAndLow >>> 32), (int) midAndLow);
+  }
+
   @Override
   public long toLong() {
     return (UInt.toUnLong(this.mid) << 32) + UInt.toUnLong(this.low);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
index 74e63803f..3505ea61f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
@@ -5,6 +5,9 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kTruncationPairProtocol;
 
 /**
  * Probabilistic truncation protocol.
@@ -16,14 +19,29 @@ public class TruncateSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
 
   private final DRes<SInt> value;
   private final int d;
+  private final CompUIntFactory<PlainT> factory;
 
-  public TruncateSpdz2k(DRes<SInt> value, int d) {
+  public TruncateSpdz2k(DRes<SInt> value, int d,
+      CompUIntFactory<PlainT> factory) {
     this.value = value;
     this.d = d;
+    this.factory = factory;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    return null;
+    DRes<Spdz2kTruncationPair<PlainT>> truncationPairD = builder
+        .append(new Spdz2kTruncationPairProtocol<>(d));
+    // annoying that we need this scope here
+    return builder.seq(seq -> {
+      Spdz2kTruncationPair<PlainT> truncationPair = truncationPairD.out();
+      DRes<SInt> masked = seq.numeric().sub(value, truncationPair.getRPrime());
+      return seq.numeric().openAsOInt(masked);
+    }).seq((seq, openedOInt) -> {
+      PlainT opened = factory.fromOInt(openedOInt);
+      PlainT shifted = opened.shiftRightLowOnly(d);
+      DRes<SInt> r = truncationPairD.out().getR();
+      return seq.numeric().addOpen(shifted, r);
+    });
   }
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java
new file mode 100644
index 000000000..c3300cea0
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java
@@ -0,0 +1,29 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+public class Spdz2kTruncationPairProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<Spdz2kTruncationPair<PlainT>, PlainT> {
+
+  private Spdz2kTruncationPair<PlainT> pair;
+  private final int d;
+
+  public Spdz2kTruncationPairProtocol(int d) {
+    this.d = d;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    pair = resourcePool.getDataSupplier().getNextTruncationPair(d);
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public Spdz2kTruncationPair<PlainT> out() {
+    return pair;
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index 159fc1440..0f2633f6d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -31,8 +31,11 @@ public Spdz2kDummyDataSupplier(int myId, int noOfParties, PlainT secretSharedKey
     this.myId = myId;
     this.secretSharedKey = secretSharedKey;
     this.factory = factory;
-    this.supplier = new ArithmeticDummyDataSupplier(myId, noOfParties,
-        BigInteger.ONE.shiftLeft(factory.getCompositeBitLength()));
+    this.supplier = new ArithmeticDummyDataSupplier(
+        myId,
+        noOfParties,
+        BigInteger.ONE.shiftLeft(factory.getCompositeBitLength()),
+        BigInteger.ONE.shiftLeft(factory.getLowBitLength() - 1));
   }
 
   @Override
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 37affcf0d..75be0237f 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -8,12 +8,12 @@
 import dk.alexandra.fresco.lib.compare.CompareTests.TestCompareEQZero;
 import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kComparison.TestBitLessThanOpenSpdz2k;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestAndKnownSpdz2k;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestAndSpdz2k;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestNotSpdz2k;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestOrSpdz2k;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestSpdz2kLogicalOperations.TestXorKnownSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestComparisonSpdz2k.TestBitLessThanOpenSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestAndKnownSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestAndSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestNotSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestOrSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestXorKnownSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import org.junit.Test;
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 102c7b11b..6c2a27161 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -220,6 +220,12 @@ public void testSubtract() {
         new CompUInt128(BigInteger.ONE).subtract(new CompUInt128(two))
             .toBigInteger()
     );
+    assertEquals(
+        new BigInteger("1121381238012").subtract(new BigInteger("10261555690727498232")).mod(twoTo128),
+        new CompUInt128(new BigInteger("1121381238012"))
+            .subtract(new CompUInt128(new BigInteger("10261555690727498232")))
+            .toBigInteger()
+    );
   }
 
   @Test
@@ -345,7 +351,8 @@ public void testShiftRightSmall() {
     new Random(2).nextBytes(bytes);
     CompUInt128 r = new CompUInt128(bytes);
     for (int i = 0; i < 64; i++) {
-      assertEquals("Number of shifts " + i, r.toBigInteger().shiftRight(i).mod(twoTo128).toString(2),
+      assertEquals("Number of shifts " + i,
+          r.toBigInteger().shiftRight(i).mod(twoTo128).toString(2),
           r.shiftRightSmall(i).toBigInteger().toString(2));
     }
     for (int i = 0; i < 64; i++) {

From 03201694a71d3e354212758db9a8745b8442ad25 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Sun, 17 Jun 2018 17:52:22 +0200
Subject: [PATCH 160/231] Right shift low tests

---
 .../suite/spdz2k/datatypes/TestCompUInt128.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 6c2a27161..22b08557a 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -366,6 +366,23 @@ public void testShiftRightSmall() {
         new CompUInt128(new BigInteger("12312")).shiftRightSmall(-1).toBigInteger());
   }
 
+  @Test
+  public void testShiftRightLowOnly() {
+    byte[] bytes = new byte[16];
+    new Random(2).nextBytes(bytes);
+    CompUInt128 r = new CompUInt128(bytes);
+    // top bit 0
+    for (int i = 0; i < 63; i++) {
+      CompUInt128 element = new CompUInt128(1L << i);
+      assertEquals("Number of shifts " + i, BigInteger.ONE,
+          element.shiftRightLowOnly(i).toBigInteger());
+    }
+    // top bit 1
+    CompUInt128 element = new CompUInt128(BigInteger.ONE.shiftLeft(63));
+    assertEquals("Number of shifts " + 63, BigInteger.ONE.shiftLeft(63).negate().shiftRight(63).mod(twoTo64),
+        element.shiftRightLowOnly(63).toBigInteger());
+  }
+
   @Test
   public void testToBit() {
     assertEquals(BigInteger.ZERO, new CompUInt128(0).toBitRep().toBigInteger());

From 8ffbbe21bfd71b5c89a8556ed44e8ab98d7cbaa3 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 18 Jun 2018 13:41:39 +0200
Subject: [PATCH 161/231] WIP non-floating fixed point arithmetic

---
 .../numeric/BuilderFactoryNumeric.java        |   5 +-
 .../fresco/framework/value/OInt.java          |   2 +-
 .../dk/alexandra/fresco/lib/real/OReal.java   |  13 ++
 .../lib/real/fixed/DefaultFixedNumeric.java   | 150 ++++++++++++++++++
 ...ixedNumeric.java => SemiFixedNumeric.java} |   8 +-
 .../lib/real/fixed/TestFixedNumeric.java      |   8 +-
 6 files changed, 175 insertions(+), 11 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/real/OReal.java
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
 rename core/src/main/java/dk/alexandra/fresco/lib/real/fixed/{FixedNumeric.java => SemiFixedNumeric.java} (97%)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
index 51495e548..c586da503 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
@@ -11,8 +11,9 @@
 import dk.alexandra.fresco.lib.real.RealNumeric;
 import dk.alexandra.fresco.lib.real.RealNumericContext;
 import dk.alexandra.fresco.lib.real.fixed.AdvancedFixedNumeric;
+import dk.alexandra.fresco.lib.real.fixed.DefaultFixedNumeric;
 import dk.alexandra.fresco.lib.real.fixed.FixedLinearAlgebra;
-import dk.alexandra.fresco.lib.real.fixed.FixedNumeric;
+import dk.alexandra.fresco.lib.real.fixed.SemiFixedNumeric;
 
 /**
  * The core factory to implement when creating a numeric protocol. Every {@link
@@ -64,7 +65,7 @@ default PreprocessedValues createPreprocessedValues(ProtocolBuilderNumeric build
   }
 
   default RealNumeric createRealNumeric(ProtocolBuilderNumeric builder) {
-    return new FixedNumeric(builder);
+    return new DefaultFixedNumeric(builder);
   }
 
   default AdvancedRealNumeric createAdvancedRealNumeric(ProtocolBuilderNumeric builder) {
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java
index ccf7148a3..04bf81d8c 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OInt.java
@@ -4,7 +4,7 @@
 
 /**
  * Generic interface representing open (public) values. <p>Arithmetic suites must implement this
- * interface. In some case this can just be a wrapper around a {@link java.math.BigInteger},
+ * interface. In some cases this can just be a wrapper around a {@link java.math.BigInteger},
  * however, other suites may choose to rely on more efficient implementations.</p>
  */
 public interface OInt extends DRes<OInt> {
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/OReal.java b/core/src/main/java/dk/alexandra/fresco/lib/real/OReal.java
new file mode 100644
index 000000000..9c903e484
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/OReal.java
@@ -0,0 +1,13 @@
+package dk.alexandra.fresco.lib.real;
+
+import dk.alexandra.fresco.framework.DRes;
+
+/**
+ * Generic interface representing open (public) real values. <p>Arithmetic suites supporting
+ * arithmetic over reals must implement this interface. In some case this can just be a wrapper
+ * around a {@link java.math.BigDecimal}, however, other suites may choose to rely on more efficient
+ * implementations.</p>
+ */
+public interface OReal extends DRes<OReal> {
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
new file mode 100644
index 000000000..8fdf4a9fa
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
@@ -0,0 +1,150 @@
+package dk.alexandra.fresco.lib.real.fixed;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.real.RealNumeric;
+import dk.alexandra.fresco.lib.real.SReal;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+
+/**
+ * An implementation of the {@link RealNumeric} ComputationDirectory based on a fixed point
+ * representation of real numbers.
+ */
+public class DefaultFixedNumeric implements RealNumeric {
+
+  protected final ProtocolBuilderNumeric builder;
+  // TODO these should be cached static fields
+  private final int precision;
+  private final BigInteger scalingFactor;
+  private final BigDecimal scalingFactorDecimal;
+
+  public DefaultFixedNumeric(ProtocolBuilderNumeric builder, int precision) {
+    this.builder = builder;
+    this.precision = precision;
+    this.scalingFactor = BigInteger.ONE.shiftLeft(precision);
+    this.scalingFactorDecimal = new BigDecimal(scalingFactor);
+  }
+
+  public DefaultFixedNumeric(ProtocolBuilderNumeric builder) {
+    this(builder, builder.getRealNumericContext().getPrecision());
+  }
+
+  private BigInteger unscaled(BigDecimal value) {
+    // TODO extremely inefficient
+    return value.multiply(scalingFactorDecimal).setScale(0, RoundingMode.HALF_UP)
+        .toBigIntegerExact();
+  }
+
+  private BigDecimal scaled(BigInteger value) {
+    // TODO extremely inefficient
+    return new BigDecimal(value).setScale(precision).divide(scalingFactorDecimal,
+        RoundingMode.HALF_UP);
+  }
+
+  @Override
+  public DRes<SReal> add(DRes<SReal> a, DRes<SReal> b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> add(BigDecimal a, DRes<SReal> b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> sub(DRes<SReal> a, DRes<SReal> b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> sub(BigDecimal a, DRes<SReal> b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> sub(DRes<SReal> a, BigDecimal b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> mult(DRes<SReal> a, DRes<SReal> b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> mult(BigDecimal a, DRes<SReal> b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> div(DRes<SReal> a, DRes<SReal> b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> div(DRes<SReal> a, BigDecimal b) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> known(BigDecimal value) {
+    return builder.seq(seq -> {
+      DRes<SInt> input = seq.numeric().known(unscaled(value));
+      return new SFixed(input, precision);
+    });
+  }
+
+  @Override
+  public DRes<SReal> fromSInt(DRes<SInt> value) {
+    return null;
+  }
+
+  @Override
+  public DRes<SReal> input(BigDecimal value, int inputParty) {
+    return builder.seq(seq -> {
+      BigInteger unscaled = (value != null) ? unscaled(value) : null;
+      DRes<SInt> input = seq.numeric().input(unscaled, inputParty);
+      return new SFixed(input, precision);
+    });
+  }
+
+  @Override
+  public DRes<BigDecimal> open(DRes<SReal> secretShare) {
+    return builder.seq(seq -> {
+      SFixed floatX = (SFixed) secretShare.out();
+      DRes<SInt> unscaled = floatX.getSInt();
+      return seq.numeric().open(unscaled);
+    }).seq((seq, unscaled) -> {
+      // new scope to avoid scaling in lambda (since that would be recalculated every time value.out
+      // is called)
+      BigDecimal scaled = scaled(unscaled);
+      return () -> scaled;
+    });
+  }
+
+  @Override
+  public DRes<BigDecimal> open(DRes<SReal> secretShare, int outputParty) {
+    return builder.seq(seq -> {
+      SFixed floatX = (SFixed) secretShare.out();
+      DRes<SInt> unscaled = floatX.getSInt();
+      return seq.numeric().open(unscaled, outputParty);
+    }).seq((seq, unscaled) -> {
+      // new scope to avoid scaling in lambda (since that would be recalculated every time value.out
+      // is called)
+      if (unscaled != null) {
+        BigDecimal scaled = scaled(unscaled);
+        return () -> scaled;
+      } else {
+        return null;
+      }
+    });
+  }
+
+  @Override
+  public DRes<SInt> leq(DRes<SReal> x, DRes<SReal> y) {
+    return null;
+  }
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/FixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/SemiFixedNumeric.java
similarity index 97%
rename from core/src/main/java/dk/alexandra/fresco/lib/real/fixed/FixedNumeric.java
rename to core/src/main/java/dk/alexandra/fresco/lib/real/fixed/SemiFixedNumeric.java
index eb96df02e..8af6c99a3 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/FixedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/SemiFixedNumeric.java
@@ -13,9 +13,9 @@
 
 /**
  * An implementation of the {@link RealNumeric} ComputationDirectory based on a fixed point
- * representation of real numbers.
+ * representation of real numbers. <p>This class uses a semi-floating precision point.</p>
  */
-public class FixedNumeric implements RealNumeric {
+public class SemiFixedNumeric implements RealNumeric {
 
   private static final BigInteger BASE = BigInteger.valueOf(2);
   private final int defaultPrecision;
@@ -30,7 +30,7 @@ public class FixedNumeric implements RealNumeric {
    * @param precision the precision used for the fixed point numbers. The precision must be in the
    *        range <i>0 ... <code>builder.getMaxBitLength</code> / 4</i>.
    */
-  public FixedNumeric(ProtocolBuilderNumeric builder, int precision) {
+  public SemiFixedNumeric(ProtocolBuilderNumeric builder, int precision) {
     this.builder = builder;
     this.defaultPrecision = precision;
     /*
@@ -45,7 +45,7 @@ public FixedNumeric(ProtocolBuilderNumeric builder, int precision) {
     }
   }
 
-  public FixedNumeric(ProtocolBuilderNumeric builder) {
+  public SemiFixedNumeric(ProtocolBuilderNumeric builder) {
     this(builder, builder.getRealNumericContext().getPrecision());
   }
 
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/fixed/TestFixedNumeric.java b/core/src/test/java/dk/alexandra/fresco/lib/real/fixed/TestFixedNumeric.java
index de909a80f..a376e4b1c 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/fixed/TestFixedNumeric.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/fixed/TestFixedNumeric.java
@@ -14,7 +14,7 @@ public void testFixedNumericLegalPrecision() {
     BuilderFactoryNumeric bfn = new DummyArithmeticBuilderFactory(
         new BasicNumericContext(16, BigInteger.TEN, 1, 1),
         new RealNumericContext(0));
-    new FixedNumeric(bfn.createSequential(), 4);
+    new SemiFixedNumeric(bfn.createSequential(), 4);
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -22,7 +22,7 @@ public void testFixedNumericPrecisionTooLarge() {
     BuilderFactoryNumeric bfn = new DummyArithmeticBuilderFactory(
         new BasicNumericContext(16, BigInteger.TEN, 1, 1),
         new RealNumericContext(0));
-    new FixedNumeric(bfn.createSequential(), 5);
+    new SemiFixedNumeric(bfn.createSequential(), 5);
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -30,12 +30,12 @@ public void testFixedNumericPrecisionTooLow() {
     BuilderFactoryNumeric bfn = new DummyArithmeticBuilderFactory(
         new BasicNumericContext(16, BigInteger.TEN, 1, 1),
         new RealNumericContext(0));
-    new FixedNumeric(bfn.createSequential(), -1);
+    new SemiFixedNumeric(bfn.createSequential(), -1);
   }
 
   @Test(expected = NullPointerException.class)
   public void testFixedNumericNullBuilder() {
-    new FixedNumeric(null, -1);
+    new SemiFixedNumeric(null, -1);
   }
 
 }

From f53dd1f4409804aecae7034f56eb69ca5a1bbea5 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 18 Jun 2018 15:11:06 +0200
Subject: [PATCH 162/231] Fixed point mult

---
 .../lib/real/fixed/DefaultFixedNumeric.java   | 14 +++++-
 .../fresco/lib/real/fixed/utils/Truncate.java |  1 +
 .../fresco/lib/real/BasicFixedPointTests.java | 46 +++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     |  3 +-
 .../suite/spdz2k/Spdz2kProtocolSuite.java     |  2 +-
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  |  2 +-
 6 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
index 8fdf4a9fa..e2677349c 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
@@ -46,7 +46,11 @@ private BigDecimal scaled(BigInteger value) {
 
   @Override
   public DRes<SReal> add(DRes<SReal> a, DRes<SReal> b) {
-    return null;
+    return builder.seq(seq -> {
+      SFixed floatA = (SFixed) a.out();
+      SFixed floatB = (SFixed) b.out();
+      return new SFixed(seq.numeric().add(floatA.getSInt(), floatB.getSInt()), precision);
+    });
   }
 
   @Override
@@ -71,7 +75,13 @@ public DRes<SReal> sub(DRes<SReal> a, BigDecimal b) {
 
   @Override
   public DRes<SReal> mult(DRes<SReal> a, DRes<SReal> b) {
-    return null;
+    return builder.seq(seq -> {
+      SFixed floatA = (SFixed) a.out();
+      SFixed floatB = (SFixed) b.out();
+      DRes<SInt> unscaled = seq.numeric().mult(floatA.getSInt(), floatB.getSInt());
+      DRes<SInt> truncated = seq.advancedNumeric().truncate(unscaled, precision);
+      return new SFixed(truncated, precision);
+    });
   }
 
   @Override
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java
index 1aa731b9c..18d55f7ac 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java
@@ -56,6 +56,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric sequential) {
       final DRes<SInt> rBottom = seq.advancedNumeric().innerProductWithPublicPart(
           seq.getBigIntegerHelper().getTwoPowersList(shifts), mask.bits);
 
+      // TODO this should be cached
       BigInteger inverse =
           BigInteger.ONE.shiftLeft(shifts).modInverse(seq.getBasicNumericContext().getModulus());
       DRes<SInt> rTop = seq.numeric().sub(mask.random, rBottom);
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
index 800e87c37..172c984d5 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
@@ -428,6 +428,52 @@ public void test() throws Exception {
   public static class TestMult<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      // TODO not clear if this test makes sense
+      List<BigDecimal> openInputs = Stream
+          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298)
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012)
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                .collect(Collectors.toList());
+
+            List<DRes<SReal>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(producer.realNumeric().mult(inputX, closed2.get(closed1.indexOf(inputX))));
+            }
+
+            List<DRes<BigDecimal>> opened =
+                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+            BigDecimal a = openInputs.get(idx);
+            BigDecimal b = openInputs2.get(idx);
+            RealTestUtils.assertEqual(a.multiply(b), openOutput,
+                DEFAULT_PRECISION - 1 -
+                    Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b))) ;
+          }
+        }
+      };
+    }
+  }
+
+  public static class TestMultSemiFloating<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
       List<BigDecimal> openInputs = Stream
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 54999aed2..b299ecba9 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -54,6 +54,7 @@
 import dk.alexandra.fresco.lib.math.integer.stat.StatisticsTests;
 import dk.alexandra.fresco.lib.math.polynomial.PolynomialTests;
 import dk.alexandra.fresco.lib.real.BasicFixedPointTests;
+import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMult;
 import dk.alexandra.fresco.lib.real.LinearAlgebraTests;
 import dk.alexandra.fresco.lib.real.MathTests;
 import dk.alexandra.fresco.lib.real.TruncationTests;
@@ -658,7 +659,7 @@ public void test_Real_Mult_Known() {
 
   @Test
   public void test_Real_Mults() {
-    runTest(new BasicFixedPointTests.TestMult<>(), new TestParameters().numParties(2));
+    runTest(new TestMult<>(), new TestParameters().numParties(2));
   }
 
   @Test
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
index 3d63faf49..c79e13d1e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
@@ -65,5 +65,5 @@ public BasicNumericContext createBasicNumericContext(Spdz2kResourcePool<PlainT>
         resourcePool.getMaxBitLength(), resourcePool.getModulus(), resourcePool.getMyId(),
         resourcePool.getNoOfParties());
   }
-  
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 75be0237f..758da22fb 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -192,7 +192,7 @@ public void testEqualsLogRounds() {
   public void testEqualsEdgeCasesLogRounds() {
     runTest(new TestCompareEQEdgeCases<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
-
+  
   protected abstract int getMaxBitLength();
 
 }

From 28abdd66d58b6ca698e71f27478d924dbc1c5f61 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 18 Jun 2018 17:55:58 +0200
Subject: [PATCH 163/231] WIP fixed point mult w/o decimals tests

---
 .../fresco/lib/real/RealNumeric.java          |  18 +-
 .../lib/real/fixed/DefaultFixedNumeric.java   |  23 +-
 .../lib/real/fixed/SemiFixedNumeric.java      |  10 +
 .../fresco/lib/real/BasicFixedPointTests.java |  82 +--
 .../lib/real/BasicSemiFloatingPointTests.java | 657 ++++++++++++++++++
 .../TestDummyArithmeticProtocolSuite.java     |   6 +
 6 files changed, 751 insertions(+), 45 deletions(-)
 create mode 100644 core/src/test/java/dk/alexandra/fresco/lib/real/BasicSemiFloatingPointTests.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/RealNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/RealNumeric.java
index 7ad8bff04..d49c841a3 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/RealNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/RealNumeric.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 
 /**
  * Basic interface for numeric applications on real numbers.
@@ -100,9 +101,16 @@ public interface RealNumeric extends ComputationDirectory {
    */
   DRes<SReal> known(BigDecimal value);
 
+  /**
+   * Creates a known secret value from a public value (which has been scaled). <p>This is primarily
+   * a helper function in order to use public values within the FRESCO functions. Note that the
+   * value is interpreted as already scaled, which avoids various rounding artifacts.</p>
+   */
+  DRes<SReal> fromScaled(BigInteger value);
+
   /**
    * Create a secret real value from a secret integer value representing the same value.
-   * 
+   *
    * @param value A secret integer.
    * @return A secret real with the same value as the input
    */
@@ -126,6 +134,14 @@ public interface RealNumeric extends ComputationDirectory {
    */
   DRes<BigDecimal> open(DRes<SReal> secretShare);
 
+  /**
+   * Opens a value to all MPC parties without converting to BigDecimal.
+   *
+   * @param secretShare The value to open.
+   * @return The opened value represented by the closed value (without conversion).
+   */
+  DRes<BigInteger> openRaw(DRes<SReal> secretShare);
+
   /**
    * Opens a value to a single given party.
    *
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
index e2677349c..2daa31c2b 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
@@ -18,14 +18,12 @@ public class DefaultFixedNumeric implements RealNumeric {
   protected final ProtocolBuilderNumeric builder;
   // TODO these should be cached static fields
   private final int precision;
-  private final BigInteger scalingFactor;
   private final BigDecimal scalingFactorDecimal;
 
   public DefaultFixedNumeric(ProtocolBuilderNumeric builder, int precision) {
     this.builder = builder;
     this.precision = precision;
-    this.scalingFactor = BigInteger.ONE.shiftLeft(precision);
-    this.scalingFactorDecimal = new BigDecimal(scalingFactor);
+    this.scalingFactorDecimal = new BigDecimal(BigInteger.ONE.shiftLeft(precision));
   }
 
   public DefaultFixedNumeric(ProtocolBuilderNumeric builder) {
@@ -33,13 +31,11 @@ public DefaultFixedNumeric(ProtocolBuilderNumeric builder) {
   }
 
   private BigInteger unscaled(BigDecimal value) {
-    // TODO extremely inefficient
     return value.multiply(scalingFactorDecimal).setScale(0, RoundingMode.HALF_UP)
         .toBigIntegerExact();
   }
 
   private BigDecimal scaled(BigInteger value) {
-    // TODO extremely inefficient
     return new BigDecimal(value).setScale(precision).divide(scalingFactorDecimal,
         RoundingMode.HALF_UP);
   }
@@ -107,6 +103,14 @@ public DRes<SReal> known(BigDecimal value) {
     });
   }
 
+  @Override
+  public DRes<SReal> fromScaled(BigInteger value) {
+    return builder.seq(seq -> {
+      DRes<SInt> input = seq.numeric().known(value);
+      return new SFixed(input, precision);
+    });
+  }
+
   @Override
   public DRes<SReal> fromSInt(DRes<SInt> value) {
     return null;
@@ -135,6 +139,15 @@ public DRes<BigDecimal> open(DRes<SReal> secretShare) {
     });
   }
 
+  @Override
+  public DRes<BigInteger> openRaw(DRes<SReal> secretShare) {
+    return builder.seq(seq -> {
+      SFixed floatX = (SFixed) secretShare.out();
+      DRes<SInt> unscaled = floatX.getSInt();
+      return seq.numeric().open(unscaled);
+    });
+  }
+
   @Override
   public DRes<BigDecimal> open(DRes<SReal> secretShare, int outputParty) {
     return builder.seq(seq -> {
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/SemiFixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/SemiFixedNumeric.java
index 8af6c99a3..612c21a49 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/SemiFixedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/SemiFixedNumeric.java
@@ -219,6 +219,11 @@ public DRes<SReal> known(BigDecimal value) {
     });
   }
 
+  @Override
+  public DRes<SReal> fromScaled(BigInteger value) {
+    return null;
+  }
+
   @Override
   public DRes<SReal> fromSInt(DRes<SInt> value) {
     return builder.seq(seq -> new SFixed(value.out(), 0));
@@ -243,6 +248,11 @@ public DRes<BigDecimal> open(DRes<SReal> x) {
     });
   }
 
+  @Override
+  public DRes<BigInteger> openRaw(DRes<SReal> secretShare) {
+    return null;
+  }
+
   @Override
   public DRes<BigDecimal> open(DRes<SReal> x, int outputParty) {
     return builder.seq(seq -> {
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
index 172c984d5..a28c4caa6 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
@@ -21,10 +21,8 @@
 import org.junit.Assert;
 
 /**
- * Basic tests of computation with fixed point numbers.
- * <p>
- * NOTE: these tests all assume a precision of {@link BasicFixedPointTests.DEFAULT_PRECISION}.
- * </p>
+ * Basic tests of computation with fixed point numbers. <p> NOTE: these tests all assume a precision
+ * of {@code DEFAULT_PRECISION}. </p>
  */
 public class BasicFixedPointTests {
 
@@ -32,6 +30,8 @@ public class BasicFixedPointTests {
    * The precision assumed in all tests.
    */
   public static final int DEFAULT_PRECISION = 16;
+  public static final BigDecimal SCALING_FACTOR = new BigDecimal(
+      BigInteger.ONE.shiftLeft(DEFAULT_PRECISION));
 
   public static class TestInput<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
@@ -83,7 +83,7 @@ public void test() throws Exception {
           List<BigDecimal> output = runApplication(app);
           RealTestUtils.assertEqual(
               value.stream().map(BigDecimal::new).collect(Collectors.toList()), output,
-              DEFAULT_PRECISION + 1);
+              DEFAULT_PRECISION);
         }
       };
     }
@@ -261,9 +261,9 @@ public void test() throws Exception {
                 openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
             List<DRes<BigDecimal>> opened = Stream.concat(
                 IntStream.range(0, closed.size())
-                .mapToObj(i -> producer.realNumeric().sub(closed.get(i), openInputs2.get(i))),
+                    .mapToObj(i -> producer.realNumeric().sub(closed.get(i), openInputs2.get(i))),
                 IntStream.range(0, closed.size())
-                .mapToObj(i -> producer.realNumeric().sub(openInputs2.get(i), closed.get(i))))
+                    .mapToObj(i -> producer.realNumeric().sub(openInputs2.get(i), closed.get(i))))
                 .map(producer.realNumeric()::open)
                 .collect(Collectors.toList());
             return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
@@ -285,7 +285,7 @@ public void test() throws Exception {
                     BigDecimal b = openInputs2.get(idx - openInputs.size());
                     RealTestUtils.assertEqual(b.subtract(a), output.get(idx), DEFAULT_PRECISION);
                   });
-          }
+        }
       };
     }
   }
@@ -296,10 +296,10 @@ public static class TestMultKnown<ResourcePoolT extends ResourcePool>
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
       List<BigDecimal> openInputs =
-          Stream.of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.0007, 0.1298, 9.99)
+          Stream.of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298, 9.99)
               .map(BigDecimal::valueOf).collect(Collectors.toList());
       List<BigDecimal> openInputs2 =
-          Stream.of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 0.0005, 10.0012, 999.0101)
+          Stream.of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012, 999.0101)
               .map(BigDecimal::valueOf).collect(Collectors.toList());
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
         @Override
@@ -327,7 +327,7 @@ public void test() throws Exception {
             // There should be no truncation after just one multiplication
             RealTestUtils.assertEqual(a.multiply(b), openOutput,
                 DEFAULT_PRECISION
-                - Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)));
+                    - Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)));
           }
         }
       };
@@ -430,14 +430,14 @@ public static class TestMult<ResourcePoolT extends ResourcePool>
 
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
-      // TODO not clear if this test makes sense
       List<BigDecimal> openInputs = Stream
-          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298)
+          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298,
+              5.0 * Math.pow(2.0, -DEFAULT_PRECISION))
           .map(BigDecimal::valueOf).collect(Collectors.toList());
       List<BigDecimal> openInputs2 = Stream
-          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012)
+          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012,
+              3.0 * Math.pow(2.0, -DEFAULT_PRECISION))
           .map(BigDecimal::valueOf).collect(Collectors.toList());
-
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
         @Override
         public void test() throws Exception {
@@ -460,37 +460,42 @@ public void test() throws Exception {
 
           for (BigDecimal openOutput : output) {
             int idx = output.indexOf(openOutput);
+
             BigDecimal a = openInputs.get(idx);
             BigDecimal b = openInputs2.get(idx);
+            int precisionLoss = Math.max(
+                Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)),
+                0);
             RealTestUtils.assertEqual(a.multiply(b), openOutput,
-                DEFAULT_PRECISION - 1 -
-                    Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b))) ;
+                DEFAULT_PRECISION - 1 - precisionLoss);
           }
         }
       };
     }
   }
 
-  public static class TestMultSemiFloating<ResourcePoolT extends ResourcePool>
+  public static class TestMultIsolated<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
+    private BigInteger modulus;
+
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
-      List<BigDecimal> openInputs = Stream
-          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.0007, 0.1298,
-              1.5 * Math.pow(2.0, -DEFAULT_PRECISION))
-          .map(BigDecimal::valueOf).collect(Collectors.toList());
-      List<BigDecimal> openInputs2 = Stream
-          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 0.0005, 10.0012,
-              3.5 * Math.pow(2.0, -DEFAULT_PRECISION))
-          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigInteger> openInputs = Stream
+          .of(1L, 30_000_000_000L)
+          .map(BigInteger::valueOf).collect(Collectors.toList());
+      List<BigInteger> openInputs2 = Stream
+          .of(1L, 100L)
+          .map(BigInteger::valueOf).collect(Collectors.toList());
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
         @Override
         public void test() throws Exception {
-          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = producer -> {
+            modulus = producer.getBasicNumericContext().getModulus();
             List<DRes<SReal>> closed1 =
-                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
-            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                openInputs.stream().map(producer.realNumeric()::fromScaled).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::fromScaled)
                 .collect(Collectors.toList());
 
             List<DRes<SReal>> result = new ArrayList<>();
@@ -498,20 +503,19 @@ public void test() throws Exception {
               result.add(producer.realNumeric().mult(inputX, closed2.get(closed1.indexOf(inputX))));
             }
 
-            List<DRes<BigDecimal>> opened =
-                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            List<DRes<BigInteger>> opened =
+                result.stream().map(producer.realNumeric()::openRaw).collect(Collectors.toList());
             return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
           };
-          List<BigDecimal> output = runApplication(app);
+          List<BigInteger> output = runApplication(app);
 
-          for (BigDecimal openOutput : output) {
+          for (BigInteger openOutput : output) {
             int idx = output.indexOf(openOutput);
-
-            BigDecimal a = openInputs.get(idx);
-            BigDecimal b = openInputs2.get(idx);
-
-            RealTestUtils.assertEqual(a.multiply(b), openOutput,
-                DEFAULT_PRECISION - 1 - Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)));
+            BigInteger a = openInputs.get(idx);
+            BigInteger b = openInputs2.get(idx);
+            Assert.assertEquals(
+                a.multiply(b).mod(modulus).shiftRight(DEFAULT_PRECISION),
+                openOutput);
           }
         }
       };
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicSemiFloatingPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicSemiFloatingPointTests.java
new file mode 100644
index 000000000..33f2714f0
--- /dev/null
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicSemiFloatingPointTests.java
@@ -0,0 +1,657 @@
+package dk.alexandra.fresco.lib.real;
+
+import static org.junit.Assert.assertEquals;
+
+import dk.alexandra.fresco.framework.Application;
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThread;
+import dk.alexandra.fresco.framework.TestThreadRunner.TestThreadFactory;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import org.junit.Assert;
+
+/**
+ * Basic tests of computation with fixed point numbers.
+ * <p>
+ * NOTE: these tests all assume a precision of {@code DEFAULT_PRECISION}.
+ * </p>
+ */
+public class BasicSemiFloatingPointTests {
+
+  /**
+   * The precision assumed in all tests.
+   */
+  public static final int DEFAULT_PRECISION = 16;
+
+  public static class TestInput<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      List<BigDecimal> value = Arrays.asList(10.000001, 5.9, 11.0, 0.0001,
+          100000.0001, 1.5 * Math.pow(2.0, -DEFAULT_PRECISION + 2))
+          .stream().map(BigDecimal::valueOf).collect(Collectors.toList());
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> inputs = value.stream().map(x -> producer.realNumeric().input(x, 1))
+                .collect(Collectors.toList());
+            List<DRes<BigDecimal>> opened =
+                inputs.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+          RealTestUtils.assertEqual(value, output, DEFAULT_PRECISION);
+        }
+      };
+    }
+  }
+
+  public static class TestUseSInt<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      List<BigInteger> value = Arrays.asList(BigInteger.ONE, BigInteger.ONE.negate(),
+          BigInteger.ONE.shiftLeft(200).negate());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SInt>> sints =
+                value.stream().map(producer.numeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> inputs =
+                sints.stream().map(producer.realNumeric()::fromSInt).collect(Collectors.toList());
+            List<DRes<BigDecimal>> opened =
+                inputs.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+          RealTestUtils.assertEqual(
+              value.stream().map(BigDecimal::new).collect(Collectors.toList()), output,
+              DEFAULT_PRECISION);
+        }
+      };
+    }
+  }
+
+  public static class TestOpenToParty<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      BigDecimal value = BigDecimal.ONE;
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<BigDecimal, ProtocolBuilderNumeric> app = producer -> {
+            DRes<SReal> input = producer.realNumeric().input(value, 1);
+            return producer.realNumeric().open(input, 1);
+          };
+          BigDecimal output = runApplication(app);
+
+          if (conf.getMyId() == 1) {
+            RealTestUtils.assertEqual(value, output, DEFAULT_PRECISION + 1);
+          } else {
+            Assert.assertNull(output);
+          }
+
+        }
+      };
+    }
+  }
+
+  public static class TestKnown<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      List<BigDecimal> value = Arrays
+          .asList(10.000001, 5.9, 11.0, 0.0001, 100000000.0001,
+              0.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .stream().map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> inputs =
+                value.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<BigDecimal>> opened =
+                inputs.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+          RealTestUtils.assertEqual(value, output, DEFAULT_PRECISION + 1);
+        }
+      };
+    }
+  }
+
+  public static class TestAddKnown<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      List<BigDecimal> openInputs = Stream
+          .of(1.0001, 0.000_000_001, -1_000_000_000_000.000_100_000_000_1,
+              0.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(-1.0001, 1_000_000_000.0, -1_000_000_000_000.000_100_000_000_1,
+              0.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+
+            List<DRes<SReal>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(
+                  producer.realNumeric().add(openInputs2.get(closed1.indexOf(inputX)), inputX));
+            }
+
+            List<DRes<BigDecimal>> opened =
+                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+
+            BigDecimal a = openInputs.get(idx);
+            BigDecimal b = openInputs2.get(idx);
+            RealTestUtils.assertEqual(a.add(b), openOutput, DEFAULT_PRECISION);
+          }
+        }
+      };
+    }
+  }
+
+  public static class TestSubtractSecret<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      List<BigDecimal> openInputs = Stream
+          .of(1.000_2, 0.000_000_001, -1_000_000_000_000.000_100_000_000_1,
+              2.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(1.000_1, 1_000_000_000.0, -1_000_000_000_000.000_100_000_000_1,
+              Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                .collect(Collectors.toList());
+
+            List<DRes<SReal>> results = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              results.add(producer.realNumeric().sub(inputX, closed2.get(closed1.indexOf(inputX))));
+            }
+
+            List<DRes<BigDecimal>> opened =
+                results.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+
+            BigDecimal a = openInputs.get(idx);
+            BigDecimal b = openInputs2.get(idx);
+            RealTestUtils.assertEqual(a.subtract(b), openOutput, DEFAULT_PRECISION);
+          }
+        }
+      };
+    }
+  }
+
+  public static class TestSubKnown<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      List<BigDecimal> openInputs = Stream
+          .of(1.000_2, 0.000_000_001, -1_000_000_000_000.000_100_000_000_1,
+              2.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(1.000_1, 1_000_000_000.0, -1_000_000_000_000.000_100_000_000_1,
+              Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<BigDecimal>> opened = Stream.concat(
+                IntStream.range(0, closed.size())
+                .mapToObj(i -> producer.realNumeric().sub(closed.get(i), openInputs2.get(i))),
+                IntStream.range(0, closed.size())
+                .mapToObj(i -> producer.realNumeric().sub(openInputs2.get(i), closed.get(i))))
+                .map(producer.realNumeric()::open)
+                .collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+          assertEquals(output.size(), openInputs.size() * 2);
+          IntStream.range(0, openInputs.size())
+              .forEach(
+                  idx -> {
+                    BigDecimal a = openInputs.get(idx);
+                    BigDecimal b = openInputs2.get(idx);
+                    RealTestUtils.assertEqual(a.subtract(b), output.get(idx), DEFAULT_PRECISION);
+                  });
+
+          IntStream.range(openInputs.size(), output.size())
+              .forEach(
+                  idx -> {
+                    BigDecimal a = openInputs.get(idx - openInputs.size());
+                    BigDecimal b = openInputs2.get(idx - openInputs.size());
+                    RealTestUtils.assertEqual(b.subtract(a), output.get(idx), DEFAULT_PRECISION);
+                  });
+          }
+      };
+    }
+  }
+
+  public static class TestMultKnown<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      List<BigDecimal> openInputs =
+          Stream.of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.0007, 0.1298, 9.99)
+              .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 =
+          Stream.of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 0.0005, 10.0012, 999.0101)
+              .map(BigDecimal::valueOf).collect(Collectors.toList());
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+
+            List<DRes<SReal>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(
+                  producer.realNumeric().mult(openInputs2.get(closed1.indexOf(inputX)), inputX));
+            }
+
+            List<DRes<BigDecimal>> opened =
+                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+            BigDecimal a = openInputs.get(idx);
+            BigDecimal b = openInputs2.get(idx);
+            // There should be no truncation after just one multiplication
+            RealTestUtils.assertEqual(a.multiply(b), openOutput,
+                DEFAULT_PRECISION
+                - Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)));
+          }
+        }
+      };
+    }
+  }
+
+
+  public static class TestRepeatedMultiplication<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      List<BigDecimal> openInputs =
+          Stream.of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.0007, 0.1298)
+              .map(BigDecimal::valueOf).collect(Collectors.toList());
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<BigDecimal, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+
+            DRes<SReal> result = producer.realNumeric().known(BigDecimal.ONE);
+            for (DRes<SReal> inputX : closed1) {
+              result = producer.realNumeric().mult(result, inputX);
+            }
+
+            DRes<BigDecimal> opened = producer.realNumeric().open(result);
+            return opened;
+          };
+          BigDecimal output = runApplication(app);
+
+          BigDecimal expected = BigDecimal.ONE.setScale(DEFAULT_PRECISION / 2);
+          for (BigDecimal openOutput : openInputs) {
+            expected = expected.multiply(openOutput);
+          }
+          // We lose precision for each multiplication.
+          RealTestUtils.assertEqual(output, expected, DEFAULT_PRECISION - 8);
+        }
+      };
+    }
+  }
+
+  public static class TestDivisionKnownDivisor<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      BigDecimal value = BigDecimal.valueOf(10.00100);
+      BigDecimal value2 = BigDecimal.valueOf(0.2);
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<BigDecimal, ProtocolBuilderNumeric> app = producer -> {
+
+            DRes<SReal> input = producer.realNumeric().input(value, 1);
+            DRes<SReal> product = producer.realNumeric().div(input, value2);
+
+            return producer.realNumeric().open(product);
+          };
+          BigDecimal output = runApplication(app);
+          RealTestUtils.assertEqual(value.divide(value2), output, DEFAULT_PRECISION - 2
+              - Math.max(0, RealTestUtils.floorLog2(value) - RealTestUtils.floorLog2(value2)));
+        }
+      };
+    }
+  }
+
+  public static class TestDivisionKnownNegativeDivisor<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      BigDecimal value = BigDecimal.valueOf(10.00100);
+      BigDecimal value2 = BigDecimal.valueOf(-1);
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<BigDecimal, ProtocolBuilderNumeric> app = producer -> {
+
+            DRes<SReal> input = producer.realNumeric().input(value, 1);
+            DRes<SReal> product = producer.realNumeric().div(input, value2);
+
+            return producer.realNumeric().open(product);
+          };
+          BigDecimal output = runApplication(app);
+          RealTestUtils.assertEqual(value.divide(value2), output, DEFAULT_PRECISION - 2
+              - Math.max(0, RealTestUtils.floorLog2(value) - RealTestUtils.floorLog2(value2)));
+        }
+      };
+    }
+  }
+
+  public static class TestMult<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      // TODO not clear if this test makes sense
+      List<BigDecimal> openInputs = Stream
+          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298)
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012)
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                .collect(Collectors.toList());
+
+            List<DRes<SReal>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(producer.realNumeric().mult(inputX, closed2.get(closed1.indexOf(inputX))));
+            }
+
+            List<DRes<BigDecimal>> opened =
+                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+            BigDecimal a = openInputs.get(idx);
+            BigDecimal b = openInputs2.get(idx);
+            RealTestUtils.assertEqual(a.multiply(b), openOutput,
+                DEFAULT_PRECISION - 1 -
+                    Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b))) ;
+          }
+        }
+      };
+    }
+  }
+
+  public static class TestMultSemiFloating<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      List<BigDecimal> openInputs = Stream
+          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.0007, 0.1298,
+              1.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 0.0005, 10.0012,
+              3.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                .collect(Collectors.toList());
+
+            List<DRes<SReal>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(producer.realNumeric().mult(inputX, closed2.get(closed1.indexOf(inputX))));
+            }
+
+            List<DRes<BigDecimal>> opened =
+                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+
+            BigDecimal a = openInputs.get(idx);
+            BigDecimal b = openInputs2.get(idx);
+
+            RealTestUtils.assertEqual(a.multiply(b), openOutput,
+                DEFAULT_PRECISION - 1 - Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)));
+          }
+        }
+      };
+    }
+  }
+
+  public static class TestAdd<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      List<BigDecimal> openInputs = Stream
+          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.0007, 0.121998,
+              0.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 0.0005, 10.00112,
+              0.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                .collect(Collectors.toList());
+
+            List<DRes<SReal>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(producer.realNumeric().add(inputX, closed2.get(closed1.indexOf(inputX))));
+            }
+
+            List<DRes<BigDecimal>> opened =
+                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+
+            BigDecimal a = openInputs.get(idx);
+            BigDecimal b = openInputs2.get(idx);
+            RealTestUtils.assertEqual(a.add(b), openOutput, DEFAULT_PRECISION);
+          }
+        }
+      };
+    }
+  }
+
+  public static class TestDiv<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      List<BigDecimal> openInputs = Stream
+          .of(2.0, Math.pow(2.0, DEFAULT_PRECISION - 1), -4.0,
+              2.5 * Math.pow(2.0, -DEFAULT_PRECISION))
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+      List<BigDecimal> openInputs2 =
+          Stream.of(-1.0, 2.2, -2.1, 2.0).map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigDecimal>, ProtocolBuilderNumeric> app = producer -> {
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                .collect(Collectors.toList());
+            List<DRes<SReal>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(producer.realNumeric().div(inputX, closed2.get(closed1.indexOf(inputX))));
+            }
+            List<DRes<BigDecimal>> opened =
+                result.stream().map(producer.realNumeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigDecimal> output = runApplication(app);
+          for (BigDecimal openOutput : output) {
+            int idx = output.indexOf(openOutput);
+            BigDecimal a = openInputs.get(idx).setScale(DEFAULT_PRECISION, RoundingMode.HALF_UP);
+            BigDecimal b = openInputs2.get(idx).setScale(DEFAULT_PRECISION, RoundingMode.HALF_UP);
+            BigDecimal expected = a.divide(b, RoundingMode.HALF_UP);
+            // It's hard to approximate error after division since it depends on the input sizes. We
+            // use 4 for now.
+            RealTestUtils.assertEqual(expected, openOutput, 4);
+          }
+        }
+      };
+    }
+  }
+
+  public static class TestLeq<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      List<BigDecimal> openInputs = Stream.of(1.1 * Math.pow(2.0, -DEFAULT_PRECISION + 1),
+          Math.pow(2.0, DEFAULT_PRECISION - 1), -1.0).map(BigDecimal::valueOf)
+          .collect(Collectors.toList());
+      List<BigDecimal> openInputs2 = Stream
+          .of(1.2 * Math.pow(2.0, -DEFAULT_PRECISION + 1),
+              Math.pow(2.0, DEFAULT_PRECISION - 1) - 1.0, 1.0)
+          .map(BigDecimal::valueOf).collect(Collectors.toList());
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        @Override
+        public void test() throws Exception {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = producer -> {
+
+            List<DRes<SReal>> closed1 =
+                openInputs.stream().map(producer.realNumeric()::known).collect(Collectors.toList());
+            List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::known)
+                .collect(Collectors.toList());
+
+            List<DRes<SInt>> result = new ArrayList<>();
+            for (DRes<SReal> inputX : closed1) {
+              result.add(producer.realNumeric().leq(inputX, closed2.get(closed1.indexOf(inputX))));
+            }
+
+            List<DRes<BigInteger>> opened =
+                result.stream().map(producer.numeric()::open).collect(Collectors.toList());
+            return () -> opened.stream().map(DRes::out).collect(Collectors.toList());
+          };
+          List<BigInteger> output = runApplication(app);
+
+          for (int i = 0; i < output.size(); i++) {
+            BigDecimal a = openInputs.get(i);
+            BigDecimal b = openInputs2.get(i);
+            int expected = (a.compareTo(b) != 1) ? 1 : 0;
+            int result = output.get(i).intValue();
+            Assert.assertEquals(expected, result);
+          }
+        }
+      };
+    }
+  }
+}
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index b299ecba9..0c7918700 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -55,6 +55,7 @@
 import dk.alexandra.fresco.lib.math.polynomial.PolynomialTests;
 import dk.alexandra.fresco.lib.real.BasicFixedPointTests;
 import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMult;
+import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMultIsolated;
 import dk.alexandra.fresco.lib.real.LinearAlgebraTests;
 import dk.alexandra.fresco.lib.real.MathTests;
 import dk.alexandra.fresco.lib.real.TruncationTests;
@@ -662,6 +663,11 @@ public void test_Real_Mults() {
     runTest(new TestMult<>(), new TestParameters().numParties(2));
   }
 
+  @Test
+  public void test_Real_Mults_Isolated() {
+    runTest(new TestMultIsolated<>(), new TestParameters().numParties(2));
+  }
+
   @Test
   public void test_Real_Repeated_Multiplication() {
     runTest(new BasicFixedPointTests.TestRepeatedMultiplication<>(),

From e4e6c73bc76b74f8f6863ca0f117f9979992b793 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 10:11:42 +0200
Subject: [PATCH 164/231] Some fixed point mult tests

---
 .../dk/alexandra/fresco/lib/real/BasicFixedPointTests.java   | 5 +++--
 .../dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
index a28c4caa6..51d2d0fe2 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
@@ -482,10 +482,11 @@ public static class TestMultIsolated<ResourcePoolT extends ResourcePool>
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
       List<BigInteger> openInputs = Stream
-          .of(1L, 30_000_000_000L)
+          // 0.0001 0.1 0.01 0.11
+          .of(0x0001L, 0x8000L, 0x0800L, 0x8800L)
           .map(BigInteger::valueOf).collect(Collectors.toList());
       List<BigInteger> openInputs2 = Stream
-          .of(1L, 100L)
+          .of(0x0001L, 0x8000L, 0x8000L, 0x8000L)
           .map(BigInteger::valueOf).collect(Collectors.toList());
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 758da22fb..75be0237f 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -192,7 +192,7 @@ public void testEqualsLogRounds() {
   public void testEqualsEdgeCasesLogRounds() {
     runTest(new TestCompareEQEdgeCases<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
-  
+
   protected abstract int getMaxBitLength();
 
 }

From 230068f48b397e35be63f827d3f3eb6e0fa2e6ee Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 10:16:29 +0200
Subject: [PATCH 165/231] Big by small number

---
 .../dk/alexandra/fresco/lib/real/BasicFixedPointTests.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
index 51d2d0fe2..06318e816 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
@@ -482,11 +482,10 @@ public static class TestMultIsolated<ResourcePoolT extends ResourcePool>
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
       List<BigInteger> openInputs = Stream
-          // 0.0001 0.1 0.01 0.11
-          .of(0x0001L, 0x8000L, 0x0800L, 0x8800L)
+          .of(0x0001L, 0x8000L, 0x0800L, 0x8800L, 0x88008800L)
           .map(BigInteger::valueOf).collect(Collectors.toList());
       List<BigInteger> openInputs2 = Stream
-          .of(0x0001L, 0x8000L, 0x8000L, 0x8000L)
+          .of(0x0001L, 0x8000L, 0x8000L, 0x8000L, 0x8800L)
           .map(BigInteger::valueOf).collect(Collectors.toList());
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
 

From 8c53dca307fc2f0358bc266145897268e8718d76 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 10:33:20 +0200
Subject: [PATCH 166/231] Missing fixed point methods

---
 .../lib/real/fixed/DefaultFixedNumeric.java   | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
index 2daa31c2b..7ef4a6b69 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
@@ -51,22 +51,38 @@ public DRes<SReal> add(DRes<SReal> a, DRes<SReal> b) {
 
   @Override
   public DRes<SReal> add(BigDecimal a, DRes<SReal> b) {
-    return null;
+    return builder.seq(seq -> {
+      BigInteger unscaled = unscaled(a);
+      SFixed floatB = (SFixed) b.out();
+      return new SFixed(seq.numeric().add(unscaled, floatB.getSInt()), precision);
+    });
   }
 
   @Override
   public DRes<SReal> sub(DRes<SReal> a, DRes<SReal> b) {
-    return null;
+    return builder.seq(seq -> {
+      SFixed floatA = (SFixed) a.out();
+      SFixed floatB = (SFixed) b.out();
+      return new SFixed(seq.numeric().sub(floatA.getSInt(), floatB.getSInt()), precision);
+    });
   }
 
   @Override
   public DRes<SReal> sub(BigDecimal a, DRes<SReal> b) {
-    return null;
+    return builder.seq(seq -> {
+      BigInteger unscaled = unscaled(a);
+      SFixed floatB = (SFixed) b.out();
+      return new SFixed(seq.numeric().sub(unscaled, floatB.getSInt()), precision);
+    });
   }
 
   @Override
   public DRes<SReal> sub(DRes<SReal> a, BigDecimal b) {
-    return null;
+    return builder.seq(seq -> {
+      BigInteger unscaled = unscaled(b);
+      SFixed floatA = (SFixed) a.out();
+      return new SFixed(seq.numeric().sub(floatA.getSInt(), unscaled), precision);
+    });
   }
 
   @Override
@@ -82,17 +98,21 @@ public DRes<SReal> mult(DRes<SReal> a, DRes<SReal> b) {
 
   @Override
   public DRes<SReal> mult(BigDecimal a, DRes<SReal> b) {
-    return null;
+    return builder.seq(seq -> {
+      BigInteger unscaled = unscaled(a);
+      SFixed floatB = (SFixed) b.out();
+      return new SFixed(seq.numeric().mult(unscaled, floatB.getSInt()), precision);
+    });
   }
 
   @Override
   public DRes<SReal> div(DRes<SReal> a, DRes<SReal> b) {
-    return null;
+    throw new UnsupportedOperationException("Not implemented");
   }
 
   @Override
   public DRes<SReal> div(DRes<SReal> a, BigDecimal b) {
-    return null;
+    throw new UnsupportedOperationException("Not implemented");
   }
 
   @Override
@@ -168,6 +188,10 @@ public DRes<BigDecimal> open(DRes<SReal> secretShare, int outputParty) {
 
   @Override
   public DRes<SInt> leq(DRes<SReal> x, DRes<SReal> y) {
-    return null;
+    return builder.seq(seq -> {
+      SFixed floatX = (SFixed) x.out();
+      SFixed floatY = (SFixed) y.out();
+      return seq.comparison().compareLEQ(floatX.getSInt(), floatY.getSInt());
+    });
   }
 }

From 84358d3e73c66f6d78bba5d1e721b085525ae7e0 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 10:57:36 +0200
Subject: [PATCH 167/231] Truncate in mult by open

---
 .../lib/real/fixed/DefaultFixedNumeric.java    |  4 +++-
 .../fresco/lib/real/BasicFixedPointTests.java  | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
index 7ef4a6b69..f9dcdc131 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
@@ -101,7 +101,9 @@ public DRes<SReal> mult(BigDecimal a, DRes<SReal> b) {
     return builder.seq(seq -> {
       BigInteger unscaled = unscaled(a);
       SFixed floatB = (SFixed) b.out();
-      return new SFixed(seq.numeric().mult(unscaled, floatB.getSInt()), precision);
+      DRes<SInt> overflowedProduct = seq.numeric().mult(unscaled, floatB.getSInt());
+      DRes<SInt> truncated = seq.advancedNumeric().truncate(overflowedProduct, precision);
+      return new SFixed(truncated, precision);
     });
   }
 
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
index 06318e816..9e39d7a6c 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
@@ -296,10 +296,10 @@ public static class TestMultKnown<ResourcePoolT extends ResourcePool>
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
       List<BigDecimal> openInputs =
-          Stream.of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298, 9.99)
+          Stream.of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298, 9.99, 64.0)
               .map(BigDecimal::valueOf).collect(Collectors.toList());
       List<BigDecimal> openInputs2 =
-          Stream.of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012, 999.0101)
+          Stream.of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012, 999.0101, 1 / 64.0)
               .map(BigDecimal::valueOf).collect(Collectors.toList());
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
         @Override
@@ -325,9 +325,10 @@ public void test() throws Exception {
             BigDecimal a = openInputs.get(idx);
             BigDecimal b = openInputs2.get(idx);
             // There should be no truncation after just one multiplication
+            int precisionLoss = Math
+                .max(0, Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)));
             RealTestUtils.assertEqual(a.multiply(b), openOutput,
-                DEFAULT_PRECISION
-                    - Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)));
+                DEFAULT_PRECISION - 1 - precisionLoss);
           }
         }
       };
@@ -431,11 +432,11 @@ public static class TestMult<ResourcePoolT extends ResourcePool>
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
       List<BigDecimal> openInputs = Stream
-          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298,
+          .of(1.223, 222.23, 5.59703, 0.004, 5.90, 6.0, 0.1298, 64.0,
               5.0 * Math.pow(2.0, -DEFAULT_PRECISION))
           .map(BigDecimal::valueOf).collect(Collectors.toList());
       List<BigDecimal> openInputs2 = Stream
-          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012,
+          .of(1.000, 1.0000, 0.22211, 100.1, 11.0, .07, 10.0012, 1 / 64.0,
               3.0 * Math.pow(2.0, -DEFAULT_PRECISION))
           .map(BigDecimal::valueOf).collect(Collectors.toList());
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
@@ -460,9 +461,9 @@ public void test() throws Exception {
 
           for (BigDecimal openOutput : output) {
             int idx = output.indexOf(openOutput);
-
             BigDecimal a = openInputs.get(idx);
             BigDecimal b = openInputs2.get(idx);
+            System.out.println(openInputs.get(idx) + " " + openInputs2.get(idx) + " " + openOutput);
             int precisionLoss = Math.max(
                 Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)),
                 0);
@@ -494,7 +495,8 @@ public void test() throws Exception {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = producer -> {
             modulus = producer.getBasicNumericContext().getModulus();
             List<DRes<SReal>> closed1 =
-                openInputs.stream().map(producer.realNumeric()::fromScaled).collect(Collectors.toList());
+                openInputs.stream().map(producer.realNumeric()::fromScaled)
+                    .collect(Collectors.toList());
             List<DRes<SReal>> closed2 = openInputs2.stream().map(producer.realNumeric()::fromScaled)
                 .collect(Collectors.toList());
 

From 147cf23cae66b86530e5634d423b404483e8b193 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 11:03:18 +0200
Subject: [PATCH 168/231] Ignore div-based tests for now

---
 .../arithmetic/AbstractDummyArithmeticTest.java      |  4 ++--
 .../arithmetic/TestDummyArithmeticProtocolSuite.java | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/AbstractDummyArithmeticTest.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/AbstractDummyArithmeticTest.java
index 47ea79c62..3773cad92 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/AbstractDummyArithmeticTest.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/AbstractDummyArithmeticTest.java
@@ -162,8 +162,8 @@ public TestParameters maxBitLength(int maxBitLength) {
       return this;
     }
 
-    public TestParameters fixedPointPrecesion(int fixedPointPrecesion) {
-      this.fixedPointPrecesion = fixedPointPrecesion;
+    public TestParameters fixedPointPrecision(int fixedPointPrecision) {
+      this.fixedPointPrecesion = fixedPointPrecision;
       return this;
     }
 
diff --git a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
index 0c7918700..37b4d60af 100644
--- a/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
+++ b/core/src/test/java/dk/alexandra/fresco/suite/dummy/arithmetic/TestDummyArithmeticProtocolSuite.java
@@ -70,6 +70,7 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Random;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class TestDummyArithmeticProtocolSuite extends AbstractDummyArithmeticTest {
@@ -436,7 +437,7 @@ public void test_LpSolverDanzigSmallerMod() {
             .numParties(2)
             .modulus(ModulusFinder.findSuitableModulus(128))
             .maxBitLength(30)
-            .fixedPointPrecesion(8)
+            .fixedPointPrecision(8)
             .performanceLogging(false));
   }
 
@@ -674,17 +675,20 @@ public void test_Real_Repeated_Multiplication() {
         new TestParameters().numParties(2));
   }
 
+  @Ignore
   @Test
   public void test_Real_Division_Secret_Divisor() {
     runTest(new BasicFixedPointTests.TestDiv<>(), new TestParameters().numParties(2));
   }
 
+  @Ignore
   @Test
   public void test_Real_Division_Known_Divisor() {
     runTest(new BasicFixedPointTests.TestDivisionKnownDivisor<>(),
         new TestParameters().numParties(2));
   }
 
+  @Ignore
   @Test
   public void test_Real_Division_Known_Negative_Divisor() {
     runTest(new BasicFixedPointTests.TestDivisionKnownNegativeDivisor<>(),
@@ -740,6 +744,7 @@ public void test_Real_Matrix_Addition_Unmatched() {
         new TestParameters());
   }
 
+  @Ignore
   @Test
   public void test_Real_Exp() {
     runTest(new MathTests.TestExp<>(), new TestParameters().numParties(2));
@@ -755,11 +760,13 @@ public void test_Real_Leq() {
     runTest(new BasicFixedPointTests.TestLeq<>(), new TestParameters().numParties(2));
   }
 
+  @Ignore
   @Test
   public void test_Real_Log() {
     runTest(new MathTests.TestLog<>(), new TestParameters().numParties(2));
   }
 
+  @Ignore
   @Test
   public void test_Real_Sqrt() {
     runTest(new MathTests.TestSqrt<>(), new TestParameters().numParties(2));
@@ -790,11 +797,12 @@ public void test_inner_product_known_part_unmatched() {
     runTest(new MathTests.TestInnerProductPublicPartUnmatched<>(), new TestParameters());
   }
 
+  @Ignore
   @Test
   public void test_Real_Sqrt_Uneven_Precision() {
     runTest(new MathTests.TestSqrt<>(),
         new TestParameters()
-            .fixedPointPrecesion(BasicFixedPointTests.DEFAULT_PRECISION + 1));
+            .fixedPointPrecision(BasicFixedPointTests.DEFAULT_PRECISION + 1));
   }
 
   @Test

From b1b81394d54f606de84b879570a69de1e013c6e0 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 11:12:35 +0200
Subject: [PATCH 169/231] Impl fromSInt

---
 .../fresco/lib/real/fixed/DefaultFixedNumeric.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
index f9dcdc131..2264d7e30 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/DefaultFixedNumeric.java
@@ -18,12 +18,14 @@ public class DefaultFixedNumeric implements RealNumeric {
   protected final ProtocolBuilderNumeric builder;
   // TODO these should be cached static fields
   private final int precision;
+  private final BigInteger scalingFactor;
   private final BigDecimal scalingFactorDecimal;
 
   public DefaultFixedNumeric(ProtocolBuilderNumeric builder, int precision) {
     this.builder = builder;
     this.precision = precision;
-    this.scalingFactorDecimal = new BigDecimal(BigInteger.ONE.shiftLeft(precision));
+    this.scalingFactor = BigInteger.ONE.shiftLeft(precision);
+    this.scalingFactorDecimal = new BigDecimal(scalingFactor);
   }
 
   public DefaultFixedNumeric(ProtocolBuilderNumeric builder) {
@@ -135,7 +137,10 @@ public DRes<SReal> fromScaled(BigInteger value) {
 
   @Override
   public DRes<SReal> fromSInt(DRes<SInt> value) {
-    return null;
+    return builder.seq(seq -> {
+      DRes<SInt> scaled = seq.numeric().mult(scalingFactor, value);
+      return new SFixed(scaled, precision);
+    });
   }
 
   @Override

From 3457ee9ec68909af8cfba20958fdb25dea34c366 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 11:28:33 +0200
Subject: [PATCH 170/231] Add real numeric context to spdz2k

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  9 ++++---
 .../suite/spdz2k/Spdz2kProtocolSuite.java     | 27 ++++++++++++++++---
 .../resource/Spdz2kResourcePoolImpl.java      |  2 +-
 .../Spdz2kRoundSynchronization.java           |  4 ++-
 .../suite/spdz2k/TestSpdz2kBuilder.java       |  2 +-
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 01032ce43..86d274625 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -41,14 +41,18 @@ public class Spdz2kBuilder<PlainT extends CompUInt<?, ?, PlainT>> implements
 
   private final CompUIntFactory<PlainT> factory;
   private final BasicNumericContext numericContext;
+  private final RealNumericContext realNumericContext;
   private final boolean useBooleanMode;
   private final CompUIntArithmetic<PlainT> uIntArithmetic;
 
-  public Spdz2kBuilder(CompUIntFactory<PlainT> factory, BasicNumericContext numericContext,
+  public Spdz2kBuilder(CompUIntFactory<PlainT> factory,
+      BasicNumericContext numericContext,
+      RealNumericContext realNumericContext,
       boolean useBooleanMode) {
     this.factory = factory;
     this.uIntArithmetic = new CompUIntArithmetic<>(factory);
     this.numericContext = numericContext;
+    this.realNumericContext = realNumericContext;
     this.useBooleanMode = useBooleanMode;
   }
 
@@ -218,8 +222,7 @@ public OIntArithmetic getOIntArithmetic() {
 
   @Override
   public RealNumericContext getRealNumericContext() {
-    // TODO Auto-generated method stub
-    return null;
+    return realNumericContext;
   }
 
   class Spdz2kLogical extends DefaultLogical {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
index c79e13d1e..48cccedf5 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.network.Network;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
+import dk.alexandra.fresco.lib.real.RealNumericContext;
 import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
@@ -29,8 +30,11 @@ public abstract class Spdz2kProtocolSuite<
     PlainT extends CompUInt<HighT, LowT, PlainT>>
     implements ProtocolSuiteNumeric<Spdz2kResourcePool<PlainT>> {
 
+  private static final int DEFAULT_FIXED_POINT_PRECISION = 16;
+
   private final CompUIntConverter<HighT, LowT, PlainT> converter;
   private final boolean useBooleanMode;
+  private final int fixedPointPrecision;
 
   /**
    * Constructs new {@link Spdz2kProtocolSuite}.
@@ -40,18 +44,31 @@ public abstract class Spdz2kProtocolSuite<
    * between these different types.
    * @param useBooleanMode flag for switching to boolean shares for logical operations
    */
-  Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter, boolean useBooleanMode) {
+  Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter,
+      boolean useBooleanMode,
+      int fixedPointPrecision) {
     this.converter = converter;
     this.useBooleanMode = useBooleanMode;
+    this.fixedPointPrecision = fixedPointPrecision;
+  }
+
+  Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter, int fixedPointPrecision) {
+    this(converter, false, fixedPointPrecision);
+  }
+
+  Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter, boolean useBooleanMode) {
+    this(converter, useBooleanMode, DEFAULT_FIXED_POINT_PRECISION);
   }
 
   Spdz2kProtocolSuite(CompUIntConverter<HighT, LowT, PlainT> converter) {
-    this(converter, false);
+    this(converter, false, DEFAULT_FIXED_POINT_PRECISION);
   }
 
   @Override
   public BuilderFactoryNumeric init(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
-    return new Spdz2kBuilder<>(resourcePool.getFactory(), createBasicNumericContext(resourcePool),
+    return new Spdz2kBuilder<>(resourcePool.getFactory(),
+        createBasicNumericContext(resourcePool),
+        createRealNumericContext(),
         useBooleanMode);
   }
 
@@ -66,4 +83,8 @@ public BasicNumericContext createBasicNumericContext(Spdz2kResourcePool<PlainT>
         resourcePool.getNoOfParties());
   }
 
+  public RealNumericContext createRealNumericContext() {
+    return new RealNumericContext(fixedPointPrecision);
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
index 79beb5b1e..bcfb18d04 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/Spdz2kResourcePoolImpl.java
@@ -141,7 +141,7 @@ private byte[] runCoinTossing(Computation<byte[], ProtocolBuilderNumeric> coinTo
             network);
     BuilderFactoryNumeric builderFactory = new Spdz2kBuilder<>(factory,
         new BasicNumericContext(effectiveBitLength, modulus,
-            getMyId(), getNoOfParties()), false);
+            getMyId(), getNoOfParties()), null,false);
     ProtocolBuilderNumeric root = builderFactory.createSequential();
     DRes<byte[]> jointSeed = coinTossing
         .buildComputation(root);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 726336062..90caf6d14 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -53,7 +53,9 @@ public Spdz2kRoundSynchronization(Spdz2kProtocolSuite<HighT, LowT, PlainT> proto
 
   private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
     Spdz2kBuilder<PlainT> builder = new Spdz2kBuilder<>(resourcePool.getFactory(),
-        protocolSuite.createBasicNumericContext(resourcePool), false);
+        protocolSuite.createBasicNumericContext(resourcePool),
+        protocolSuite.createRealNumericContext(),
+        false);
     BatchEvaluationStrategy<Spdz2kResourcePool<PlainT>> batchStrategy = new BatchedStrategy<>();
     BatchedProtocolEvaluator<Spdz2kResourcePool<PlainT>> evaluator = new BatchedProtocolEvaluator<>(
         batchStrategy,
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
index 55e84824d..128293f13 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2kBuilder.java
@@ -7,7 +7,7 @@ public class TestSpdz2kBuilder {
 
   @Test(expected = UnsupportedOperationException.class)
   public void getBigIntegerHelper() {
-    new Spdz2kBuilder<>(new CompUInt128Factory(), null, false).getBigIntegerHelper();
+    new Spdz2kBuilder<>(new CompUInt128Factory(), null, null, false).getBigIntegerHelper();
   }
 
 }

From 13b88a2ef35a5b0d96e13cf09e46e64e668c19d7 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 15:15:11 +0200
Subject: [PATCH 171/231] Simple real arithmetic tests for spdz2k

---
 .../fresco/lib/real/BasicFixedPointTests.java |  1 -
 .../suite/spdz2k/datatypes/CompUInt128.java   |  2 +-
 .../computations/advanced/TruncateSpdz2k.java |  8 ++--
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  | 39 +++++++++++++++++++
 .../spdz2k/datatypes/TestCompUInt128.java     | 12 +++---
 .../computations/TestTruncateSpdz2k.java      | 34 ++++++++++++----
 6 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
index 9e39d7a6c..80aab594b 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
@@ -463,7 +463,6 @@ public void test() throws Exception {
             int idx = output.indexOf(openOutput);
             BigDecimal a = openInputs.get(idx);
             BigDecimal b = openInputs2.get(idx);
-            System.out.println(openInputs.get(idx) + " " + openInputs2.get(idx) + " " + openOutput);
             int precisionLoss = Math.max(
                 Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)),
                 0);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 8704fdbcb..2dd0ff305 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -208,7 +208,7 @@ public CompUInt128 shiftRightLowOnly(int n) {
     if (n <= 0) {
       return this;
     }
-    long midAndLow = ((UInt.toUnLong(mid) << 32) | UInt.toUnLong(low)) >> n;
+    long midAndLow = ((UInt.toUnLong(mid) << 32) | UInt.toUnLong(low)) >>> n;
     return new CompUInt128(high, (int) (midAndLow >>> 32), (int) midAndLow);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
index 3505ea61f..fec4fcebe 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
@@ -21,8 +21,7 @@ public class TruncateSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
   private final int d;
   private final CompUIntFactory<PlainT> factory;
 
-  public TruncateSpdz2k(DRes<SInt> value, int d,
-      CompUIntFactory<PlainT> factory) {
+  public TruncateSpdz2k(DRes<SInt> value, int d, CompUIntFactory<PlainT> factory) {
     this.value = value;
     this.d = d;
     this.factory = factory;
@@ -32,16 +31,15 @@ public TruncateSpdz2k(DRes<SInt> value, int d,
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     DRes<Spdz2kTruncationPair<PlainT>> truncationPairD = builder
         .append(new Spdz2kTruncationPairProtocol<>(d));
-    // annoying that we need this scope here
     return builder.seq(seq -> {
       Spdz2kTruncationPair<PlainT> truncationPair = truncationPairD.out();
-      DRes<SInt> masked = seq.numeric().sub(value, truncationPair.getRPrime());
+      DRes<SInt> masked = seq.numeric().add(value, truncationPair.getRPrime());
       return seq.numeric().openAsOInt(masked);
     }).seq((seq, openedOInt) -> {
       PlainT opened = factory.fromOInt(openedOInt);
       PlainT shifted = opened.shiftRightLowOnly(d);
       DRes<SInt> r = truncationPairD.out().getR();
-      return seq.numeric().addOpen(shifted, r);
+      return seq.numeric().subFromOpen(shifted, r);
     });
   }
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 75be0237f..4e1b77bf3 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -8,6 +8,9 @@
 import dk.alexandra.fresco.lib.compare.CompareTests.TestCompareEQZero;
 import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
 import dk.alexandra.fresco.lib.math.integer.binary.BinaryOperationsTests.TestGenerateRandomBitMask;
+import dk.alexandra.fresco.lib.real.BasicFixedPointTests;
+import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMult;
+import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMultIsolated;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestComparisonSpdz2k.TestBitLessThanOpenSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestAndKnownSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestAndSpdz2k;
@@ -193,6 +196,42 @@ public void testEqualsEdgeCasesLogRounds() {
     runTest(new TestCompareEQEdgeCases<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testRealInput() {
+    runTest(new BasicFixedPointTests.TestInput<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testRealOpenToParty() {
+    runTest(new BasicFixedPointTests.TestOpenToParty<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void testRealKnown() {
+    runTest(new BasicFixedPointTests.TestKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void test_Real_Add_Secret() {
+    runTest(new BasicFixedPointTests.TestAdd<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void test_Real_Mult_Known() {
+    runTest(new BasicFixedPointTests.TestMultKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void test_Real_Mults() {
+    runTest(new TestMult<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+  @Test
+  public void test_Real_Mults_Isolated() {
+    runTest(new TestMultIsolated<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
+
   protected abstract int getMaxBitLength();
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 22b08557a..72624ff1e 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -221,7 +221,8 @@ public void testSubtract() {
             .toBigInteger()
     );
     assertEquals(
-        new BigInteger("1121381238012").subtract(new BigInteger("10261555690727498232")).mod(twoTo128),
+        new BigInteger("1121381238012").subtract(new BigInteger("10261555690727498232"))
+            .mod(twoTo128),
         new CompUInt128(new BigInteger("1121381238012"))
             .subtract(new CompUInt128(new BigInteger("10261555690727498232")))
             .toBigInteger()
@@ -368,9 +369,9 @@ public void testShiftRightSmall() {
 
   @Test
   public void testShiftRightLowOnly() {
-    byte[] bytes = new byte[16];
-    new Random(2).nextBytes(bytes);
-    CompUInt128 r = new CompUInt128(bytes);
+    assertEquals(BigInteger.ZERO, new CompUInt128(0).shiftRightLowOnly(16).toBigInteger());
+    assertEquals(BigInteger.ZERO, new CompUInt128(1).shiftRightLowOnly(16).toBigInteger());
+
     // top bit 0
     for (int i = 0; i < 63; i++) {
       CompUInt128 element = new CompUInt128(1L << i);
@@ -379,7 +380,8 @@ public void testShiftRightLowOnly() {
     }
     // top bit 1
     CompUInt128 element = new CompUInt128(BigInteger.ONE.shiftLeft(63));
-    assertEquals("Number of shifts " + 63, BigInteger.ONE.shiftLeft(63).negate().shiftRight(63).mod(twoTo64),
+    assertEquals("Number of shifts " + 63,
+        BigInteger.ONE.shiftLeft(63).negate().shiftRight(63).mod(twoTo64),
         element.shiftRightLowOnly(63).toBigInteger());
   }
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
index 4716a71c8..8dc560834 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
@@ -21,7 +21,11 @@
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -64,15 +68,31 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
         @Override
         public void test() {
-          final BigInteger input = BigInteger.valueOf(723121121381238012L);
-          Application<BigInteger, ProtocolBuilderNumeric> app =
+          List<BigInteger> inputs = Arrays.asList(
+              BigInteger.valueOf(-1),
+              BigInteger.ONE,
+              BigInteger.ZERO,
+              BigInteger.valueOf(2723121121381238012L),
+              BigInteger.valueOf(121121381238012L)
+          );
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
               root -> {
-                DRes<SInt> left = root.numeric().input(input, 1);
-                DRes<SInt> shifted = root.advancedNumeric().truncate(left, 42);
-                return root.numeric().open(shifted);
+                List<DRes<SInt>> result = new ArrayList<>(inputs.size());
+                for (BigInteger input : inputs) {
+                  result.add(
+                      root.advancedNumeric().truncate(root.numeric().input(input, 1), 16)
+                  );
+                }
+                return root.collections().openList(() -> result);
               };
-          BigInteger actual = runApplication(app);
-          Assert.assertEquals(input.shiftRight(42).mod(BigInteger.ONE.shiftLeft(42)), actual);
+          List<BigInteger> actuals = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          for (int i = 0; i < inputs.size(); i++) {
+            BigInteger expected = inputs.get(i).shiftRight(16).mod(BigInteger.ONE.shiftLeft(64));
+            BigInteger actual = actuals.get(i);
+            System.out.println(actual);
+            Assert.assertEquals(expected, actual);
+          }
         }
       };
     }

From 8f55f4581b70b4cada46e1141902828eae8dd05b Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 15:18:50 +0200
Subject: [PATCH 172/231] Only run simple eq test with mascot

---
 .../fresco/lib/compare/CompareTests.java      | 32 +++++++++++++++++++
 .../fresco/suite/spdz/TestSpdzComparison.java |  8 +----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index 53045a237..c98124eac 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -109,6 +109,38 @@ public void test() throws Exception {
     }
   }
 
+  public static class TestCompareEQSimple<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+
+        @Override
+        public void test() throws Exception {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
+            Numeric input = builder.numeric();
+            // Pair 1
+            DRes<SInt> x1 = input.known(BigInteger.valueOf(3));
+            DRes<SInt> y1 = input.known(BigInteger.valueOf(5));
+
+            Comparison comparison = builder.comparison();
+
+            DRes<SInt> compResult1 = comparison.equals(x1, x1);
+            DRes<SInt> compResult2 = comparison.equals(x1, y1);
+            Numeric open = builder.numeric();
+            DRes<BigInteger> res1 = open.open(compResult1);
+            DRes<BigInteger> res2 = open.open(compResult2);
+            return () -> Arrays.asList(res1.out(), res2.out());
+          };
+          List<BigInteger> output = runApplication(app);
+          Assert.assertEquals(BigInteger.ONE, output.get(0));
+          Assert.assertEquals(BigInteger.ZERO, output.get(1));
+        }
+      };
+    }
+  }
+
   /**
    * Compares the two numbers x and y and checks that x == x. Also checks that x != y
    */
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
index c371ef529..dbcd53768 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
@@ -78,13 +78,7 @@ public void testLessThanLogRounds() {
 
   @Test
   public void testCompareEQSequentialBatchedMascot() {
-    runTest(new CompareTests.TestCompareEQ<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
-        PreprocessingStrategy.MASCOT, 2, 64, 2, 1);
-  }
-
-  @Test
-  public void testCompareEQEdgeCasesBatchedMascot() {
-    runTest(new CompareTests.TestCompareEQEdgeCases<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+    runTest(new CompareTests.TestCompareEQSimple<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
         PreprocessingStrategy.MASCOT, 2, 64, 2, 1);
   }
 

From c542dbbc1d853d73440e61fcefca79e4df8bf286 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 16:53:40 +0200
Subject: [PATCH 173/231] Generify pre-processing based truncation

---
 .../builder/numeric/AdvancedNumeric.java      | 43 +++++++++++++++++-
 .../numeric/DefaultAdvancedNumeric.java       | 15 ++++++-
 .../value/BigIntegerOIntArithmetic.java       |  5 +++
 .../framework/value/OIntArithmetic.java       | 19 ++++----
 .../real/fixed/utils/TruncateFromPairs.java   | 39 ++++++++++++++++
 .../suite/spdz2k/Spdz2kAdvancedNumeric.java   | 21 ++++-----
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  2 +-
 .../spdz2k/datatypes/CompUIntArithmetic.java  |  5 +++
 .../computations/advanced/TruncateSpdz2k.java | 45 -------------------
 .../natives/Spdz2kTruncationPairProtocol.java |  8 ++--
 .../resource/storage/Spdz2kDataSupplier.java  |  4 +-
 .../storage/Spdz2kDummyDataSupplier.java      |  6 +--
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  |  1 -
 .../computations/TestTruncateSpdz2k.java      | 19 ++++++--
 14 files changed, 148 insertions(+), 84 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/TruncateFromPairs.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
index 01798f5e3..709d1fef0 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/AdvancedNumeric.java
@@ -192,9 +192,23 @@ DRes<SInt> innerProductWithPublicPart(DRes<List<OInt>> vectorA,
    *
    * @param input secret value to right shift
    * @param shifts number of shifts
+   * @param useTruncationPairs indicates whether truncation pairs are available as part of
+   * pre-processing material (this allows for a faster protocol)
    * @return shifted result
    */
-  DRes<SInt> truncate(DRes<SInt> input, int shifts);
+  DRes<SInt> truncate(DRes<SInt> input, int shifts, boolean useTruncationPairs);
+
+  default DRes<SInt> truncate(DRes<SInt> input, int shifts) {
+    return truncate(input, shifts, true);
+  }
+
+  /**
+   * Creates truncation pair ({@link TruncationPair}). <p>This method may rely on pre-processed
+   * material in which case it should be overridden by backend suits.</p>
+   *
+   * @param d number of shifts in truncation pair
+   */
+  DRes<TruncationPair> generateTruncationPair(int d);
 
   /**
    * @param input input.
@@ -307,4 +321,31 @@ public RandomAdditiveMask(List<DRes<SInt>> bits, SInt random) {
     }
   }
 
+  /**
+   * Generic representation of a truncation pair. <p> A truncation pair is pre-processing material
+   * used for probabilistic truncation. A truncation pair consists of a value r and r^{prime} such
+   * that r^{prime} is a random element and r = r^{prime} / 2^{d}, i.e., r right-shifted by d.</p>
+   */
+  class TruncationPair {
+
+    private final DRes<SInt> rPrime;
+    private final DRes<SInt> r;
+
+    public TruncationPair(
+        DRes<SInt> rPrime,
+        DRes<SInt> r) {
+      this.rPrime = rPrime;
+      this.r = r;
+    }
+
+    public DRes<SInt> getRPrime() {
+      return rPrime;
+    }
+
+    public DRes<SInt> getR() {
+      return r;
+    }
+
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
index c42c5030f..d47f0bfad 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultAdvancedNumeric.java
@@ -26,6 +26,7 @@
 import dk.alexandra.fresco.lib.math.integer.log.Logarithm;
 import dk.alexandra.fresco.lib.math.integer.sqrt.SquareRoot;
 import dk.alexandra.fresco.lib.real.fixed.utils.Truncate;
+import dk.alexandra.fresco.lib.real.fixed.utils.TruncateFromPairs;
 import java.math.BigInteger;
 import java.util.List;
 
@@ -137,8 +138,18 @@ public DRes<RandomBitMask> randomBitMask(DRes<List<DRes<SInt>>> randomBits) {
   }
 
   @Override
-  public DRes<SInt> truncate(DRes<SInt> input, int shifts) {
-    return builder.seq(new Truncate(input, shifts));
+  public DRes<SInt> truncate(DRes<SInt> input, int shifts, boolean useTruncationPairs) {
+    if (useTruncationPairs) {
+      return builder.seq(new TruncateFromPairs(input, shifts));
+    } else {
+      return builder.seq(new Truncate(input, shifts));
+    }
+  }
+
+  @Override
+  public DRes<TruncationPair> generateTruncationPair(int d) {
+    throw new UnsupportedOperationException(
+        "Online truncation pair generation currently not supported");
   }
 
   @Override
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 055f53356..d78513a21 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -10,6 +10,7 @@
  * via {@link BigInteger}.
  */
 public class BigIntegerOIntArithmetic implements OIntArithmetic {
+
   private static final BigInteger TWO = new BigInteger("2");
   private List<OInt> twoPowersList;
   private final OIntFactory factory;
@@ -69,4 +70,8 @@ public OInt modTwoTo(OInt input, int power) {
         power)));
   }
 
+  @Override
+  public OInt shiftRight(OInt input, int n) {
+    return factory.fromBigInteger(factory.toBigInteger(input).shiftRight(n));
+  }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index abdfb5551..28419e493 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -13,11 +13,9 @@ public interface OIntArithmetic {
   OInt one();
 
   /**
-   * Turns input value into bits in big-endian order.
-   * <p>
-   * If the actual bit length of the value is smaller than numBits, the result is padded with 0s. If
-   * the bit length is larger only the first numBits bits are used.
-   * </p>
+   * Turns input value into bits in big-endian order. <p> If the actual bit length of the value is
+   * smaller than numBits, the result is padded with 0s. If the bit length is larger only the first
+   * numBits bits are used. </p>
    */
   List<OInt> toBits(OInt openValue, int numBits);
 
@@ -35,12 +33,15 @@ public interface OIntArithmetic {
   /**
    * Reduces {@code input} modulo 2^{power}.
    *
-   * @param input
-   *          the input to reduce
-   * @param power
-   *          the two-power to reduce against
+   * @param input the input to reduce
+   * @param power the two-power to reduce against
    * @return the reduced input modulo the two-power
    */
   OInt modTwoTo(OInt input, int power);
 
+  /**
+   * Right-shifts input by n. <p>This is an unsigned shift.</p>
+   */
+  OInt shiftRight(OInt input, int n);
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/TruncateFromPairs.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/TruncateFromPairs.java
new file mode 100644
index 000000000..f90d70058
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/TruncateFromPairs.java
@@ -0,0 +1,39 @@
+package dk.alexandra.fresco.lib.real.fixed.utils;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+
+/**
+ * Probabilistic truncation protocol. <p>Described by Mohassel and Rindal in
+ * https://eprint.iacr.org/2018/403.pdf (Figure 3).</p>
+ */
+public class TruncateFromPairs implements Computation<SInt, ProtocolBuilderNumeric> {
+
+  private final DRes<SInt> input;
+  private final int shifts;
+
+  public TruncateFromPairs(DRes<SInt> input, int shifts) {
+    this.input = input;
+    this.shifts = shifts;
+  }
+
+  @Override
+  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
+    DRes<TruncationPair> truncationPairD = builder.advancedNumeric().generateTruncationPair(shifts);
+    return builder.seq(seq -> {
+      TruncationPair truncationPair = truncationPairD.out();
+      // TODO look into making fixed-point arithmetic  tests pass when we subtract here (to be
+      // consistent with original protocol)
+      DRes<SInt> masked = seq.numeric().add(input, truncationPair.getRPrime());
+      return seq.numeric().openAsOInt(masked);
+    }).seq((seq, opened) -> {
+      OInt shifted = seq.getOIntArithmetic().shiftRight(opened, shifts);
+      DRes<SInt> r = truncationPairD.out().getR();
+      return seq.numeric().subFromOpen(shifted, r);
+    });
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
index 8c93667e2..d143bfa74 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
@@ -4,27 +4,22 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.advanced.TruncateSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kTruncationPairProtocol;
 
-public class Spdz2kAdvancedNumeric<PlainT extends CompUInt<?, ?, PlainT>>  extends DefaultAdvancedNumeric {
-
-  private final CompUIntFactory<PlainT> compUIntFactory;
+/**
+ * Spdz2k-specific advanced numeric functionality.
+ */
+public class Spdz2kAdvancedNumeric extends DefaultAdvancedNumeric {
 
   Spdz2kAdvancedNumeric(
       BuilderFactoryNumeric factoryNumeric,
-      ProtocolBuilderNumeric builder,
-      CompUIntFactory<PlainT> compUIntFactory) {
+      ProtocolBuilderNumeric builder) {
     super(factoryNumeric, builder);
-    this.compUIntFactory = compUIntFactory;
   }
 
   @Override
-  public DRes<SInt> truncate(DRes<SInt> input, int shifts) {
-//    return new Sp
-    return builder.seq(new TruncateSpdz2k<>(input, shifts, compUIntFactory));
+  public DRes<TruncationPair> generateTruncationPair(int d) {
+    return builder.seq(seq -> seq.append(new Spdz2kTruncationPairProtocol<>(d)));
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 86d274625..d9a05b5cc 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -82,7 +82,7 @@ public Logical createLogical(ProtocolBuilderNumeric builder) {
 
   @Override
   public AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
-    return new Spdz2kAdvancedNumeric<>(this, builder, factory);
+    return new Spdz2kAdvancedNumeric(this, builder);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index e0105134e..dba799f62 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -75,4 +75,9 @@ private List<OInt> initializePowersOfTwo(int numPowers) {
     return powers;
   }
 
+  @Override
+  public OInt shiftRight(OInt input, int n) {
+    return factory.fromOInt(input).shiftRightLowOnly(n);
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
deleted file mode 100644
index fec4fcebe..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/advanced/TruncateSpdz2k.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.computations.advanced;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.Computation;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kTruncationPairProtocol;
-
-/**
- * Probabilistic truncation protocol.
- *
- * Described by Mohassel and Rindal in https://eprint.iacr.org/2018/403.pdf (Figure 3).
- */
-public class TruncateSpdz2k<PlainT extends CompUInt<?, ?, PlainT>> implements
-    Computation<SInt, ProtocolBuilderNumeric> {
-
-  private final DRes<SInt> value;
-  private final int d;
-  private final CompUIntFactory<PlainT> factory;
-
-  public TruncateSpdz2k(DRes<SInt> value, int d, CompUIntFactory<PlainT> factory) {
-    this.value = value;
-    this.d = d;
-    this.factory = factory;
-  }
-
-  @Override
-  public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    DRes<Spdz2kTruncationPair<PlainT>> truncationPairD = builder
-        .append(new Spdz2kTruncationPairProtocol<>(d));
-    return builder.seq(seq -> {
-      Spdz2kTruncationPair<PlainT> truncationPair = truncationPairD.out();
-      DRes<SInt> masked = seq.numeric().add(value, truncationPair.getRPrime());
-      return seq.numeric().openAsOInt(masked);
-    }).seq((seq, openedOInt) -> {
-      PlainT opened = factory.fromOInt(openedOInt);
-      PlainT shifted = opened.shiftRightLowOnly(d);
-      DRes<SInt> r = truncationPairD.out().getR();
-      return seq.numeric().subFromOpen(shifted, r);
-    });
-  }
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java
index c3300cea0..f80fbcc13 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTruncationPairProtocol.java
@@ -1,14 +1,14 @@
 package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
 
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
 import dk.alexandra.fresco.framework.network.Network;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 
 public class Spdz2kTruncationPairProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
-    Spdz2kNativeProtocol<Spdz2kTruncationPair<PlainT>, PlainT> {
+    Spdz2kNativeProtocol<TruncationPair, PlainT> {
 
-  private Spdz2kTruncationPair<PlainT> pair;
+  private TruncationPair pair;
   private final int d;
 
   public Spdz2kTruncationPairProtocol(int d) {
@@ -23,7 +23,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
   }
 
   @Override
-  public Spdz2kTruncationPair<PlainT> out() {
+  public TruncationPair out() {
     return pair;
   }
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
index 9ff7ef08a..f390f4796 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDataSupplier.java
@@ -1,11 +1,11 @@
 package dk.alexandra.fresco.suite.spdz2k.resource.storage;
 
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
 
 /**
  * Interface for a supplier of pre-processing material. <p>Material includes random elements shares,
@@ -55,6 +55,6 @@ public interface Spdz2kDataSupplier<T extends CompUInt<?, ?, T>> {
    *
    * @param d number of shifts
    */
-  Spdz2kTruncationPair<T> getNextTruncationPair(int d);
+  TruncationPair getNextTruncationPair(int d);
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index 0f2633f6d..427977aeb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz2k.resource.storage;
 
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
 import dk.alexandra.fresco.framework.util.ArithmeticDummyDataSupplier;
 import dk.alexandra.fresco.framework.util.MultiplicationTripleShares;
 import dk.alexandra.fresco.framework.util.Pair;
@@ -10,7 +11,6 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTruncationPair;
 import java.math.BigInteger;
 
 /**
@@ -83,9 +83,9 @@ public Spdz2kSIntArithmetic<PlainT> getNextRandomElementShare() {
   }
 
   @Override
-  public Spdz2kTruncationPair<PlainT> getNextTruncationPair(int d) {
+  public TruncationPair getNextTruncationPair(int d) {
     TruncationPairShares pair = supplier.getTruncationPairShares(d);
-    return new Spdz2kTruncationPair<>(toSpdz2kSInt(pair.getRPrime()), toSpdz2kSInt(pair.getR()));
+    return new TruncationPair(toSpdz2kSInt(pair.getRPrime()), toSpdz2kSInt(pair.getR()));
   }
 
   private Spdz2kSIntArithmetic<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> raw) {
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index 4e1b77bf3..f04fbb223 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -231,7 +231,6 @@ public void test_Real_Mults_Isolated() {
     runTest(new TestMultIsolated<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
-
   protected abstract int getMaxBitLength();
 
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
index 8dc560834..c776fa106 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestTruncateSpdz2k.java
@@ -61,6 +61,8 @@ public void testTruncate() {
   public static class TestTruncate<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
+    private int maxBitLength;
+
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
 
@@ -83,18 +85,29 @@ public void test() {
                       root.advancedNumeric().truncate(root.numeric().input(input, 1), 16)
                   );
                 }
+                maxBitLength = root.getBasicNumericContext().getMaxBitLength();
                 return root.collections().openList(() -> result);
               };
           List<BigInteger> actuals = runApplication(app).stream().map(DRes::out)
               .collect(Collectors.toList());
+          BigInteger modulus = BigInteger.ONE.shiftLeft(maxBitLength);
           for (int i = 0; i < inputs.size(); i++) {
-            BigInteger expected = inputs.get(i).shiftRight(16).mod(BigInteger.ONE.shiftLeft(64));
+            BigInteger expected = inputs.get(i).shiftRight(16).mod(modulus);
             BigInteger actual = actuals.get(i);
-            System.out.println(actual);
-            Assert.assertEquals(expected, actual);
+            assertWithinOne(expected, actual, modulus);
           }
         }
       };
     }
   }
+
+  private static void assertWithinOne(BigInteger expected, BigInteger actual, BigInteger modulus) {
+    BigInteger difference = expected.subtract(actual).mod(modulus);
+    String failureMessage = "Actual " + actual + " != " + expected + "+/-1";
+    Assert.assertTrue(failureMessage,
+        difference.equals(BigInteger.ZERO)
+            || difference.equals(BigInteger.ONE)
+            || difference.equals(BigInteger.valueOf(-1).mod(modulus)));
+  }
+
 }

From 507e907bec83ae4fced0c7a9da4d0041a835c4ba Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 16:54:22 +0200
Subject: [PATCH 174/231] Remove unused spdz2k truncation class

---
 .../datatypes/Spdz2kTruncationPair.java       | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java
deleted file mode 100644
index 92ae92cb4..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kTruncationPair.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.datatypes;
-
-/**
- * Sdpz2k representation of a truncation pair. <p> A truncation pair is pre-processing material
- * used for probabilistic truncation. A truncation pair consists of a value r and r^{prime} such
- * that r^{prime} is a random element and r = r^{prime} / 2^{d}, i.e., r right-shifted by d.</p>
- */
-public class Spdz2kTruncationPair<PlainT extends CompUInt<?, ?, PlainT>> {
-  private final Spdz2kSIntArithmetic<PlainT> rPrime;
-  private final Spdz2kSIntArithmetic<PlainT> r;
-
-  public Spdz2kTruncationPair(
-      Spdz2kSIntArithmetic<PlainT> rPrime,
-      Spdz2kSIntArithmetic<PlainT> r) {
-    this.rPrime = rPrime;
-    this.r = r;
-  }
-
-  public Spdz2kSIntArithmetic<PlainT> getR() {
-    return r;
-  }
-
-  public Spdz2kSIntArithmetic<PlainT> getRPrime() {
-    return rPrime;
-  }
-}

From b26766f214a21c793de9c7fcadc0cd432d962e65 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 18:10:04 +0200
Subject: [PATCH 175/231] Add dummy trunc pair generation

---
 .../fresco/lib/real/fixed/utils/Truncate.java |  4 ++-
 .../DummyArithmeticBuilderFactory.java        | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java
index 18d55f7ac..b07ceb904 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/real/fixed/utils/Truncate.java
@@ -15,7 +15,7 @@
  * result will be one larger than the exact result with some non-negligible propability. If you need
  * the exact result you need to use {@link RightShift} instead, but this will be at a significant
  * performance cost.
- * 
+ *
  * The protocol is similar to protocol 3.1 in Catrina O., Saxena A. (2010) Secure Computation with
  * Fixed-Point Numbers. In: Sion R. (eds) Financial Cryptography and Data Security. FC 2010. Lecture
  * Notes in Computer Science, vol 6052. Springer, Berlin, Heidelberg.
@@ -33,6 +33,8 @@ public Truncate(DRes<SInt> input, int shifts) {
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric sequential) {
+    // TODO double-check that this is secure.
+    // shouldn't we be generating maxBitLength + statistical security param number of bits?
     return sequential.seq((builder) -> {
       /*
        * Generate random additive mask of the same length as the input + some extra to avoid
diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index 91ff33477..4b5f07aa7 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -1,8 +1,10 @@
 package dk.alexandra.fresco.suite.dummy.arithmetic;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Conversion;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.network.Network;
@@ -55,6 +57,11 @@ public RealNumericContext getRealNumericContext() {
     return realNumericContext;
   }
 
+  @Override
+  public AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
+    return new DummyAdvancedNumeric(this, builder, rand);
+  }
+
   @Override
   public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
@@ -268,4 +275,31 @@ public OIntArithmetic getOIntArithmetic() {
     return oIntArithmetic;
   }
 
+  class DummyAdvancedNumeric extends DefaultAdvancedNumeric {
+
+    private final Random rand;
+
+    DummyAdvancedNumeric(
+        BuilderFactoryNumeric factoryNumeric,
+        ProtocolBuilderNumeric builder,
+        Random rand) {
+      super(factoryNumeric, builder);
+      this.rand = rand;
+    }
+
+    @Override
+    public DRes<TruncationPair> generateTruncationPair(int d) {
+      return builder.seq(seq -> {
+        // TODO check if random value should be from bigger space
+        BigInteger rPrimeOpen = new BigInteger(
+            builder.getBasicNumericContext().getMaxBitLength(),
+            rand);
+        BigInteger rOpen = rPrimeOpen.shiftRight(d);
+        DRes<SInt> rPrime = seq.numeric().input(rPrimeOpen, 1);
+        DRes<SInt> r = seq.numeric().input(rOpen, 1);
+        return () -> new TruncationPair(rPrime, r);
+      });
+    }
+  }
+
 }

From f2cbb508986c650b3ec953aba8612ee3288666cd Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 19 Jun 2018 19:11:42 +0200
Subject: [PATCH 176/231] Spdz truncation pair dummy pre-processing

---
 .../fresco/suite/spdz/SpdzBuilder.java        | 29 +++++++++++++++++++
 .../gates/SpdzTruncationPairProtocol.java     | 29 +++++++++++++++++++
 .../suite/spdz/storage/SpdzDataSupplier.java  |  8 +++++
 .../spdz/storage/SpdzDummyDataSupplier.java   | 24 +++++++++++++--
 .../spdz/storage/SpdzMascotDataSupplier.java  |  6 ++++
 .../spdz/storage/SpdzStorageDataSupplier.java |  6 ++++
 .../suite/spdz/TestSpdzRealNumeric.java       | 16 ++++++++++
 7 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzTruncationPairProtocol.java
 create mode 100644 suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index c89cb536e..77758be39 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -1,8 +1,10 @@
 package dk.alexandra.fresco.suite.spdz;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Conversion;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.PreprocessedValues;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
@@ -15,6 +17,7 @@
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
 import dk.alexandra.fresco.lib.real.RealNumericContext;
+import dk.alexandra.fresco.lib.real.fixed.utils.Truncate;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputProtocol;
@@ -27,6 +30,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzSubtractProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzSubtractProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzSubtractProtocolKnownRight;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzTruncationPairProtocol;
 import java.math.BigInteger;
 
 /**
@@ -66,6 +70,11 @@ public PreprocessedValues createPreprocessedValues(ProtocolBuilderNumeric protoc
     };
   }
 
+  @Override
+  public AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
+    return new SpdzAdvancedNumeric(this, builder);
+  }
+
   @Override
   public Numeric createNumeric(ProtocolBuilderNumeric protocolBuilder) {
     return new Numeric() {
@@ -214,4 +223,24 @@ public OIntArithmetic getOIntArithmetic() {
     return oIntArithmetic;
   }
 
+  class SpdzAdvancedNumeric extends DefaultAdvancedNumeric {
+
+    protected SpdzAdvancedNumeric(
+        BuilderFactoryNumeric factoryNumeric,
+        ProtocolBuilderNumeric builder) {
+      super(factoryNumeric, builder);
+    }
+
+    @Override
+    public DRes<SInt> truncate(DRes<SInt> input, int shifts, boolean useTruncationPairs) {
+      // TODO something broken, even with original protocol
+      return builder.seq(new Truncate(input, shifts));
+    }
+
+    @Override
+    public DRes<TruncationPair> generateTruncationPair(int d) {
+      return builder.append(new SpdzTruncationPairProtocol(d));
+    }
+  }
+
 }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzTruncationPairProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzTruncationPairProtocol.java
new file mode 100644
index 000000000..bc18f4058
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzTruncationPairProtocol.java
@@ -0,0 +1,29 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+
+public class SpdzTruncationPairProtocol extends
+    SpdzNativeProtocol<TruncationPair> {
+
+  private TruncationPair pair;
+  private final int d;
+
+  public SpdzTruncationPairProtocol(int d) {
+    this.d = d;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool resourcePool,
+      Network network) {
+    pair = resourcePool.getDataSupplier().getNextTruncationPair(d);
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public TruncationPair out() {
+    return pair;
+  }
+
+}
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDataSupplier.java
index e57e23786..1023cceb5 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDataSupplier.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz.storage;
 
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestBruteforce;
 import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
 import dk.alexandra.fresco.suite.spdz.datatypes.SpdzInputMask;
@@ -62,4 +63,11 @@ public interface SpdzDataSupplier {
    */
   SpdzSInt getNextRandomFieldElement();
 
+  /**
+   * Supplies the next truncation pair (r^{prime}, r) where r = r^{prime} / 2^{d}.
+   *
+   * @param d number of shifts
+   */
+  TruncationPair getNextTruncationPair(int d);
+
 }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
index a8289badd..f1791c098 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
@@ -1,9 +1,11 @@
 package dk.alexandra.fresco.suite.spdz.storage;
 
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
 import dk.alexandra.fresco.framework.util.ArithmeticDummyDataSupplier;
 import dk.alexandra.fresco.framework.util.ModulusFinder;
 import dk.alexandra.fresco.framework.util.MultiplicationTripleShares;
 import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.TruncationPairShares;
 import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
 import dk.alexandra.fresco.suite.spdz.datatypes.SpdzInputMask;
 import dk.alexandra.fresco.suite.spdz.datatypes.SpdzTriple;
@@ -13,11 +15,14 @@
 
 public class SpdzDummyDataSupplier implements SpdzDataSupplier {
 
+  private static int DEFAULT_MAX_BIT_LENGTH;
+
   private final int myId;
   private final ArithmeticDummyDataSupplier supplier;
   private final BigInteger modulus;
   private final BigInteger secretSharedKey;
   private final int expPipeLength;
+  private final int maxBitLength;
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers) {
     // TODO kill this
@@ -37,11 +42,18 @@ public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
       BigInteger secretSharedKey, int expPipeLength) {
+    this(myId, noOfPlayers, modulus, secretSharedKey, expPipeLength, DEFAULT_MAX_BIT_LENGTH);
+  }
+
+  public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
+      BigInteger secretSharedKey, int expPipeLength, int maxBitLength) {
     this.myId = myId;
     this.modulus = modulus;
     this.secretSharedKey = secretSharedKey;
     this.expPipeLength = expPipeLength;
-    this.supplier = new ArithmeticDummyDataSupplier(myId, noOfPlayers, modulus);
+    this.maxBitLength = maxBitLength;
+    this.supplier = new ArithmeticDummyDataSupplier(myId, noOfPlayers, modulus,
+        BigInteger.ONE.shiftLeft(maxBitLength));
   }
 
   @Override
@@ -55,7 +67,7 @@ public SpdzTriple getNextTriple() {
 
   @Override
   public SpdzSInt[] getNextExpPipe() {
-    List<Pair<BigInteger,BigInteger>> rawExpPipe = supplier.getExpPipe(expPipeLength);
+    List<Pair<BigInteger, BigInteger>> rawExpPipe = supplier.getExpPipe(expPipeLength);
     return rawExpPipe.stream()
         .map(this::toSpdzSInt)
         .toArray(SpdzSInt[]::new);
@@ -63,7 +75,7 @@ public SpdzSInt[] getNextExpPipe() {
 
   @Override
   public SpdzInputMask getNextInputMask(int towardPlayerId) {
-    Pair<BigInteger,BigInteger> raw = supplier.getRandomElementShare();
+    Pair<BigInteger, BigInteger> raw = supplier.getRandomElementShare();
     if (myId == towardPlayerId) {
       return new SpdzInputMask(toSpdzSInt(raw), raw.getFirst());
     } else {
@@ -91,6 +103,12 @@ public SpdzSInt getNextRandomFieldElement() {
     return toSpdzSInt(supplier.getRandomElementShare());
   }
 
+  @Override
+  public TruncationPair getNextTruncationPair(int d) {
+    TruncationPairShares pair = supplier.getTruncationPairShares(d);
+    return new TruncationPair(toSpdzSInt(pair.getRPrime()), toSpdzSInt(pair.getR()));
+  }
+
   private SpdzSInt toSpdzSInt(Pair<BigInteger, BigInteger> raw) {
     return new SpdzSInt(
         raw.getSecond(),
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzMascotDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzMascotDataSupplier.java
index 925b9853b..713f73877 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzMascotDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzMascotDataSupplier.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz.storage;
 
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
 import dk.alexandra.fresco.framework.network.Network;
 import dk.alexandra.fresco.framework.util.Drbg;
 import dk.alexandra.fresco.framework.util.PaddingAesCtrDrbg;
@@ -171,6 +172,11 @@ public SpdzSInt getNextBit() {
     return MascotFormatConverter.toSpdzSInt(randomBits.pop());
   }
 
+  @Override
+  public TruncationPair getNextTruncationPair(int d) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   @Override
   public BigInteger getModulus() {
     return modulus;
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzStorageDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzStorageDataSupplier.java
index 8a8623f2b..738224040 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzStorageDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzStorageDataSupplier.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz.storage;
 
+import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric.TruncationPair;
 import dk.alexandra.fresco.framework.sce.resources.storage.StreamedStorage;
 import dk.alexandra.fresco.framework.sce.resources.storage.exceptions.NoMoreElementsException;
 import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
@@ -62,6 +63,11 @@ public SpdzStorageDataSupplier(StreamedStorage storage, String storageName,
     this.inputMaskCounters = new int[noOfParties];
   }
 
+  @Override
+  public TruncationPair getNextTruncationPair(int d) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   @Override
   public SpdzTriple getNextTriple() {
     SpdzTriple trip;
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java
new file mode 100644
index 000000000..694e629da
--- /dev/null
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java
@@ -0,0 +1,16 @@
+package dk.alexandra.fresco.suite.spdz;
+
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
+import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMultIsolated;
+import dk.alexandra.fresco.suite.spdz.configuration.PreprocessingStrategy;
+import org.junit.Test;
+
+public class TestSpdzRealNumeric extends AbstractSpdzTest {
+
+  @Test
+  public void test_Real_Mults_Isolated() {
+    runTest(new TestMultIsolated<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+}

From 2f7f9aa5e5d5f6378428e1869e901ef0affc71de Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 20 Jun 2018 14:36:05 +0200
Subject: [PATCH 177/231] Remove failing test for now

---
 .../alexandra/fresco/lib/real/BasicFixedPointTests.java  | 3 ++-
 .../java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java | 9 +--------
 .../alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java | 6 +++---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
index 80aab594b..2e7ea1df7 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/real/BasicFixedPointTests.java
@@ -465,7 +465,8 @@ public void test() throws Exception {
             BigDecimal b = openInputs2.get(idx);
             int precisionLoss = Math.max(
                 Math.max(RealTestUtils.floorLog2(a), RealTestUtils.floorLog2(b)),
-                0);
+                0
+            );
             RealTestUtils.assertEqual(a.multiply(b), openOutput,
                 DEFAULT_PRECISION - 1 - precisionLoss);
           }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 77758be39..51459b765 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -17,7 +17,6 @@
 import dk.alexandra.fresco.lib.compare.MiscBigIntegerGenerators;
 import dk.alexandra.fresco.lib.field.integer.BasicNumericContext;
 import dk.alexandra.fresco.lib.real.RealNumericContext;
-import dk.alexandra.fresco.lib.real.fixed.utils.Truncate;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputProtocol;
@@ -230,13 +229,7 @@ protected SpdzAdvancedNumeric(
         ProtocolBuilderNumeric builder) {
       super(factoryNumeric, builder);
     }
-
-    @Override
-    public DRes<SInt> truncate(DRes<SInt> input, int shifts, boolean useTruncationPairs) {
-      // TODO something broken, even with original protocol
-      return builder.seq(new Truncate(input, shifts));
-    }
-
+    
     @Override
     public DRes<TruncationPair> generateTruncationPair(int d) {
       return builder.append(new SpdzTruncationPairProtocol(d));
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java
index 694e629da..f14eca35e 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRealNumeric.java
@@ -1,15 +1,15 @@
 package dk.alexandra.fresco.suite.spdz;
 
 import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
-import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMultIsolated;
+import dk.alexandra.fresco.lib.real.BasicFixedPointTests.TestMult;
 import dk.alexandra.fresco.suite.spdz.configuration.PreprocessingStrategy;
 import org.junit.Test;
 
 public class TestSpdzRealNumeric extends AbstractSpdzTest {
 
   @Test
-  public void test_Real_Mults_Isolated() {
-    runTest(new TestMultIsolated<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+  public void test_Real_Mults() {
+    runTest(new TestMult<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
         PreprocessingStrategy.DUMMY, 2);
   }
 

From 3e7f891855f04305baf4cf1f5b1a07aec4f7d071 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 20 Jun 2018 14:50:22 +0200
Subject: [PATCH 178/231] Oblivious selection

---
 .../framework/builder/numeric/Collections.java       | 12 +++++++++---
 .../builder/numeric/DefaultCollections.java          |  7 +++++++
 .../dk/alexandra/fresco/suite/spdz/SpdzBuilder.java  |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java
index f41d0e65d..24cf82e63 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Collections.java
@@ -123,6 +123,12 @@ <T extends DRes<SInt>> DRes<Matrix<DRes<SInt>>> swapNeighborsIf(
       DRes<List<T>> conditions,
       DRes<Matrix<T>> mat);
 
+  /**
+   * Obliviously selects a value from list according to selection bits. <p>Selection bits are
+   * assumed to be all zero except for the bit at the index of desired element.</p>
+   */
+  DRes<SInt> select(DRes<List<DRes<SInt>>> selectionBits, DRes<List<DRes<SInt>>> values);
+
   // Permutations
 
   /**
@@ -133,7 +139,7 @@ <T extends DRes<SInt>> DRes<Matrix<DRes<SInt>>> swapNeighborsIf(
    * @param idxPerm encodes the desired permutation by supplying for each index a new index
    * @return permuted rows
    */
-   DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int[] idxPerm);
+  DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int[] idxPerm);
 
   /**
    * Permutes the rows of <code>values</code> according to <code>idxPerm</code>. <br> To be called
@@ -158,8 +164,8 @@ <T extends DRes<SInt>> DRes<Matrix<DRes<SInt>>> swapNeighborsIf(
   /**
    * Performs a SQL-like group-by sum operation. Groups rows by column <code>groupColIdx</code> and
    * sums values in resulting groups in column <code>aggColIdx</code>. <br> NOTE: this particular
-   * implementation leaks equality of values in column
-   * <code>groupColIdx</code> and the size of the result.
+   * implementation leaks equality of values in column <code>groupColIdx</code> and the size of the
+   * result.
    *
    * @param values rows to be aggregated
    * @param groupColIdx column to group by
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
index c0b89ec07..95eecbfd9 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultCollections.java
@@ -94,6 +94,13 @@ public <T extends DRes<SInt>> DRes<Matrix<DRes<SInt>>> swapNeighborsIf(DRes<List
     return builder.par(new SwapNeighborsIf<>(conditions, rows));
   }
 
+  @Override
+  public DRes<SInt> select(DRes<List<DRes<SInt>>> selectionBits,
+      DRes<List<DRes<SInt>>> values) {
+    return builder
+        .seq(seq -> seq.advancedNumeric().innerProduct(selectionBits.out(), values.out()));
+  }
+
   @Override
   public DRes<Matrix<DRes<SInt>>> permute(DRes<Matrix<DRes<SInt>>> values, int[] idxPerm) {
     return builder
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 51459b765..0039ab17a 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -229,7 +229,7 @@ protected SpdzAdvancedNumeric(
         ProtocolBuilderNumeric builder) {
       super(factoryNumeric, builder);
     }
-    
+
     @Override
     public DRes<TruncationPair> generateTruncationPair(int d) {
       return builder.append(new SpdzTruncationPairProtocol(d));

From a9d7e99837342aac9119ec2ca7e3c0523e88f12e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 20 Aug 2018 11:50:03 +0200
Subject: [PATCH 179/231] Also export test jar

---
 suite/spdz2k/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/suite/spdz2k/pom.xml b/suite/spdz2k/pom.xml
index c5d63a24d..6a51dfdb2 100644
--- a/suite/spdz2k/pom.xml
+++ b/suite/spdz2k/pom.xml
@@ -30,6 +30,24 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

From 5763724132ba818942011635178fe8db0454c03e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 20 Aug 2018 13:24:27 +0200
Subject: [PATCH 180/231] Logical arithmetic hack

---
 .../builder/numeric/BuilderFactoryNumeric.java        |  8 +++++++-
 .../builder/numeric/ProtocolBuilderNumeric.java       | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
index c586da503..174dd3918 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/BuilderFactoryNumeric.java
@@ -13,7 +13,6 @@
 import dk.alexandra.fresco.lib.real.fixed.AdvancedFixedNumeric;
 import dk.alexandra.fresco.lib.real.fixed.DefaultFixedNumeric;
 import dk.alexandra.fresco.lib.real.fixed.FixedLinearAlgebra;
-import dk.alexandra.fresco.lib.real.fixed.SemiFixedNumeric;
 
 /**
  * The core factory to implement when creating a numeric protocol. Every {@link
@@ -80,6 +79,13 @@ default Logical createLogical(ProtocolBuilderNumeric builder) {
     return new DefaultLogical(builder);
   }
 
+  // TODO this is a hack to enable logical operations over arithmetic values in Spdz2k.
+  // we need a way of gracefully handling protocol suites that support both arithmetic and boolean
+  // operations
+  default Logical createLogicalArithmetic(ProtocolBuilderNumeric builder) {
+    return new DefaultLogical(builder);
+  }
+
   /**
    * Returns a builder which can be helpful while developing a new protocol. Be very careful though,
    * to include this in any production code since the debugging opens values to all parties.
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
index bc414473f..962cdf218 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/ProtocolBuilderNumeric.java
@@ -29,6 +29,7 @@ public class ProtocolBuilderNumeric extends ProtocolBuilderImpl<ProtocolBuilderN
   private AdvancedRealNumeric advancedRealNumeric;
   private RealLinearAlgebra realLinearAlgebra;
   private Logical logical;
+  private Logical logicalArithmetic;
   private Conversion conversion;
   private RealNumericContext realNumericContext;
 
@@ -116,6 +117,16 @@ public Logical logical() {
     return logical;
   }
 
+  // TODO this is a hack to enable logical operations over arithmetic values in Spdz2k.
+  // we need a way of gracefully handling protocol suites that support both arithmetic and boolean
+  // operations
+  public Logical logicalArithmetic() {
+    if (logicalArithmetic == null) {
+      logicalArithmetic = factory.createLogicalArithmetic(this);
+    }
+    return logicalArithmetic;
+  }
+
   /**
    * Creates a {@link Conversion} computation directory for this instance - i.e. this intended
    * producer. Contains operations for converting between arithmetic and boolean representations of

From 3cfc167fe087c36c2f95634a718a294139ef7deb Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 28 Aug 2018 13:53:03 +0200
Subject: [PATCH 181/231] Additional arithmetic and uint fixes

---
 .../framework/util/ArithmeticDummyDataSupplier.java    |  6 ++++--
 .../framework/value/BigIntegerOIntArithmetic.java      | 10 ++++++++++
 .../fresco/framework/value/OIntArithmetic.java         | 10 ++++++++++
 .../fresco/suite/spdz2k/datatypes/CompUInt.java        |  3 +--
 .../fresco/suite/spdz2k/datatypes/CompUInt128.java     |  5 +++++
 .../suite/spdz2k/datatypes/CompUIntArithmetic.java     | 10 ++++++++++
 .../alexandra/fresco/suite/spdz2k/datatypes/UInt.java  |  5 +++++
 .../fresco/suite/spdz2k/datatypes/UInt32.java          |  5 +++++
 .../fresco/suite/spdz2k/datatypes/UInt64.java          |  5 +++++
 .../fresco/suite/spdz2k/datatypes/TestCompUInt128.java |  9 +--------
 10 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
index 284df1594..0c72ca277 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
@@ -34,7 +34,7 @@ public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus
   }
 
   public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus) {
-    this(myId, noOfParties, modulus, modulus);
+    this(myId, noOfParties, modulus, modulus.subtract(BigInteger.ONE));
   }
 
   /**
@@ -104,12 +104,14 @@ public List<Pair<BigInteger, BigInteger>> getExpPipe(int expPipeLength) {
   }
 
   private BigInteger sampleRandomBigInteger() {
-    return new BigInteger(modBitLength, random).mod(maxOpenValue);
+    BigInteger randomElement = new BigInteger(modBitLength, random);
+    return randomElement.mod(maxOpenValue);
   }
 
   private List<BigInteger> getOpenExpPipe(int expPipeLength) {
     List<BigInteger> openExpPipe = new ArrayList<>(expPipeLength);
     BigInteger first = sampleRandomBigInteger();
+    System.out.println(first + " " + modulus);
     BigInteger inverse = first.modInverse(modulus);
     openExpPipe.add(inverse);
     openExpPipe.add(first);
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index d78513a21..3bb9bcbb9 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -21,6 +21,16 @@ public BigIntegerOIntArithmetic(OIntFactory factory) {
     twoPowersList.add(new BigIntegerOInt(BigInteger.ONE));
   }
 
+  @Override
+  public boolean isZero(OInt openValue) {
+    return factory.toBigInteger(openValue).equals(BigInteger.ZERO);
+  }
+
+  @Override
+  public boolean isOne(OInt openValue) {
+    return factory.toBigInteger(openValue).equals(BigInteger.ONE);
+  }
+
   @Override
   public OInt one() {
     return factory.one();
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
index 28419e493..5757444ee 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntArithmetic.java
@@ -7,6 +7,16 @@
  */
 public interface OIntArithmetic {
 
+  /**
+   * Checks if value is equal to 0.
+   */
+  boolean isZero(OInt openValue);
+
+  /**
+   * Checks if value is equal to 1.
+   */
+  boolean isOne(OInt openValue);
+
   /**
    * Returns the number one as a deferred opened int.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 470c945b5..9d236018e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -41,8 +41,7 @@ public interface CompUInt<
   CompT shiftRightSmall(int n);
 
   /**
-   * Signed right shift by n bits where n < k in the least significant bits only. <p>NOTE: this
-   * performs sign extension and only affects least significant bits.</p>
+   * Unsigned right shift by n bits where n < k in the least significant bits only.
    */
   CompT shiftRightLowOnly(int n);
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 2dd0ff305..4d8e684c1 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -147,6 +147,11 @@ public boolean isZero() {
     return low == 0 && mid == 0 && high == 0;
   }
 
+  @Override
+  public boolean isOne() {
+    return low == 1 && mid == 0 && high == 0;
+  }
+
   @Override
   public BigInteger toBigInteger() {
     return new BigInteger(1, toByteArray());
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
index dba799f62..1f457181d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntArithmetic.java
@@ -19,6 +19,16 @@ public CompUIntArithmetic(CompUIntFactory<CompT> factory) {
     this.powersOfTwo = initializePowersOfTwo(factory.getLowBitLength());
   }
 
+  @Override
+  public boolean isZero(OInt openValue) {
+    return factory.fromOInt(openValue).isZero();
+  }
+
+  @Override
+  public boolean isOne(OInt openValue) {
+    return factory.fromOInt(openValue).isOne();
+  }
+
   @Override
   public OInt one() {
     return factory.one();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java
index 77ae55987..5d527c84d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt.java
@@ -35,6 +35,11 @@ public interface UInt<T extends UInt> {
    */
   boolean isZero();
 
+  /**
+   * Check if values is one.
+   */
+  boolean isOne();
+
   /**
    * Return bit length.
    */
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt32.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt32.java
index 077e91019..45e246d3c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt32.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt32.java
@@ -40,6 +40,11 @@ public boolean isZero() {
     return value == 0;
   }
 
+  @Override
+  public boolean isOne() {
+    return value == 1;
+  }
+
   @Override
   public int getBitLength() {
     return 32;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt64.java
index 84999ea29..6d6d8adaa 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt64.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/UInt64.java
@@ -40,6 +40,11 @@ public boolean isZero() {
     return value == 0;
   }
 
+  @Override
+  public boolean isOne() {
+    return value == 1;
+  }
+
   @Override
   public int getBitLength() {
     return 64;
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
index 72624ff1e..b0f6f4312 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt128.java
@@ -371,18 +371,11 @@ public void testShiftRightSmall() {
   public void testShiftRightLowOnly() {
     assertEquals(BigInteger.ZERO, new CompUInt128(0).shiftRightLowOnly(16).toBigInteger());
     assertEquals(BigInteger.ZERO, new CompUInt128(1).shiftRightLowOnly(16).toBigInteger());
-
-    // top bit 0
-    for (int i = 0; i < 63; i++) {
+    for (int i = 0; i < 64; i++) {
       CompUInt128 element = new CompUInt128(1L << i);
       assertEquals("Number of shifts " + i, BigInteger.ONE,
           element.shiftRightLowOnly(i).toBigInteger());
     }
-    // top bit 1
-    CompUInt128 element = new CompUInt128(BigInteger.ONE.shiftLeft(63));
-    assertEquals("Number of shifts " + 63,
-        BigInteger.ONE.shiftLeft(63).negate().shiftRight(63).mod(twoTo64),
-        element.shiftRightLowOnly(63).toBigInteger());
   }
 
   @Test

From c17f6f928e78aa00e978bca69977faf1406a1aca Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 28 Aug 2018 13:53:28 +0200
Subject: [PATCH 182/231] Separate two party input protocol

---
 .../fresco/suite/spdz/SpdzBuilder.java        | 10 ++--
 .../suite/spdz/SpdzRoundSynchronization.java  |  5 ++
 .../suite/spdz/gates/SpdzInputProtocol.java   |  6 +--
 .../spdz/gates/SpdzInputTwoPartyProtocol.java | 48 +++++++++++++++++++
 .../spdz/storage/SpdzDummyDataSupplier.java   |  2 +-
 5 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputTwoPartyProtocol.java

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 0039ab17a..ae1e634e4 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -20,6 +20,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputProtocol;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzInputTwoPartyProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzKnownSIntProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMultProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMultProtocolKnownLeft;
@@ -59,7 +60,7 @@ public BasicNumericContext getBasicNumericContext() {
   public RealNumericContext getRealNumericContext() {
     return realNumericContext;
   }
-  
+
   @Override
   public PreprocessedValues createPreprocessedValues(ProtocolBuilderNumeric protocolBuilder) {
     return pipeLength -> {
@@ -159,8 +160,11 @@ public DRes<SInt> known(BigInteger value) {
 
       @Override
       public DRes<SInt> input(BigInteger value, int inputParty) {
-        SpdzInputProtocol protocol = new SpdzInputProtocol(value, inputParty);
-        return protocolBuilder.append(protocol);
+        if (protocolBuilder.getBasicNumericContext().getNoOfParties() == 2) {
+          return protocolBuilder.append(new SpdzInputTwoPartyProtocol(value, inputParty));
+        } else {
+          return protocolBuilder.append(new SpdzInputProtocol(value, inputParty));
+        }
       }
 
       @Override
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
index 946b3ee1a..12c4f24d9 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
@@ -94,6 +94,11 @@ public void finishedEval(SpdzResourcePool resourcePool, Network network) {
   public void beforeBatch(
       ProtocolCollection<SpdzResourcePool> protocols, SpdzResourcePool resourcePool,
       Network network) {
+//    isCheckRequired = StreamSupport.stream(nativeProtocols.spliterator(), false)
+//        .anyMatch(p -> p instanceof RequiresMacCheck);
+//    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
+//    if (store.hasPendingValues() && isCheckRequired) {
+//      doMacCheck(resourcePool, network);
     isCheckRequired = StreamSupport.stream(protocols.spliterator(), false)
         .anyMatch(p -> p instanceof SpdzOutputProtocol);
     OpenedValueStore<SpdzSInt, BigInteger> store = resourcePool.getOpenedValueStore();
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputProtocol.java
index 8229d81c5..73c6c6997 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputProtocol.java
@@ -12,11 +12,11 @@
 
 public class SpdzInputProtocol extends SpdzNativeProtocol<SInt> {
 
-  private SpdzInputMask inputMask; // is opened by this gate.
+  SpdzInputMask inputMask; // is opened by this gate.
   protected BigInteger input;
-  private BigInteger valueMasked;
+  BigInteger valueMasked;
   protected SpdzSInt out;
-  private int inputter;
+  int inputter;
   private byte[] digest;
 
   public SpdzInputProtocol(BigInteger input, int inputter) {
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputTwoPartyProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputTwoPartyProtocol.java
new file mode 100644
index 000000000..9eda3776c
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzInputTwoPartyProtocol.java
@@ -0,0 +1,48 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import dk.alexandra.fresco.suite.spdz.storage.SpdzDataSupplier;
+import java.math.BigInteger;
+
+public class SpdzInputTwoPartyProtocol extends SpdzInputProtocol {
+
+  public SpdzInputTwoPartyProtocol(BigInteger input, int inputter) {
+    super(input, inputter);
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
+      Network network) {
+    int myId = spdzResourcePool.getMyId();
+    BigInteger modulus = spdzResourcePool.getModulus();
+    SpdzDataSupplier dataSupplier = spdzResourcePool.getDataSupplier();
+    ByteSerializer<BigInteger> serializer = spdzResourcePool.getSerializer();
+    if (round == 0) {
+      this.inputMask = dataSupplier.getNextInputMask(this.inputter);
+      if (myId == this.inputter) {
+        BigInteger bcValue = this.input.subtract(this.inputMask.getRealValue());
+        bcValue = bcValue.mod(modulus);
+        network.sendToAll(serializer.serialize(bcValue));
+      }
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      this.valueMasked = serializer.deserialize(network.receive(inputter));
+      SpdzSInt valueMaskedElement =
+          new SpdzSInt(
+              valueMasked,
+              dataSupplier.getSecretSharedKey().multiply(valueMasked).mod(modulus),
+              modulus);
+      this.out = this.inputMask.getMask().add(valueMaskedElement, myId);
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  @Override
+  public SpdzSInt out() {
+    return out;
+  }
+
+}
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
index f1791c098..df8baa298 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
@@ -15,7 +15,7 @@
 
 public class SpdzDummyDataSupplier implements SpdzDataSupplier {
 
-  private static int DEFAULT_MAX_BIT_LENGTH;
+  private static int DEFAULT_MAX_BIT_LENGTH = 512;
 
   private final int myId;
   private final ArithmeticDummyDataSupplier supplier;

From 34f8c71493fa2dcec71d636682c38b76a72e9b6a Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 28 Aug 2018 14:10:29 +0200
Subject: [PATCH 183/231] Update dummy suite logging tests

---
 .../fresco/logging/arithmetic/ComparisonLoggerDecorator.java | 5 ++---
 .../fresco/logging/TestNumericSuiteLoggingDecorators.java    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index b31e73998..6dbc5ace9 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -79,14 +79,13 @@ public DRes<SInt> sign(DRes<SInt> x) {
 
   @Override
   public DRes<SInt> compareZero(DRes<SInt> x, int bitlength) {
-    comp0Count++;
-    return this.delegate.compareZero(x, bitlength);
+    return this.compareZero(x, bitlength, Algorithm.LOG_ROUNDS);
   }
 
   @Override
   public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm) {
     comp0Count++;
-    return this.delegate.compareZero(x, bitlength);
+    return this.delegate.compareZero(x, bitlength, algorithm);
   }
 
   @Override
diff --git a/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java b/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java
index dffa6e709..b61f2d2f2 100644
--- a/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java
+++ b/core/src/test/java/dk/alexandra/fresco/logging/TestNumericSuiteLoggingDecorators.java
@@ -134,7 +134,6 @@ public void testComparisonLoggingDecorator() {
       SecureComputationEngine<DummyArithmeticResourcePool, ProtocolBuilderNumeric> sce
           = new SecureComputationEngineImpl<>(ps, evaluator);
 
-      Drbg drbg = new HmacDrbg();
       TestThreadRunner.TestThreadConfiguration<DummyArithmeticResourcePool, ProtocolBuilderNumeric> ttc =
           new TestThreadRunner.TestThreadConfiguration<>(sce,
               () -> new DummyArithmeticResourcePoolImpl(playerId,
@@ -150,13 +149,13 @@ public void testComparisonLoggingDecorator() {
 
       Map<String, Long> loggedValues = logger.getLoggedValues();
       assertThat(loggedValues.get(ComparisonLoggerDecorator.ARITHMETIC_COMPARISON_EQ),
-          is((long) 2));
+          is((long) 6));
       assertThat(loggedValues.get(ComparisonLoggerDecorator.ARITHMETIC_COMPARISON_LEQ),
           is((long) 0));
       assertThat(loggedValues.get(ComparisonLoggerDecorator.ARITHMETIC_COMPARISON_SIGN),
           is((long) 0));
       assertThat(loggedValues.get(ComparisonLoggerDecorator.ARITHMETIC_COMPARISON_COMP0),
-          is((long) 2));
+          is((long) 0));
 
       logger.reset();
       loggedValues = logger.getLoggedValues();

From 57d0e0b6f061b19dbbaac9ff06281f29ad19e361 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 28 Aug 2018 15:06:00 +0200
Subject: [PATCH 184/231] Temp fix another bit length mess

---
 .../util/ArithmeticDummyDataSupplier.java     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
index 0c72ca277..63a5d7d12 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
@@ -24,6 +24,10 @@ public class ArithmeticDummyDataSupplier {
 
   public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus,
       BigInteger maxOpenValue) {
+    if (maxOpenValue.compareTo(modulus) >= 0) {
+      throw new IllegalArgumentException(
+          "Max open value " + maxOpenValue + " must be less than " + modulus);
+    }
     this.myId = myId;
     this.noOfParties = noOfParties;
     this.modulus = modulus;
@@ -34,14 +38,14 @@ public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus
   }
 
   public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus) {
-    this(myId, noOfParties, modulus, modulus.subtract(BigInteger.ONE));
+    this(myId, noOfParties, modulus, modulus);
   }
 
   /**
    * Computes the next random element and this party's share.
    */
   public Pair<BigInteger, BigInteger> getRandomElementShare() {
-    BigInteger element = sampleRandomBigInteger();
+    BigInteger element = sampleRandomBigInteger(maxOpenValue);
     return new Pair<>(element, sharer.share(element, noOfParties).get(myId - 1));
   }
 
@@ -57,8 +61,8 @@ public Pair<BigInteger, BigInteger> getRandomBitShare() {
    * Computes the next random multiplication triple and this party's shares.
    */
   public MultiplicationTripleShares getMultiplicationTripleShares() {
-    BigInteger left = sampleRandomBigInteger();
-    BigInteger right = sampleRandomBigInteger();
+    BigInteger left = sampleRandomBigInteger(maxOpenValue);
+    BigInteger right = sampleRandomBigInteger(maxOpenValue);
     BigInteger product = left.multiply(right).mod(modulus);
     return new MultiplicationTripleShares(
         new Pair<>(left, sharer.share(left, noOfParties).get(myId - 1)),
@@ -83,7 +87,7 @@ public MultiplicationTripleShares getMultiplicationBitTripleShares() {
    * r^{prime} / 2^{d}, i.e., r right-shifted by d.
    */
   public TruncationPairShares getTruncationPairShares(int d) {
-    BigInteger rPrime = sampleRandomBigInteger();
+    BigInteger rPrime = sampleRandomBigInteger(maxOpenValue);
     BigInteger r = rPrime.shiftRight(d);
     return new TruncationPairShares(
         new Pair<>(rPrime, sharer.share(rPrime, noOfParties).get(myId - 1)),
@@ -104,14 +108,18 @@ public List<Pair<BigInteger, BigInteger>> getExpPipe(int expPipeLength) {
   }
 
   private BigInteger sampleRandomBigInteger() {
+    return sampleRandomBigInteger(modulus);
+  }
+
+  private BigInteger sampleRandomBigInteger(BigInteger limit) {
     BigInteger randomElement = new BigInteger(modBitLength, random);
-    return randomElement.mod(maxOpenValue);
+    // this is a biased distribution but we're not in secure-land anyways
+    return randomElement.mod(limit);
   }
 
   private List<BigInteger> getOpenExpPipe(int expPipeLength) {
     List<BigInteger> openExpPipe = new ArrayList<>(expPipeLength);
-    BigInteger first = sampleRandomBigInteger();
-    System.out.println(first + " " + modulus);
+    BigInteger first = sampleRandomBigInteger(maxOpenValue);
     BigInteger inverse = first.modInverse(modulus);
     openExpPipe.add(inverse);
     openExpPipe.add(first);

From fc073bc636ea5c054eacbd3de01fc2dba8c77b5c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 28 Aug 2018 15:39:45 +0200
Subject: [PATCH 185/231] Another fix

---
 .../fresco/framework/util/ArithmeticDummyDataSupplier.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
index 63a5d7d12..8bab3ae24 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
@@ -24,7 +24,7 @@ public class ArithmeticDummyDataSupplier {
 
   public ArithmeticDummyDataSupplier(int myId, int noOfParties, BigInteger modulus,
       BigInteger maxOpenValue) {
-    if (maxOpenValue.compareTo(modulus) >= 0) {
+    if (maxOpenValue.compareTo(modulus) > 0) {
       throw new IllegalArgumentException(
           "Max open value " + maxOpenValue + " must be less than " + modulus);
     }

From 2286bef5667387ae62cc2a108278f448f6ffb0ff Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 28 Aug 2018 16:00:41 +0200
Subject: [PATCH 186/231] Batched bit ops

---
 .../builder/numeric/DefaultLogical.java       | 10 ++++
 .../framework/builder/numeric/Logical.java    |  5 ++
 .../lib/compare/lt/BitLessThanOpen.java       | 14 ++---
 .../fresco/lib/compare/lt/CarryOut.java       | 15 +++++-
 .../spdz/storage/SpdzDummyDataSupplier.java   |  4 +-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 21 ++++++++
 .../Spdz2kAndKnownBatchedProtocol.java        | 50 ++++++++++++++++++
 .../natives/Spdz2kNotBatchedProtocol.java     | 45 ++++++++++++++++
 .../Spdz2kXorKnownBatchedProtocol.java        | 52 +++++++++++++++++++
 9 files changed, 202 insertions(+), 14 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 2430ad575..950424bee 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -95,6 +95,16 @@ public DRes<List<DRes<OInt>>> openAsBits(DRes<List<DRes<SInt>>> secretBits) {
     });
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits) {
+    return builder.par(par -> {
+      List<DRes<SInt>> negated =
+          bits.out().stream().map(closed -> par.logical().not(closed))
+              .collect(Collectors.toList());
+      return () -> negated;
+    });
+  }
+
   private DRes<List<DRes<SInt>>> pairWise(
       DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB,
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index 8da18a746..b46e0f57d 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -61,6 +61,11 @@ public interface Logical extends ComputationDirectory {
    */
   DRes<List<DRes<OInt>>> openAsBits(DRes<List<DRes<SInt>>> secretBits);
 
+  /**
+   * Negates all given bits.
+   */
+  DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits);
+
   /**
    * Computes pairwise logical AND of input bits. <p>NOTE: Inputs must represent 0 or 1 values
    * only.</p>
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
index d3b4d6ac9..4e4633fba 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/BitLessThanOpen.java
@@ -6,8 +6,6 @@
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.OIntFactory;
 import dk.alexandra.fresco.framework.value.SInt;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -30,15 +28,9 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     OInt openValueA = openValueDef.out();
     int numBits = secretBits.size();
     List<OInt> openBits = builder.getOIntArithmetic().toBits(openValueA, numBits);
-    DRes<List<DRes<SInt>>> secretBitsNegated = builder.par(par -> {
-      List<DRes<SInt>> negatedBits = new ArrayList<>(numBits);
-      for (DRes<SInt> secretBit : secretBits) {
-        negatedBits.add(par.logical().not(secretBit));
-      }
-      Collections.reverse(negatedBits);
-      return () -> negatedBits;
-    });
-    DRes<SInt> gt = builder.seq(new CarryOut(() -> openBits, secretBitsNegated, oIntFactory.one()));
+    DRes<List<DRes<SInt>>> secretBitsNegated = builder.logical().batchedNot(secretBitsDef);
+    DRes<SInt> gt = builder
+        .seq(new CarryOut(() -> openBits, secretBitsNegated, oIntFactory.one(), true));
     return builder.logical().not(gt);
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 291379913..af14d2c7b 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -8,6 +8,7 @@
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -19,6 +20,7 @@ public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
   private final DRes<List<OInt>> openBitsDef;
   private final DRes<List<DRes<SInt>>> secretBitsDef;
   private final DRes<OInt> carryIn;
+  private final boolean reverseSecretBits;
 
   /**
    * Constructs new {@link CarryOut}.
@@ -27,17 +29,28 @@ public class CarryOut implements Computation<SInt, ProtocolBuilderNumeric> {
    * @param secretBits secret bits
    * @param carryIn an additional carry-in bit which we add to the least-significant bits of the
    * inputs
+   * @param reverseSecretBits indicates whether secret bits need to be reverse (to account for
+   * endianness)
    */
   public CarryOut(DRes<List<OInt>> clearBits, DRes<List<DRes<SInt>>> secretBits,
-      DRes<OInt> carryIn) {
+      DRes<OInt> carryIn, boolean reverseSecretBits) {
     this.secretBitsDef = secretBits;
     this.openBitsDef = clearBits;
     this.carryIn = carryIn;
+    this.reverseSecretBits = reverseSecretBits;
+  }
+
+  public CarryOut(DRes<List<OInt>> clearBits, DRes<List<DRes<SInt>>> secretBits,
+      DRes<OInt> carryIn) {
+    this(clearBits, secretBits, carryIn, false);
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     List<DRes<SInt>> secretBits = secretBitsDef.out();
+    if (reverseSecretBits) {
+      Collections.reverse(secretBits);
+    }
     List<OInt> openBits = openBitsDef.out();
     if (secretBits.size() != openBits.size()) {
       throw new IllegalArgumentException("Number of bits must be the same");
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
index df8baa298..30072884c 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
@@ -42,7 +42,7 @@ public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
       BigInteger secretSharedKey, int expPipeLength) {
-    this(myId, noOfPlayers, modulus, secretSharedKey, expPipeLength, DEFAULT_MAX_BIT_LENGTH);
+    this(myId, noOfPlayers, modulus, secretSharedKey, expPipeLength, modulus.bitLength() - 1);
   }
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
@@ -53,7 +53,7 @@ public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
     this.expPipeLength = expPipeLength;
     this.maxBitLength = maxBitLength;
     this.supplier = new ArithmeticDummyDataSupplier(myId, noOfPlayers, modulus,
-        BigInteger.ONE.shiftLeft(maxBitLength));
+        BigInteger.ONE.shiftLeft(maxBitLength - 1));
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index d9c03c862..931d4bd1d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -9,12 +9,16 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
+import java.util.List;
 
 /**
  * Logical operators for Spdz2k on boolean shares. <p>NOTE: requires that inputs have previously
@@ -66,6 +70,23 @@ public DRes<SInt> not(DRes<SInt> secretBit) {
     return xorKnown(builder.getOIntFactory().one(), secretBit);
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits) {
+    return builder.append(new Spdz2kXorKnownBatchedProtocol<>(knownBits, secretBits));
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits) {
+    return builder.append(new Spdz2kAndKnownBatchedProtocol<>(knownBits, secretBits));
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits) {
+    return builder.append(new Spdz2kNotBatchedProtocol<>(bits));
+  }
+
   @Override
   public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
new file mode 100644
index 000000000..104e9e610
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
@@ -0,0 +1,50 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kAndKnownBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private final DRes<List<OInt>> left;
+  private final DRes<List<DRes<SInt>>> right;
+  private List<DRes<SInt>> result;
+
+  public Spdz2kAndKnownBatchedProtocol(
+      DRes<List<OInt>> left,
+      DRes<List<DRes<SInt>>> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    List<OInt> leftOut = left.out();
+    List<DRes<SInt>> rightOut = right.out();
+    this.result = new ArrayList<>(leftOut.size());
+    for (int i = 0; i < leftOut.size(); i++) {
+      PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();
+      DRes<SInt> secretBit = rightOut.get(i);
+      Spdz2kSIntBoolean<PlainT> andedBit = factory.toSpdz2kSIntBoolean(secretBit)
+          .and(knownBit.bitValue());
+      result.add(andedBit);
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
new file mode 100644
index 000000000..4707250a9
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
@@ -0,0 +1,45 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kNotBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private final DRes<List<DRes<SInt>>> bits;
+  private List<DRes<SInt>> result;
+
+  public Spdz2kNotBatchedProtocol(DRes<List<DRes<SInt>>> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
+    List<DRes<SInt>> bitsOut = bits.out();
+    this.result = new ArrayList<>(bitsOut.size());
+    for (int i = 0; i < bitsOut.size(); i++) {
+      DRes<SInt> secretBit = bitsOut.get(i);
+      Spdz2kSIntBoolean<PlainT> notBit = factory.toSpdz2kSIntBoolean(secretBit)
+          .xorOpen(factory.one().toBitRep(), secretSharedKey, factory.zero().toBitRep(),
+              resourcePool.getMyId() == 1);
+      result.add(notBit);
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
new file mode 100644
index 000000000..dfc8109bc
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
@@ -0,0 +1,52 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kXorKnownBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private final DRes<List<OInt>> left;
+  private final DRes<List<DRes<SInt>>> right;
+  private List<DRes<SInt>> result;
+
+  public Spdz2kXorKnownBatchedProtocol(
+      DRes<List<OInt>> left,
+      DRes<List<DRes<SInt>>> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
+    List<OInt> leftOut = left.out();
+    List<DRes<SInt>> rightOut = right.out();
+    this.result = new ArrayList<>(leftOut.size());
+    for (int i = 0; i < leftOut.size(); i++) {
+      PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();
+      DRes<SInt> secretBit = rightOut.get(i);
+      Spdz2kSIntBoolean<PlainT> xoredBit = factory.toSpdz2kSIntBoolean(secretBit)
+          .xorOpen(knownBit, secretSharedKey, factory.zero().toBitRep(),
+              resourcePool.getMyId() == 1);
+      result.add(xoredBit);
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+
+}

From b203e84933224f7949a01fa32e88e12261d40b02 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 29 Aug 2018 10:15:46 +0200
Subject: [PATCH 187/231] WIP optimizing pre-carry bits

---
 .../java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java | 2 +-
 .../dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java  | 8 ++++----
 .../dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java | 7 ++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index af14d2c7b..cd460a392 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -77,7 +77,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           lastPair.getSecond(),
           seq.logical().andKnown(carryIn, lastPair.getFirst()));
       pairs.set(lastIdx, new SIntPair(lastPair.getFirst(), lastCarryPropagator));
-      return seq.seq(new PreCarryBits(() -> pairs));
+      return seq.seq(new PreCarryBits(pairs));
     });
   }
 
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 2ad388197..9a30c747c 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -10,17 +10,17 @@
 
 public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
 
-  private final DRes<List<SIntPair>> pairsDef;
+  private final List<SIntPair> pairsDef;
 
-  PreCarryBits(DRes<List<SIntPair>> pairs) {
+  PreCarryBits(List<SIntPair> pairs) {
     this.pairsDef = pairs;
   }
 
   @Override
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
-    return builder.seq(seq -> pairsDef)
+    return builder.seq(seq -> () -> pairsDef)
         .whileLoop((pairs) -> pairs.size() > 1,
-            (prevSeq, pairs) -> prevSeq.par(par -> {
+            (prevScope, pairs) -> prevScope.par(par -> {
               padIfUneven(pairs);
               List<SIntPair> nextRoundInner = new ArrayList<>(pairs.size() / 2);
               for (int i = 0; i < pairs.size() / 2; i++) {
diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
index 9ea78b7c9..242819eba 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/lt/PreCarryTests.java
@@ -33,11 +33,8 @@ public void test() {
             DRes<SInt> g2 = numeric.known(BigInteger.ONE);
             SIntPair pairOne = new SIntPair(p1, g1);
             SIntPair pairTwo = new SIntPair(p2, g2);
-            List<SIntPair> pairs = Arrays.asList(
-                pairOne,
-                pairTwo
-            );
-            DRes<SInt> carried = builder.seq(new PreCarryBits(() -> pairs));
+            List<SIntPair> pairs = Arrays.asList(pairOne, pairTwo);
+            DRes<SInt> carried = builder.seq(new PreCarryBits(pairs));
             return builder.numeric().open(carried);
           };
           BigInteger actual = runApplication(app);

From ac16728409a567da125d56eb6bed0aee4bd9c00c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 29 Aug 2018 14:19:33 +0200
Subject: [PATCH 188/231] More work on carry

---
 .../framework/builder/numeric/Comparison.java |  65 +++----
 .../builder/numeric/DefaultComparison.java    |   7 +
 .../fresco/lib/compare/lt/Carry.java          |  54 ++++++
 .../fresco/lib/compare/lt/PreCarryBits.java   |  43 +----
 .../arithmetic/ComparisonLoggerDecorator.java |   6 +
 .../fresco/suite/spdz2k/Spdz2kComparison.java |   5 +
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |   7 +
 .../natives/Spdz2kAndBatchedProtocol.java     | 161 ++++++++++++++++
 .../natives/Spdz2kCarryProtocol.java          | 173 ++++++++++++++++++
 .../natives/Spdz2kPreCarryProtocol.java       | 103 +++++++++++
 10 files changed, 548 insertions(+), 76 deletions(-)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 742587391..20080b167 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.List;
@@ -23,42 +24,34 @@ enum Algorithm {
   /**
    * Computes x == y.
    *
-   * @param x
-   *          the first input
-   * @param y
-   *          the second input
-   * @param bitlength
-   *          the amount of bits to do the equality test on. Must be less than or equal to the max
-   *          bitlength allowed
-   * @param algorithm
-   *          the algorithm to use
+   * @param x the first input
+   * @param y the second input
+   * @param bitlength the amount of bits to do the equality test on. Must be less than or equal to
+   * the max bitlength allowed
+   * @param algorithm the algorithm to use
    * @return A deferred result computing x' == y'. Where x' and y' represent the {@code bitlength}
-   *         least significant bits of x, respectively y. Result will be either [1] (true) or [0]
-   *         (false).
+   * least significant bits of x, respectively y. Result will be either [1] (true) or [0] (false).
    */
   DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm algorithm);
 
   /**
-   * Call to {@link #equals(DRes, DRes, int, Algorithm)} with default comparison
-   * algorithm.
+   * Call to {@link #equals(DRes, DRes, int, Algorithm)} with default comparison algorithm.
    */
   default DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength) {
     return equals(x, y, bitlength, Algorithm.LOG_ROUNDS);
   }
 
   /**
-   * Call to {@link #equals(DRes, DRes, int, Algorithm)} with default comparison
-   * algorithm, checking equality of all bits.
+   * Call to {@link #equals(DRes, DRes, int, Algorithm)} with default comparison algorithm, checking
+   * equality of all bits.
    */
   DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y);
 
   /**
    * Computes if x <= y.
    *
-   * @param x
-   *          the first input
-   * @param y
-   *          the second input
+   * @param x the first input
+   * @param y the second input
    * @return A deferred result computing x <= y. Result will be either [1] (true) or [0] (false).
    */
   DRes<SInt> compareLEQ(DRes<SInt> x, DRes<SInt> y);
@@ -66,12 +59,9 @@ default DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength) {
   /**
    * Computes if x < y.
    *
-   * @param x
-   *          the first input
-   * @param y
-   *          the second input
-   * @param algorithm
-   *          the algorithm to use
+   * @param x the first input
+   * @param y the second input
+   * @param algorithm the algorithm to use
    * @return A deferred result computing x <= y. Result will be either [1] (true) or [0] (false).
    */
   DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y, Algorithm algorithm);
@@ -92,15 +82,19 @@ default DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y) {
    */
   DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> secretBits);
 
+  /**
+   * Method used internally in less-than protocol. <p>This is only here since we need a way to plug
+   * in a backend specific native protocol for it.</p>
+   */
+  DRes<List<SIntPair>> carry(List<SIntPair> bitPairs);
+
   /**
    * Compares if x <= y, but with twice the possible bit-length. Requires that the maximum bit
    * length is set to something that can handle this scenario. It has to be at least less than half
    * the modulus bit size.
    *
-   * @param x
-   *          the first input
-   * @param y
-   *          the second input
+   * @param x the first input
+   * @param y the second input
    * @return A deferred result computing x <= y. Result will be either [1] (true) or [0] (false).
    */
   DRes<SInt> compareLEQLong(DRes<SInt> x, DRes<SInt> y);
@@ -117,15 +111,12 @@ default DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y) {
   /**
    * Test for equality with zero for a bitLength-bit number (positive or negative)
    *
-   * @param x
-   *          the value to test against zero
-   * @param bitlength
-   *          the amount of bits to do the zero-test on. Must be less than or equal to the modulus
-   *          bitlength
-   * @param algorithm
-   *          the algorithm to use for zero-equality test
+   * @param x the value to test against zero
+   * @param bitlength the amount of bits to do the zero-test on. Must be less than or equal to the
+   * modulus bitlength
+   * @param algorithm the algorithm to use for zero-equality test
    * @return A deferred result computing x' == 0 where x' is the {@code bitlength} least significant
-   *         bits of x. Result will be either [1] (true) or [0] (false)
+   * bits of x. Result will be either [1] (true) or [0] (false)
    */
   DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm);
 
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 94de2dbd9..0851ef22f 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -1,9 +1,11 @@
 package dk.alexandra.fresco.framework.builder.numeric;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.compare.lt.BitLessThanOpen;
+import dk.alexandra.fresco.lib.compare.lt.Carry;
 import dk.alexandra.fresco.lib.compare.lt.LessThanOrEquals;
 import dk.alexandra.fresco.lib.compare.lt.LessThanZero;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestConstRounds;
@@ -62,6 +64,11 @@ public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> sec
     return builder.seq(new BitLessThanOpen(openValue, secretBits));
   }
 
+  @Override
+  public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
+    return builder.par(new Carry(bitPairs));
+  }
+
   @Override
   public DRes<SInt> sign(DRes<SInt> x) {
     Numeric input = builder.numeric();
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java
new file mode 100644
index 000000000..df6bbd4bb
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java
@@ -0,0 +1,54 @@
+package dk.alexandra.fresco.lib.compare.lt;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.ComputationParallel;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.framework.value.SInt;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Carry implements ComputationParallel<List<SIntPair>, ProtocolBuilderNumeric> {
+
+  private final List<SIntPair> pairs;
+
+  public Carry(List<SIntPair> pairs) {
+    this.pairs = pairs;
+  }
+
+  @Override
+  public DRes<List<SIntPair>> buildComputation(ProtocolBuilderNumeric builder) {
+    padIfUneven(pairs);
+    List<SIntPair> nextRoundInner = new ArrayList<>(pairs.size() / 2);
+    for (int i = 0; i < pairs.size() / 2; i++) {
+      SIntPair left = pairs.get(2 * i + 1);
+      SIntPair right = pairs.get(2 * i);
+      nextRoundInner.add(carry(builder, left, right));
+    }
+    return () -> nextRoundInner;
+  }
+
+  private SIntPair carry(ProtocolBuilderNumeric builder, SIntPair left, SIntPair right) {
+    if (left == null) {
+      return right;
+    }
+    DRes<SInt> p1 = left.getFirst();
+    DRes<SInt> g1 = left.getSecond();
+    DRes<SInt> p2 = right.getFirst();
+    DRes<SInt> g2 = right.getSecond();
+    DRes<SInt> p = builder.logical().and(p1, p2);
+    DRes<SInt> q = builder.seq(seq -> {
+      DRes<SInt> temp = seq.logical().and(p2, g1);
+      return seq.logical().halfOr(temp, g2);
+    });
+    return new SIntPair(p, q);
+  }
+
+  private void padIfUneven(List<SIntPair> pairs) {
+    int size = pairs.size();
+    if (size % 2 != 0 && size != 1) {
+      pairs.add(null);
+    }
+  }
+
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index 9a30c747c..e0e402d5a 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -5,7 +5,6 @@
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
-import java.util.ArrayList;
 import java.util.List;
 
 public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
@@ -21,44 +20,10 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     return builder.seq(seq -> () -> pairsDef)
         .whileLoop((pairs) -> pairs.size() > 1,
             (prevScope, pairs) -> prevScope.par(par -> {
-              padIfUneven(pairs);
-              List<SIntPair> nextRoundInner = new ArrayList<>(pairs.size() / 2);
-              for (int i = 0; i < pairs.size() / 2; i++) {
-                SIntPair left = pairs.get(2 * i + 1);
-                SIntPair right = pairs.get(2 * i);
-                nextRoundInner.add(carry(par, left, right));
-              }
-              return () -> nextRoundInner;
-            })).seq((ignored, out) -> out.get(0).getSecond());
-  }
-
-  private SIntPair carry(ProtocolBuilderNumeric builder, SIntPair left, SIntPair right) {
-    if (left == null) {
-      return right;
-    }
-    if (right == null) {
-      return left;
-    }
-    DRes<SInt> p1 = left.getFirst();
-    DRes<SInt> g1 = left.getSecond();
-    DRes<SInt> p2 = right.getFirst();
-    DRes<SInt> g2 = right.getSecond();
-    DRes<SInt> p = builder.logical().and(p1, p2);
-    DRes<SInt> q = builder.seq(seq -> {
-      DRes<SInt> temp = seq.logical().and(p2, g1);
-      return seq.logical().halfOr(temp, g2);
-    });
-    return new SIntPair(p, q);
-  }
-
-  /**
-   * Pad with dummy null element if number of pairs is uneven.
-   */
-  private void padIfUneven(List<SIntPair> pairs) {
-    int size = pairs.size();
-    if (size % 2 != 0 && size != 1) {
-      pairs.add(null);
-    }
+//              par.seq(seq -> seq.debug().)
+              return par.comparison().carry(pairs);
+            }))
+        .seq((seq, out) -> out.get(0).getSecond());
   }
 
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 6dbc5ace9..5aa5c69da 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.logging.PerformanceLogger;
@@ -65,6 +66,11 @@ public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> sec
     return this.delegate.compareLTBits(openValue, secretBits);
   }
 
+  @Override
+  public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   @Override
   public DRes<SInt> compareLEQLong(DRes<SInt> x1, DRes<SInt> x2) {
     leqCount++;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index d6f81f733..d0f8f4f5c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -62,6 +62,11 @@ public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm al
     return compareZero(builder.numeric().sub(x, y), bitlength, algorithm);
   }
 
+//  @Override
+//  public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
+//    return builder.append(new Spdz2kCarryProtocol<>(bitPairs));
+//  }
+
   protected CompUIntFactory<PlainT> getFactory() {
     return factory;
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 931d4bd1d..d485dc895 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -12,6 +12,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
@@ -60,6 +61,12 @@ public DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
     return builder.append(new Spdz2kAndKnownProtocol<>(knownBit, secretBit));
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    return builder.append(new Spdz2kAndBatchedProtocol<>(bitsA, bitsB));
+  }
+
   @Override
   public DRes<SInt> xorKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
     return builder.append(new Spdz2kXorKnownProtocol<>(knownBit, secretBit));
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
new file mode 100644
index 000000000..3bd95b536
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
@@ -0,0 +1,161 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Native protocol for computing logical AND of two values in boolean form.
+ */
+public class Spdz2kAndBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private DRes<List<DRes<SInt>>> bitsADef;
+  private DRes<List<DRes<SInt>>> bitsBDef;
+  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
+  private List<Spdz2kSIntBoolean<PlainT>> epsilons;
+  private List<Spdz2kSIntBoolean<PlainT>> deltas;
+  private List<PlainT> openEpsilons;
+  private List<PlainT> openDeltas;
+  private List<DRes<SInt>> products;
+
+  public Spdz2kAndBatchedProtocol(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    this.bitsADef = bitsA;
+    this.bitsBDef = bitsB;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    List<DRes<SInt>> bitsA = bitsADef.out();
+    List<DRes<SInt>> bitsB = bitsBDef.out();
+    if (round == 0) {
+      triples = new ArrayList<>(bitsA.size());
+      epsilons = new ArrayList<>(bitsA.size());
+      deltas = new ArrayList<>(bitsA.size());
+      openEpsilons = new ArrayList<>(bitsA.size());
+      openDeltas = new ArrayList<>(bitsA.size());
+      products = new ArrayList<>(bitsA.size());
+
+      for (int i = 0; i < bitsA.size(); i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = resourcePool
+            .getDataSupplier()
+            .getNextBitTripleShares();
+        triples.add(triple);
+
+        Spdz2kSIntBoolean<PlainT> left = factory.toSpdz2kSIntBoolean(bitsA.get(i));
+        Spdz2kSIntBoolean<PlainT> right = factory.toSpdz2kSIntBoolean(bitsB.get(i));
+
+        epsilons.add(factory.toSpdz2kSIntBoolean(left).xor(triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(right).xor(triple.getRight()));
+      }
+
+      serializeAndSend(network, epsilons, deltas);
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
+
+      resourcePool.getOpenedValueStore().pushOpenedValues(
+          epsilons.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
+          openEpsilons.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
+      );
+      resourcePool.getOpenedValueStore().pushOpenedValues(
+          deltas.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
+          openDeltas.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
+      );
+
+      for (int i = 0; i < bitsA.size(); i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = triples.get(i);
+
+        PlainT e = openEpsilons.get(i);
+        PlainT d = openDeltas.get(i);
+
+        Spdz2kSIntBoolean<PlainT> prod = mult(e, d, triple, macKeyShare, factory,
+            resourcePool.getMyId());
+
+        products.add(prod);
+      }
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  private Spdz2kSIntBoolean<PlainT> mult(
+      PlainT e,
+      PlainT d,
+      Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,
+      PlainT macKeyShare,
+      CompUIntFactory<PlainT> factory,
+      int myId) {
+    int eBit = e.bitValue();
+    int dBit = d.bitValue();
+    PlainT ed = e.multiply(d);
+    // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+    Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+    Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+    Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+    return tripleProduct
+        .xor(tripleRight.and(eBit))
+        .xor(tripleLeft.and(dBit))
+        .xorOpen(ed,
+            macKeyShare,
+            factory.zero().toBitRep(),
+            myId == 1);
+  }
+
+  /**
+   * Retrieves shares for epsilons and deltas and reconstructs each.
+   */
+  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory,
+      int noOfParties) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+    for (int i = 0; i < epsilons.size(); i++) {
+      openEpsilons.add(factory.fromBit(rawEpsilons[i]));
+      openDeltas.add(factory.fromBit(rawDeltas[i]));
+    }
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      for (int j = 0; j < epsilons.size(); j++) {
+        openEpsilons.set(j, openEpsilons.get(j).add(factory.fromBit(rawEpsilons[j])));
+        openDeltas.set(j, openDeltas.get(j).add(factory.fromBit(rawDeltas[j])));
+      }
+    }
+  }
+
+  /**
+   * Serializes and sends epsilon and delta values.
+   */
+  private void serializeAndSend(Network network,
+      List<Spdz2kSIntBoolean<PlainT>> epsilons,
+      List<Spdz2kSIntBoolean<PlainT>> deltas) {
+    byte[] epsilonBytes = new byte[epsilons.size()];
+    byte[] deltaBytes = new byte[epsilons.size()];
+    for (int i = 0; i < epsilons.size(); i++) {
+      byte[] serializedEpsilon = epsilons.get(i).serializeShareLow();
+      epsilonBytes[i] = serializedEpsilon[0];
+      byte[] serializedDelta = deltas.get(i).serializeShareLow();
+      deltaBytes[i] = serializedDelta[0];
+    }
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return products;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
new file mode 100644
index 000000000..05d1956fe
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
@@ -0,0 +1,173 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Spdz2kCarryProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<SIntPair>, PlainT> {
+
+  private final List<SIntPair> bits;
+  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
+  private List<Spdz2kSIntBoolean<PlainT>> epsilons;
+  private List<Spdz2kSIntBoolean<PlainT>> deltas;
+  private List<PlainT> openEpsilons;
+  private List<PlainT> openDeltas;
+  private List<SIntPair> carried;
+
+  public Spdz2kCarryProtocol(List<SIntPair> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    if (round == 0) {
+      System.out.println("bits.size() " + bits.size());
+      triples = new ArrayList<>(bits.size());
+      epsilons = new ArrayList<>(bits.size());
+      deltas = new ArrayList<>(bits.size());
+      openEpsilons = new ArrayList<>(bits.size());
+      openDeltas = new ArrayList<>(bits.size());
+      carried = new ArrayList<>(bits.size() / 2);
+
+      for (int i = 0; i < bits.size() / 2; i++) {
+        // two multiplications
+        triples.add(resourcePool.getDataSupplier().getNextBitTripleShares());
+        triples.add(resourcePool.getDataSupplier().getNextBitTripleShares());
+
+        SIntPair left = bits.get(2 * i + 1);
+        SIntPair right = bits.get(2 * i);
+
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p1p2Triple = triples.get(2 * i + 1);
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p2g1Triple = triples.get(2 * i);
+
+        Spdz2kSIntBoolean<PlainT> p1 = factory.toSpdz2kSIntBoolean(left.getFirst());
+        Spdz2kSIntBoolean<PlainT> g1 = factory.toSpdz2kSIntBoolean(left.getSecond());
+        Spdz2kSIntBoolean<PlainT> p2 = factory.toSpdz2kSIntBoolean(right.getFirst());
+
+        // p1 * p2
+        epsilons.add(factory.toSpdz2kSIntBoolean(p1).xor(p1p2Triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(p2).xor(p1p2Triple.getRight()));
+
+        // p2 * g1
+        epsilons.add(factory.toSpdz2kSIntBoolean(p2).xor(p2g1Triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(g1).xor(p2g1Triple.getRight()));
+      }
+
+      serializeAndSend(network, epsilons, deltas);
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      receiveAndReconstruct(network, factory, resourcePool.getMyId(),
+          resourcePool.getNoOfParties());
+
+      resourcePool.getOpenedValueStore().pushOpenedValues(
+          epsilons.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
+          openEpsilons.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
+      );
+      resourcePool.getOpenedValueStore().pushOpenedValues(
+          deltas.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
+          openDeltas.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
+      );
+
+      for (int i = 0; i < bits.size() / 2; i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p1p2Triple = triples.get(2 * i + 1);
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p2g1Triple = triples.get(2 * i);
+
+        PlainT p1p2E = openEpsilons.get(2 * i + 1);
+        PlainT p2g1E = openEpsilons.get(2 * i);
+
+        PlainT p1p2D = openDeltas.get(2 * i + 1);
+        PlainT p2g1D = openDeltas.get(2 * i);
+
+        Spdz2kSIntBoolean<PlainT> p = mult(p1p2E, p1p2D, p1p2Triple, macKeyShare, factory,
+            resourcePool.getMyId());
+
+        Spdz2kSIntBoolean<PlainT> p2 = factory.toSpdz2kSIntBoolean(bits.get(2 * i).getSecond());
+
+        Spdz2kSIntBoolean<PlainT> q = mult(p2g1E, p2g1D, p2g1Triple, macKeyShare, factory,
+            resourcePool.getMyId()).xor(p2);
+        carried.add(new SIntPair(p, q));
+      }
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  private Spdz2kSIntBoolean<PlainT> mult(
+      PlainT e,
+      PlainT d,
+      Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,
+      PlainT macKeyShare,
+      CompUIntFactory<PlainT> factory,
+      int myId) {
+    int eBit = e.bitValue();
+    int dBit = d.bitValue();
+    PlainT ed = e.multiply(d);
+    // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+    Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+    Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+    Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+    return tripleProduct
+        .xor(tripleRight.and(eBit))
+        .xor(tripleLeft.and(dBit))
+        .xorOpen(ed,
+            macKeyShare,
+            factory.zero().toBitRep(),
+            myId == 1);
+  }
+
+  /**
+   * Retrieves shares for epsilons and deltas and reconstructs each.
+   */
+  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory, int myId,
+      int noOfParties) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+    for (int i = 0; i < epsilons.size(); i++) {
+      openEpsilons.add(factory.fromBit(rawEpsilons[i]));
+      openDeltas.add(factory.fromBit(rawDeltas[i]));
+    }
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      for (int j = 0; j < epsilons.size(); j++) {
+        openEpsilons.set(j, openEpsilons.get(j).add(factory.fromBit(rawEpsilons[j])));
+        openDeltas.set(j, openDeltas.get(j).add(factory.fromBit(rawDeltas[j])));
+      }
+    }
+  }
+
+  /**
+   * Serializes and sends epsilon and delta values.
+   */
+  private void serializeAndSend(Network network,
+      List<Spdz2kSIntBoolean<PlainT>> epsilons,
+      List<Spdz2kSIntBoolean<PlainT>> deltas) {
+    byte[] epsilonBytes = new byte[epsilons.size()];
+    byte[] deltaBytes = new byte[epsilons.size()];
+    for (int i = 0; i < epsilons.size(); i++) {
+      byte[] serializedEpsilon = epsilons.get(i).serializeShareLow();
+      epsilonBytes[i] = serializedEpsilon[0];
+      byte[] serializedDelta = deltas.get(i).serializeShareLow();
+      deltaBytes[i] = serializedDelta[0];
+    }
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  @Override
+  public List<SIntPair> out() {
+    return carried;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java
new file mode 100644
index 000000000..f2a6d8bc0
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java
@@ -0,0 +1,103 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.List;
+
+/**
+ * Native protocol for computing logical AND of two values in boolean form.
+ */
+public class Spdz2kPreCarryProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private List<SIntPair> bits;
+  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
+  private List<Spdz2kSIntBoolean<PlainT>> epsilon;
+  private List<Spdz2kSIntBoolean<PlainT>> delta;
+  private SInt carried;
+
+  public Spdz2kPreCarryProtocol(List<SIntPair> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+//    if (bits.size() == 1) {
+//      carried = bits.get(0).getSecond().out();
+//      return EvaluationStatus.IS_DONE;
+//    } else if (round % 2 == 0) {
+//      // sending round
+//      triple = resourcePool.getDataSupplier().getNextBitTripleShares();
+//      epsilon = factory.toSpdz2kSIntBoolean(left).xor(triple.getLeft());
+//      delta = factory.toSpdz2kSIntBoolean(right).xor(triple.getRight());
+//      int packed = epsilon.serializeShareLow()[0] ^ (delta.serializeShareLow()[0] << 1);
+//      final byte[] bytes = new byte[]{(byte) packed};
+//      network.sendToAll(bytes);
+//      return EvaluationStatus.HAS_MORE_ROUNDS;
+//    } else {
+//      // receiving round
+//      Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
+//          resourcePool.getNoOfParties(),
+//          factory);
+//      PlainT e = epsilonAndDelta.getFirst();
+//      PlainT d = epsilonAndDelta.getSecond();
+//      resourcePool.getOpenedValueStore().pushOpenedValues(
+//          Arrays.asList(
+//              epsilon.asArithmetic(),
+//              delta.asArithmetic()
+//          ),
+//          Arrays.asList(
+//              e.toArithmeticRep(),
+//              d.toArithmeticRep()
+//          )
+//      );
+//      int eBit = e.bitValue();
+//      int dBit = d.bitValue();
+//      PlainT ed = e.multiply(d);
+//      // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+//      Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+//      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+//      Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+//      this.carried = tripleProduct
+//          .xor(tripleRight.and(eBit))
+//          .xor(tripleLeft.and(dBit))
+//          .xorOpen(ed,
+//              macKeyShare,
+//              factory.zero().toBitRep(),
+//              resourcePool.getMyId() == 1);
+//      return EvaluationStatus.HAS_MORE_ROUNDS;
+//    }
+      return EvaluationStatus.IS_DONE;
+  }
+
+  /**
+   * Retrieves shares for epsilon and delta and reconstructs each.
+   */
+  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
+      int noOfParties, CompUIntFactory<PlainT> factory) {
+    int received = network.receive(1)[0];
+    PlainT e = factory.fromBit(received & 1); // first bit
+    PlainT d = factory.fromBit((received & 2) >>> 1); // second bit
+    for (int i = 2; i <= noOfParties; i++) {
+      received = network.receive(i)[0];
+      e = e.add(factory.fromBit(received & 1));
+      d = d.add(factory.fromBit((received & 2) >>> 1));
+    }
+    return new Pair<>(e, d);
+  }
+
+  @Override
+  public SInt out() {
+    return carried;
+  }
+}

From 37684b269765956fa4a6026ba7b46eceae45ef7e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 29 Aug 2018 14:20:28 +0200
Subject: [PATCH 189/231] Remove old file

---
 .../natives/Spdz2kPreCarryProtocol.java       | 103 ------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java
deleted file mode 100644
index f2a6d8bc0..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kPreCarryProtocol.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
-
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.util.Pair;
-import dk.alexandra.fresco.framework.util.SIntPair;
-import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import java.util.List;
-
-/**
- * Native protocol for computing logical AND of two values in boolean form.
- */
-public class Spdz2kPreCarryProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
-    Spdz2kNativeProtocol<SInt, PlainT> {
-
-  private List<SIntPair> bits;
-  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
-  private List<Spdz2kSIntBoolean<PlainT>> epsilon;
-  private List<Spdz2kSIntBoolean<PlainT>> delta;
-  private SInt carried;
-
-  public Spdz2kPreCarryProtocol(List<SIntPair> bits) {
-    this.bits = bits;
-  }
-
-  @Override
-  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
-      Network network) {
-    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
-    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-//    if (bits.size() == 1) {
-//      carried = bits.get(0).getSecond().out();
-//      return EvaluationStatus.IS_DONE;
-//    } else if (round % 2 == 0) {
-//      // sending round
-//      triple = resourcePool.getDataSupplier().getNextBitTripleShares();
-//      epsilon = factory.toSpdz2kSIntBoolean(left).xor(triple.getLeft());
-//      delta = factory.toSpdz2kSIntBoolean(right).xor(triple.getRight());
-//      int packed = epsilon.serializeShareLow()[0] ^ (delta.serializeShareLow()[0] << 1);
-//      final byte[] bytes = new byte[]{(byte) packed};
-//      network.sendToAll(bytes);
-//      return EvaluationStatus.HAS_MORE_ROUNDS;
-//    } else {
-//      // receiving round
-//      Pair<PlainT, PlainT> epsilonAndDelta = receiveAndReconstruct(network,
-//          resourcePool.getNoOfParties(),
-//          factory);
-//      PlainT e = epsilonAndDelta.getFirst();
-//      PlainT d = epsilonAndDelta.getSecond();
-//      resourcePool.getOpenedValueStore().pushOpenedValues(
-//          Arrays.asList(
-//              epsilon.asArithmetic(),
-//              delta.asArithmetic()
-//          ),
-//          Arrays.asList(
-//              e.toArithmeticRep(),
-//              d.toArithmeticRep()
-//          )
-//      );
-//      int eBit = e.bitValue();
-//      int dBit = d.bitValue();
-//      PlainT ed = e.multiply(d);
-//      // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
-//      Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
-//      Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
-//      Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
-//      this.carried = tripleProduct
-//          .xor(tripleRight.and(eBit))
-//          .xor(tripleLeft.and(dBit))
-//          .xorOpen(ed,
-//              macKeyShare,
-//              factory.zero().toBitRep(),
-//              resourcePool.getMyId() == 1);
-//      return EvaluationStatus.HAS_MORE_ROUNDS;
-//    }
-      return EvaluationStatus.IS_DONE;
-  }
-
-  /**
-   * Retrieves shares for epsilon and delta and reconstructs each.
-   */
-  private Pair<PlainT, PlainT> receiveAndReconstruct(Network network,
-      int noOfParties, CompUIntFactory<PlainT> factory) {
-    int received = network.receive(1)[0];
-    PlainT e = factory.fromBit(received & 1); // first bit
-    PlainT d = factory.fromBit((received & 2) >>> 1); // second bit
-    for (int i = 2; i <= noOfParties; i++) {
-      received = network.receive(i)[0];
-      e = e.add(factory.fromBit(received & 1));
-      d = d.add(factory.fromBit((received & 2) >>> 1));
-    }
-    return new Pair<>(e, d);
-  }
-
-  @Override
-  public SInt out() {
-    return carried;
-  }
-}

From 89141034a5643a26ba229d9c2d8ba062abd8b810 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 30 Aug 2018 10:47:20 +0200
Subject: [PATCH 190/231] Pack bits

---
 .../fresco/suite/spdz2k/Spdz2kComparison.java | 10 +--
 .../natives/Spdz2kCarryProtocol.java          | 72 +++++++++++++------
 .../computations/TestComparisonSpdz2k.java    |  7 +-
 3 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index d0f8f4f5c..59f60942d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -4,12 +4,14 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.eq.ZeroTestSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kCarryProtocol;
 import java.util.List;
 
 /**
@@ -62,10 +64,10 @@ public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm al
     return compareZero(builder.numeric().sub(x, y), bitlength, algorithm);
   }
 
-//  @Override
-//  public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
-//    return builder.append(new Spdz2kCarryProtocol<>(bitPairs));
-//  }
+  @Override
+  public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
+    return builder.append(new Spdz2kCarryProtocol<>(bitPairs));
+  }
 
   protected CompUIntFactory<PlainT> getFactory() {
     return factory;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
index 05d1956fe..bd54e3057 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
@@ -32,7 +32,6 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     if (round == 0) {
-      System.out.println("bits.size() " + bits.size());
       triples = new ArrayList<>(bits.size());
       epsilons = new ArrayList<>(bits.size());
       deltas = new ArrayList<>(bits.size());
@@ -55,20 +54,19 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
         Spdz2kSIntBoolean<PlainT> g1 = factory.toSpdz2kSIntBoolean(left.getSecond());
         Spdz2kSIntBoolean<PlainT> p2 = factory.toSpdz2kSIntBoolean(right.getFirst());
 
-        // p1 * p2
-        epsilons.add(factory.toSpdz2kSIntBoolean(p1).xor(p1p2Triple.getLeft()));
-        deltas.add(factory.toSpdz2kSIntBoolean(p2).xor(p1p2Triple.getRight()));
-
         // p2 * g1
         epsilons.add(factory.toSpdz2kSIntBoolean(p2).xor(p2g1Triple.getLeft()));
         deltas.add(factory.toSpdz2kSIntBoolean(g1).xor(p2g1Triple.getRight()));
+
+        // p1 * p2
+        epsilons.add(factory.toSpdz2kSIntBoolean(p1).xor(p1p2Triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(p2).xor(p1p2Triple.getRight()));
       }
 
       serializeAndSend(network, epsilons, deltas);
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
-      receiveAndReconstruct(network, factory, resourcePool.getMyId(),
-          resourcePool.getNoOfParties());
+      receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
 
       resourcePool.getOpenedValueStore().pushOpenedValues(
           epsilons.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
@@ -92,11 +90,15 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
         Spdz2kSIntBoolean<PlainT> p = mult(p1p2E, p1p2D, p1p2Triple, macKeyShare, factory,
             resourcePool.getMyId());
 
-        Spdz2kSIntBoolean<PlainT> p2 = factory.toSpdz2kSIntBoolean(bits.get(2 * i).getSecond());
+        Spdz2kSIntBoolean<PlainT> g2 = factory.toSpdz2kSIntBoolean(bits.get(2 * i).getSecond());
 
-        Spdz2kSIntBoolean<PlainT> q = mult(p2g1E, p2g1D, p2g1Triple, macKeyShare, factory,
-            resourcePool.getMyId()).xor(p2);
-        carried.add(new SIntPair(p, q));
+        Spdz2kSIntBoolean<PlainT> g = mult(p2g1E, p2g1D, p2g1Triple, macKeyShare, factory,
+            resourcePool.getMyId()).xor(g2);
+        carried.add(new SIntPair(p, g));
+      }
+      // if we have an odd number of elements the last pair can just be taken directly from the input
+      if (bits.size() % 2 != 0) {
+        carried.add(bits.get(bits.size() - 1));
       }
       return EvaluationStatus.IS_DONE;
     }
@@ -128,21 +130,33 @@ private Spdz2kSIntBoolean<PlainT> mult(
   /**
    * Retrieves shares for epsilons and deltas and reconstructs each.
    */
-  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory, int myId,
+  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory,
       int noOfParties) {
     byte[] rawEpsilons = network.receive(1);
     byte[] rawDeltas = network.receive(1);
+
     for (int i = 0; i < epsilons.size(); i++) {
-      openEpsilons.add(factory.fromBit(rawEpsilons[i]));
-      openDeltas.add(factory.fromBit(rawDeltas[i]));
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+      PlainT e = factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte));
+      openEpsilons.add(e);
+      PlainT d = factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte));
+      openDeltas.add(d);
     }
+
     for (int i = 2; i <= noOfParties; i++) {
       rawEpsilons = network.receive(i);
       rawDeltas = network.receive(i);
 
       for (int j = 0; j < epsilons.size(); j++) {
-        openEpsilons.set(j, openEpsilons.get(j).add(factory.fromBit(rawEpsilons[j])));
-        openDeltas.set(j, openDeltas.get(j).add(factory.fromBit(rawDeltas[j])));
+        int currentByteIdx = j / Byte.SIZE;
+        int bitIndexWithinByte = j % Byte.SIZE;
+        openEpsilons.set(j, openEpsilons.get(j).add(
+            factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+        openDeltas.set(j, openDeltas.get(j).add(
+            factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte))
+        ));
       }
     }
   }
@@ -153,13 +167,27 @@ private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> fact
   private void serializeAndSend(Network network,
       List<Spdz2kSIntBoolean<PlainT>> epsilons,
       List<Spdz2kSIntBoolean<PlainT>> deltas) {
-    byte[] epsilonBytes = new byte[epsilons.size()];
-    byte[] deltaBytes = new byte[epsilons.size()];
+    int numBytes = epsilons.size() / Byte.SIZE;
+    if (epsilons.size() % 8 != 0) {
+      numBytes++;
+    }
+    byte[] epsilonBytes = new byte[numBytes];
+    byte[] deltaBytes = new byte[numBytes];
+
     for (int i = 0; i < epsilons.size(); i++) {
-      byte[] serializedEpsilon = epsilons.get(i).serializeShareLow();
-      epsilonBytes[i] = serializedEpsilon[0];
-      byte[] serializedDelta = deltas.get(i).serializeShareLow();
-      deltaBytes[i] = serializedDelta[0];
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+
+      int serializedEpsilon = epsilons.get(i).getShare().bitValue();
+      epsilonBytes[currentByteIdx] |= ((serializedEpsilon << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+
+      int serializedDelta = deltas
+          .get(i)
+          .getShare()
+          .bitValue();
+      deltaBytes[currentByteIdx] |= ((serializedDelta << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
     }
     network.sendToAll(epsilonBytes);
     network.sendToAll(deltaBytes);
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestComparisonSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestComparisonSpdz2k.java
index 640bcfd15..f9d92af8d 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestComparisonSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestComparisonSpdz2k.java
@@ -66,7 +66,10 @@ public void testCarryOutOneFromCarry() {
 
   @Test
   public void testCarryOutRandom() {
-    runTest(new TestCarryOutSpdz2k<>(new Random(42).nextInt(), new Random(1).nextInt()),
+    Random random = new Random(1);
+    int l = random.nextInt();
+    int r = random.nextInt();
+    runTest(new TestCarryOutSpdz2k<>(l, r),
         EvaluationStrategy.SEQUENTIAL_BATCHED, 2);
   }
 
@@ -110,7 +113,7 @@ public static class TestCarryOutSpdz2k<ResourcePoolT extends ResourcePool>
     private final List<BigInteger> right;
     private final BigInteger expected;
 
-    public TestCarryOutSpdz2k(int l, int r) {
+    TestCarryOutSpdz2k(int l, int r) {
       expected = carry(l, r);
       left = intToBits(l);
       right = new ArrayList<>(left.size());

From a0e3e4cfa58abe4c83ae9e569b056868c51d2fa1 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 30 Aug 2018 16:52:33 +0200
Subject: [PATCH 191/231] Minor fixes

---
 .../fresco/lib/compare/lt/PreCarryBits.java   |  5 +-
 .../natives/Spdz2kAndBatchedProtocol.java     | 65 +++++++++++++------
 .../natives/Spdz2kCarryProtocol.java          | 38 +++++++----
 3 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
index e0e402d5a..2d4974014 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/PreCarryBits.java
@@ -19,10 +19,7 @@ public class PreCarryBits implements Computation<SInt, ProtocolBuilderNumeric> {
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     return builder.seq(seq -> () -> pairsDef)
         .whileLoop((pairs) -> pairs.size() > 1,
-            (prevScope, pairs) -> prevScope.par(par -> {
-//              par.seq(seq -> seq.debug().)
-              return par.comparison().carry(pairs);
-            }))
+            (prevScope, pairs) -> prevScope.par(par -> par.comparison().carry(pairs)))
         .seq((seq, out) -> out.get(0).getSecond());
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
index 3bd95b536..1d1d26bad 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
@@ -2,15 +2,16 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.OpenedValueStore;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Native protocol for computing logical AND of two values in boolean form.
@@ -66,22 +67,18 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     } else {
       receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
 
-      resourcePool.getOpenedValueStore().pushOpenedValues(
-          epsilons.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
-          openEpsilons.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
-      );
-      resourcePool.getOpenedValueStore().pushOpenedValues(
-          deltas.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
-          openDeltas.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
-      );
+      OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
+          .getOpenedValueStore();
 
       for (int i = 0; i < bitsA.size(); i++) {
         Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = triples.get(i);
 
         PlainT e = openEpsilons.get(i);
+        openedValueStore.pushOpenedValue(epsilons.get(i).asArithmetic(), e.toArithmeticRep());
         PlainT d = openDeltas.get(i);
+        openedValueStore.pushOpenedValue(deltas.get(i).asArithmetic(), d.toArithmeticRep());
 
-        Spdz2kSIntBoolean<PlainT> prod = mult(e, d, triple, macKeyShare, factory,
+        Spdz2kSIntBoolean<PlainT> prod = andAfterReceive(e, d, triple, macKeyShare, factory,
             resourcePool.getMyId());
 
         products.add(prod);
@@ -90,7 +87,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     }
   }
 
-  private Spdz2kSIntBoolean<PlainT> mult(
+  private Spdz2kSIntBoolean<PlainT> andAfterReceive(
       PlainT e,
       PlainT d,
       Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,
@@ -120,17 +117,29 @@ private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> fact
       int noOfParties) {
     byte[] rawEpsilons = network.receive(1);
     byte[] rawDeltas = network.receive(1);
+
     for (int i = 0; i < epsilons.size(); i++) {
-      openEpsilons.add(factory.fromBit(rawEpsilons[i]));
-      openDeltas.add(factory.fromBit(rawDeltas[i]));
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+      PlainT e = factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte));
+      openEpsilons.add(e);
+      PlainT d = factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte));
+      openDeltas.add(d);
     }
+
     for (int i = 2; i <= noOfParties; i++) {
       rawEpsilons = network.receive(i);
       rawDeltas = network.receive(i);
 
       for (int j = 0; j < epsilons.size(); j++) {
-        openEpsilons.set(j, openEpsilons.get(j).add(factory.fromBit(rawEpsilons[j])));
-        openDeltas.set(j, openDeltas.get(j).add(factory.fromBit(rawDeltas[j])));
+        int currentByteIdx = j / Byte.SIZE;
+        int bitIndexWithinByte = j % Byte.SIZE;
+        openEpsilons.set(j, openEpsilons.get(j).add(
+            factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+        openDeltas.set(j, openDeltas.get(j).add(
+            factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte))
+        ));
       }
     }
   }
@@ -141,13 +150,27 @@ private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> fact
   private void serializeAndSend(Network network,
       List<Spdz2kSIntBoolean<PlainT>> epsilons,
       List<Spdz2kSIntBoolean<PlainT>> deltas) {
-    byte[] epsilonBytes = new byte[epsilons.size()];
-    byte[] deltaBytes = new byte[epsilons.size()];
+    int numBytes = epsilons.size() / Byte.SIZE;
+    if (epsilons.size() % 8 != 0) {
+      numBytes++;
+    }
+    byte[] epsilonBytes = new byte[numBytes];
+    byte[] deltaBytes = new byte[numBytes];
+
     for (int i = 0; i < epsilons.size(); i++) {
-      byte[] serializedEpsilon = epsilons.get(i).serializeShareLow();
-      epsilonBytes[i] = serializedEpsilon[0];
-      byte[] serializedDelta = deltas.get(i).serializeShareLow();
-      deltaBytes[i] = serializedDelta[0];
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+
+      int serializedEpsilon = epsilons.get(i).getShare().bitValue();
+      epsilonBytes[currentByteIdx] |= ((serializedEpsilon << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+
+      int serializedDelta = deltas
+          .get(i)
+          .getShare()
+          .bitValue();
+      deltaBytes[currentByteIdx] |= ((serializedDelta << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
     }
     network.sendToAll(epsilonBytes);
     network.sendToAll(deltaBytes);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
index bd54e3057..713b7d657 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
@@ -1,15 +1,16 @@
 package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
 
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.OpenedValueStore;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class Spdz2kCarryProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
     Spdz2kNativeProtocol<List<SIntPair>, PlainT> {
@@ -68,31 +69,42 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     } else {
       receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
 
-      resourcePool.getOpenedValueStore().pushOpenedValues(
-          epsilons.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
-          openEpsilons.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
-      );
-      resourcePool.getOpenedValueStore().pushOpenedValues(
-          deltas.stream().map(Spdz2kSIntBoolean::asArithmetic).collect(Collectors.toList()),
-          openDeltas.stream().map(e -> e.toArithmeticRep()).collect(Collectors.toList())
-      );
+      OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
+          .getOpenedValueStore();
 
       for (int i = 0; i < bits.size() / 2; i++) {
         Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p1p2Triple = triples.get(2 * i + 1);
         Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p2g1Triple = triples.get(2 * i);
 
         PlainT p1p2E = openEpsilons.get(2 * i + 1);
+        openedValueStore.pushOpenedValue(
+            epsilons.get(2 * i + 1).asArithmetic(),
+            p1p2E.toArithmeticRep()
+        );
         PlainT p2g1E = openEpsilons.get(2 * i);
+        openedValueStore.pushOpenedValue(
+            epsilons.get(2 * i).asArithmetic(),
+            p2g1E.toArithmeticRep()
+        );
 
         PlainT p1p2D = openDeltas.get(2 * i + 1);
+        openedValueStore.pushOpenedValue(
+            deltas.get(2 * i + 1).asArithmetic(),
+            p1p2D.toArithmeticRep()
+        );
         PlainT p2g1D = openDeltas.get(2 * i);
-
-        Spdz2kSIntBoolean<PlainT> p = mult(p1p2E, p1p2D, p1p2Triple, macKeyShare, factory,
+        openedValueStore.pushOpenedValue(
+            deltas.get(2 * i).asArithmetic(),
+            p2g1D.toArithmeticRep()
+        );
+        Spdz2kSIntBoolean<PlainT> p = andAfterReceive(p1p2E, p1p2D, p1p2Triple, macKeyShare,
+            factory,
             resourcePool.getMyId());
 
         Spdz2kSIntBoolean<PlainT> g2 = factory.toSpdz2kSIntBoolean(bits.get(2 * i).getSecond());
 
-        Spdz2kSIntBoolean<PlainT> g = mult(p2g1E, p2g1D, p2g1Triple, macKeyShare, factory,
+        Spdz2kSIntBoolean<PlainT> g = andAfterReceive(p2g1E, p2g1D, p2g1Triple, macKeyShare,
+            factory,
             resourcePool.getMyId()).xor(g2);
         carried.add(new SIntPair(p, g));
       }
@@ -104,7 +116,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     }
   }
 
-  private Spdz2kSIntBoolean<PlainT> mult(
+  private Spdz2kSIntBoolean<PlainT> andAfterReceive(
       PlainT e,
       PlainT d,
       Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,

From f64054e794a7699c7b897429c7099291a611a4e2 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Fri, 31 Aug 2018 17:13:00 +0200
Subject: [PATCH 192/231] Fix up some lambdas

---
 .../java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java | 8 +++++---
 .../lib/math/integer/binary/GenerateRandomBitMask.java    | 3 ++-
 .../protocols/computations/lt/MostSignBitSpdz2k.java      | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index cd460a392..558dcb99c 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -58,10 +58,12 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     return builder.par(par -> {
       DRes<List<DRes<SInt>>> xored = par.logical().pairWiseXorKnown(openBitsDef, secretBitsDef);
       DRes<List<DRes<SInt>>> anded = par.logical().pairWiseAndKnown(openBitsDef, secretBitsDef);
-      return () -> new Pair<>(xored.out(), anded.out());
+      final Pair<DRes<List<DRes<SInt>>>, DRes<List<DRes<SInt>>>> pair = new Pair<>(xored,
+          anded);
+      return () -> pair;
     }).par((par, pair) -> {
-      List<DRes<SInt>> xoredBits = pair.getFirst();
-      List<DRes<SInt>> andedBits = pair.getSecond();
+      List<DRes<SInt>> xoredBits = pair.getFirst().out();
+      List<DRes<SInt>> andedBits = pair.getSecond().out();
       List<SIntPair> pairs = new ArrayList<>(andedBits.size());
       for (int i = 0; i < secretBits.size(); i++) {
         DRes<SInt> xoredBit = xoredBits.get(i);
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
index b02ae0ee0..9efae14d2 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/binary/GenerateRandomBitMask.java
@@ -41,7 +41,8 @@ public DRes<RandomBitMask> buildComputation(ProtocolBuilderNumeric builder) {
         numBits);
     DRes<SInt> recombined = builder.advancedNumeric()
         .innerProductWithPublicPart(() -> powersOfTwo, randomBits);
-    return () -> new RandomBitMask(randomBits, recombined);
+    final RandomBitMask randomBitMask = new RandomBitMask(randomBits, recombined);
+    return () -> randomBitMask;
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index ec1ddcf3c..5d5977942 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -40,7 +40,8 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           DRes<SInt> r = numeric.add(rPrime, numeric.multByOpen(twoTo2k1, kthBit));
           DRes<SInt> c = numeric.add(value, r);
           DRes<OInt> cOpen = numeric.openAsOInt(c);
-          return () -> new Pair<>(cOpen, mask);
+          final Pair<DRes<OInt>, RandomBitMask> resPair = new Pair<>(cOpen, mask);
+          return () -> resPair;
         }).seq((seq, pair) -> {
           Numeric nb = seq.numeric();
           PlainT cOpen = factory.fromOInt(pair.getFirst());
@@ -56,7 +57,8 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           DRes<SInt> b = nb.randomBit();
           DRes<SInt> e = nb.add(d, nb.multByOpen(twoTo2k1, b));
           DRes<OInt> eOpen = nb.openAsOInt(e);
-          return () -> new Pair<>(eOpen, b);
+          final Pair<DRes<OInt>, DRes<SInt>> resPair = new Pair<>(eOpen, b);
+          return () -> resPair;
         }).seq((seq, pair) -> {
           Numeric nb = seq.numeric();
           PlainT eOpen = factory.fromOInt(pair.getFirst());

From d541c69267c69eed27cdf0b72d4449d4cf9e7a2c Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 3 Sep 2018 12:43:49 +0200
Subject: [PATCH 193/231] comp uint 64

---
 .../framework/util/ByteAndBitConverter.java   |  26 +++
 .../suite/spdz2k/datatypes/CompUInt128.java   |  37 +---
 .../suite/spdz2k/datatypes/CompUInt64.java    | 181 ++++++++++++++++++
 .../spdz2k/datatypes/TestCompUInt64.java      |  59 ++++++
 4 files changed, 272 insertions(+), 31 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ByteAndBitConverter.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ByteAndBitConverter.java
index ed9d9b03b..0deca178b 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ByteAndBitConverter.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ByteAndBitConverter.java
@@ -104,6 +104,32 @@ public static String toHex(boolean[] bits) {
     return hex.toString();
   }
 
+  /**
+   * Given a larger, pre-allocated byte array, reads out a long starting at start index.
+   */
+  public static long toLong(byte[] bytes, int start) {
+    int flipped = bytes.length - start - 1;
+    return (bytes[flipped] & 0xFFL)
+        | (bytes[flipped - 1] & 0xFFL) << 8
+        | (bytes[flipped - 2] & 0xFFL) << 16
+        | (bytes[flipped - 3] & 0xFFL) << 24
+        | (bytes[flipped - 4] & 0xFFL) << 32
+        | (bytes[flipped - 5] & 0xFFL) << 40
+        | (bytes[flipped - 6] & 0xFFL) << 48
+        | (bytes[flipped - 7] & 0xFFL) << 56;
+  }
+
+  /**
+   * Same as {@link #toLong(byte[], int)} but for an int.
+   */
+  public static int toInt(byte[] bytes, int start) {
+    int flipped = bytes.length - start - 1;
+    return (bytes[flipped] & 0xFF)
+        | (bytes[flipped - 1] & 0xFF) << 8
+        | (bytes[flipped - 2] & 0xFF) << 16
+        | (bytes[flipped - 3] & 0xFF) << 24;
+  }
+
   public static String toHex(List<Boolean> bits) {
     Boolean[] bitArray = bits.toArray(new Boolean[1]);
     return toHex(convertArray(bitArray));
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index 4d8e684c1..a2de5c1ae 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -1,5 +1,6 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
+import dk.alexandra.fresco.framework.util.ByteAndBitConverter;
 import dk.alexandra.fresco.framework.value.OInt;
 import java.math.BigInteger;
 
@@ -36,12 +37,12 @@ public CompUInt128(byte[] bytes, boolean requiresPadding) {
     if (padded.length == 8) {
       // we are instantiating from the least significant bits only
       this.high = 0L;
-      this.mid = toInt(padded, 4);
-      this.low = toInt(padded, 0);
+      this.mid = ByteAndBitConverter.toInt(padded, 4);
+      this.low = ByteAndBitConverter.toInt(padded, 0);
     } else {
-      this.high = toLong(padded, 8);
-      this.mid = toInt(padded, 4);
-      this.low = toInt(padded, 0);
+      this.high = ByteAndBitConverter.toLong(padded, 8);
+      this.mid = ByteAndBitConverter.toInt(padded, 4);
+      this.low = ByteAndBitConverter.toInt(padded, 0);
     }
   }
 
@@ -342,30 +343,4 @@ private void toByteArray(byte[] bytes, int start, int value) {
     }
   }
 
-  private static long toLong(byte[] bytes, int start) {
-    int flipped = bytes.length - start - 1;
-    return (bytes[flipped] & 0xFFL)
-        | (bytes[flipped - 1] & 0xFFL) << 8
-        | (bytes[flipped - 2] & 0xFFL) << 16
-        | (bytes[flipped - 3] & 0xFFL) << 24
-        | (bytes[flipped - 4] & 0xFFL) << 32
-        | (bytes[flipped - 5] & 0xFFL) << 40
-        | (bytes[flipped - 6] & 0xFFL) << 48
-        | (bytes[flipped - 7] & 0xFFL) << 56;
-  }
-
-  private static int toInt(byte[] bytes, int start) {
-    int flipped = bytes.length - start - 1;
-    return (bytes[flipped] & 0xFF)
-        | (bytes[flipped - 1] & 0xFF) << 8
-        | (bytes[flipped - 2] & 0xFF) << 16
-        | (bytes[flipped - 3] & 0xFF) << 24;
-  }
-
-  public static void main(String args[]) {
-    int n = (Long.SIZE - 1);
-    System.out.println(n);
-    System.out.println(100 << n);
-  }
-
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
new file mode 100644
index 000000000..8ee1d8478
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
@@ -0,0 +1,181 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import dk.alexandra.fresco.framework.util.ByteAndBitConverter;
+import dk.alexandra.fresco.framework.value.OInt;
+import java.math.BigInteger;
+
+public class CompUInt64 implements CompUInt<UInt32, UInt32, CompUInt64> {
+
+  private static final CompUInt64 ZERO = new CompUInt64(0);
+  private static final CompUInt64 ONE = new CompUInt64(1);
+
+  private final long value;
+
+  public CompUInt64(byte[] bytes) {
+    this(bytes, false);
+  }
+
+  public CompUInt64(byte[] bytes, boolean requiresPadding) {
+    byte[] padded = requiresPadding ? CompUInt.pad(bytes, 64) : bytes;
+    if (padded.length == 4) {
+      // we are instantiating from the least significant bits only
+      this.value = ByteAndBitConverter.toInt(padded, 0);
+    } else {
+      this.value = ByteAndBitConverter.toLong(padded, 0);
+    }
+  }
+
+  public CompUInt64(long value) {
+    this.value = value;
+  }
+
+  public CompUInt64(BigInteger value) {
+    this.value = value.longValue();
+  }
+
+  @Override
+  public UInt32 getMostSignificant() {
+    return new UInt32((int) (value >>> 32));
+  }
+
+  @Override
+  public UInt32 getLeastSignificant() {
+    return new UInt32((int) (value));
+  }
+
+  @Override
+  public UInt32 getLeastSignificantAsHigh() {
+    return new UInt32((int) (value));
+  }
+
+  @Override
+  public CompUInt64 shiftLeftSmall(int n) {
+    return new CompUInt64(value << n);
+  }
+
+  @Override
+  public CompUInt64 shiftRightSmall(int n) {
+    return new CompUInt64(value >>> n);
+  }
+
+  @Override
+  public CompUInt64 shiftRightLowOnly(int n) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public CompUInt64 shiftLowIntoHigh() {
+    return new CompUInt64(value << 32);
+  }
+
+  @Override
+  public CompUInt64 clearAboveBitAt(int bitPos) {
+    long mask = ~(0x8000000000000000L >> (63 - bitPos));
+    return new CompUInt64(value & mask);
+  }
+
+  @Override
+  public CompUInt64 clearHighBits() {
+    return new CompUInt64((value & 0xffffffffL));
+  }
+
+  @Override
+  public CompUInt64 toBitRep() {
+    return null;
+  }
+
+  @Override
+  public CompUInt64 toArithmeticRep() {
+    throw new IllegalStateException("Already arithmetic");
+  }
+
+  @Override
+  public CompUInt64 multiplyByBit(int bit) {
+    return new CompUInt64(this.value * bit);
+  }
+
+  @Override
+  public boolean testBit(int bitPos) {
+    return (((1L << bitPos) & value) >>> bitPos) == 1;
+  }
+
+  @Override
+  public CompUInt64 testBitAsUInt(int bitPos) {
+    return testBit(bitPos) ? ONE : ZERO;
+  }
+
+  @Override
+  public int getLowBitLength() {
+    return 32;
+  }
+
+  @Override
+  public int getHighBitLength() {
+    return 32;
+  }
+
+  @Override
+  public byte[] serializeLeastSignificant() {
+    return ByteAndBitConverter.toByteArray((int) value);
+  }
+
+  @Override
+  public int bitValue() {
+    return (int) value & 1; // lowest bit
+  }
+
+  @Override
+  public OInt out() {
+    return this;
+  }
+
+  @Override
+  public CompUInt64 add(CompUInt64 other) {
+    return new CompUInt64(value + other.value);
+  }
+
+  @Override
+  public CompUInt64 multiply(CompUInt64 other) {
+    return new CompUInt64(value * other.value);
+  }
+
+  @Override
+  public CompUInt64 subtract(CompUInt64 other) {
+    return new CompUInt64(value - other.value);
+  }
+
+  @Override
+  public CompUInt64 negate() {
+    return new CompUInt64(-value);
+  }
+
+  @Override
+  public boolean isZero() {
+    return value == 0;
+  }
+
+  @Override
+  public boolean isOne() {
+    return value == 1;
+  }
+
+  @Override
+  public byte[] toByteArray() {
+    return ByteAndBitConverter.toByteArray(value);
+  }
+
+  @Override
+  public BigInteger toBigInteger() {
+    return new BigInteger(1, toByteArray());
+  }
+
+  @Override
+  public long toLong() {
+    return value;
+  }
+
+  @Override
+  public int toInt() {
+    return (int) value;
+  }
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java
new file mode 100644
index 000000000..9644575f7
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java
@@ -0,0 +1,59 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import dk.alexandra.fresco.framework.util.ByteAndBitConverter;
+import java.math.BigInteger;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestCompUInt64 {
+
+  @Test
+  public void clearAboveBitAt() {
+    for (int i = 0; i < Long.SIZE - 2; i++) {
+      BigInteger input = BigInteger.ONE.shiftLeft(i + 1).add(BigInteger.ONE);
+      final BigInteger actual = new CompUInt64(input).clearAboveBitAt(i + 1).toBigInteger();
+      Assert.assertEquals("Failed at " + i + " expected 1 but was " + actual,
+          BigInteger.ONE,
+          actual);
+    }
+  }
+
+  @Test
+  public void clearHighBits() {
+    Assert.assertEquals(
+        new CompUInt64(1234L).toBigInteger(),
+        new CompUInt64((12L << 34) + 1234L).clearHighBits().toBigInteger());
+  }
+
+  @Test
+  public void toBitRep() {
+  }
+
+  @Test
+  public void testBit() {
+    Assert.assertEquals(
+        true, new CompUInt64(BigInteger.ONE.shiftLeft(30).longValue()).testBit(30));
+    Assert.assertEquals(
+        false, new CompUInt64(BigInteger.ONE.shiftLeft(30).longValue()).testBit(29));
+    Assert.assertEquals(
+        true, new CompUInt64(BigInteger.ONE.longValue()).testBit(0));
+    Assert.assertEquals(
+        false, new CompUInt64(BigInteger.ONE.longValue()).testBit(1));
+  }
+
+  @Test
+  public void serializeLeastSignificant() {
+    long input = 1231139128938112323L;
+    Assert.assertArrayEquals(
+        ByteAndBitConverter.toByteArray((int) input),
+        new CompUInt64(input).serializeLeastSignificant());
+  }
+
+  @Test
+  public void toByteArray() {
+    long input = 1231139128938112323L;
+    Assert.assertArrayEquals(
+        ByteAndBitConverter.toByteArray(input),
+        new CompUInt64(input).toByteArray());
+  }
+}

From ec17e53e93d9ae2ec1eae09b8539b50d5a56ebf2 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 3 Sep 2018 12:44:32 +0200
Subject: [PATCH 194/231] 64 spdz2k suite

---
 .../suite/spdz2k/Spdz2kProtocolSuite64.java   | 20 ++++++
 .../spdz2k/datatypes/CompUInt64Factory.java   | 67 +++++++++++++++++
 .../spdz2k/datatypes/CompUIntConverter64.java | 15 ++++
 .../fresco/suite/spdz2k/TestSpdz2k64.java     | 72 +++++++++++++++++++
 4 files changed, 174 insertions(+)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite64.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k64.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite64.java
new file mode 100644
index 000000000..f7904e7ba
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite64.java
@@ -0,0 +1,20 @@
+package dk.alexandra.fresco.suite.spdz2k;
+
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt64;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter64;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt32;
+
+/**
+ * Protocol suite using {@link CompUInt64} as the underlying plain-value type.
+ */
+public class Spdz2kProtocolSuite64 extends Spdz2kProtocolSuite<UInt32, UInt32, CompUInt64> {
+
+  public Spdz2kProtocolSuite64(boolean useBooleanMode) {
+    super(new CompUIntConverter64(), useBooleanMode);
+  }
+
+  public Spdz2kProtocolSuite64() {
+    this(false);
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
new file mode 100644
index 000000000..ef17a37d7
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
@@ -0,0 +1,67 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.suite.spdz2k.util.UIntSerializer;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+
+public class CompUInt64Factory implements CompUIntFactory<CompUInt64> {
+
+  private static final CompUInt64 ZERO = new CompUInt64(0);
+  private static final CompUInt64 ONE = new CompUInt64(1);
+  private static final CompUInt64 TWO = new CompUInt64(2);
+  private final SecureRandom random = new SecureRandom();
+
+  @Override
+  public CompUInt64 createFromBytes(byte[] bytes) {
+    return new CompUInt64(bytes);
+  }
+
+  @Override
+  public CompUInt64 createRandom() {
+    byte[] bytes = new byte[8];
+    this.random.nextBytes(bytes);
+    return createFromBytes(bytes);
+  }
+
+  @Override
+  public CompUInt64 fromBit(int bit) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ByteSerializer<CompUInt64> createSerializer() {
+    return new UIntSerializer<>(this);
+  }
+
+  @Override
+  public int getLowBitLength() {
+    return 32;
+  }
+
+  @Override
+  public int getHighBitLength() {
+    return 32;
+  }
+
+  @Override
+  public CompUInt64 createFromBigInteger(BigInteger value) {
+    return value == null ? null : new CompUInt64(value);
+  }
+
+  @Override
+  public CompUInt64 zero() {
+    return ZERO;
+  }
+
+  @Override
+  public CompUInt64 one() {
+    return ONE;
+  }
+
+  @Override
+  public CompUInt64 two() {
+    return TWO;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java
new file mode 100644
index 000000000..80374ab21
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java
@@ -0,0 +1,15 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+public class CompUIntConverter64 implements CompUIntConverter<UInt32, UInt32, CompUInt64> {
+
+  @Override
+  public CompUInt64 createFromHigh(UInt32 value) {
+    return new CompUInt64(value.toInt());
+  }
+
+  @Override
+  public CompUInt64 createFromLow(UInt32 value) {
+    return new CompUInt64(value.toInt());
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k64.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k64.java
new file mode 100644
index 000000000..67b0642e7
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k64.java
@@ -0,0 +1,72 @@
+package dk.alexandra.fresco.suite.spdz2k;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.AesCtrDrbg;
+import dk.alexandra.fresco.suite.ProtocolSuiteNumeric;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt64;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt64Factory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
+import java.util.function.Supplier;
+
+public class TestSpdz2k64 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt64>> {
+
+  @Override
+  protected Spdz2kResourcePool<CompUInt64> createResourcePool(int playerId, int noOfParties,
+      Supplier<Network> networkSupplier) {
+    CompUIntFactory<CompUInt64> factory = new CompUInt64Factory();
+    Spdz2kResourcePool<CompUInt64> resourcePool =
+        new Spdz2kResourcePoolImpl<>(
+            playerId,
+            noOfParties, null,
+            new Spdz2kOpenedValueStoreImpl<>(),
+            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, factory.createRandom(), factory),
+            factory);
+    resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
+    return resourcePool;
+  }
+
+  @Override
+  protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt64>> createProtocolSuite() {
+    return new Spdz2kProtocolSuite64(true);
+  }
+
+  // TODO implement fixed-point arithmetic
+
+  @Override
+  public void testRealInput() {
+  }
+
+  @Override
+  public void testRealOpenToParty() {
+  }
+
+  @Override
+  public void testRealKnown() {
+  }
+
+  @Override
+  public void test_Real_Add_Secret() {
+  }
+
+  @Override
+  public void test_Real_Mult_Known() {
+  }
+
+  @Override
+  public void test_Real_Mults() {
+  }
+
+  @Override
+  public void test_Real_Mults_Isolated() {
+  }
+
+  @Override
+  protected int getMaxBitLength() {
+    return 32;
+  }
+
+}

From f4369bec752be3436fba4ceba874af5f811f8174 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 3 Sep 2018 14:14:43 +0200
Subject: [PATCH 195/231] Update mult by bit 128

---
 .../alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index 547175d43..b0eb0daf3 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -72,7 +72,7 @@ public int bitValue() {
 
   @Override
   public CompUInt128 multiplyByBit(int value) {
-    return new CompUInt128Bit(high * value, mid & (value << 31), 0);
+    return multiply(new CompUInt128Bit(0L, value));
   }
 
 }

From 0c1248e268d471af12fc0950b7459be7ee9f86fa Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 3 Sep 2018 14:15:06 +0200
Subject: [PATCH 196/231] Bit version 64

---
 .../suite/spdz2k/datatypes/CompUInt64.java    |   4 +-
 .../suite/spdz2k/datatypes/CompUInt64Bit.java |  70 +++++++++++
 .../spdz2k/datatypes/TestCompUInt64Bit.java   | 110 ++++++++++++++++++
 3 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
 create mode 100644 suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
index 8ee1d8478..56f6e4ce8 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
@@ -9,7 +9,7 @@ public class CompUInt64 implements CompUInt<UInt32, UInt32, CompUInt64> {
   private static final CompUInt64 ZERO = new CompUInt64(0);
   private static final CompUInt64 ONE = new CompUInt64(1);
 
-  private final long value;
+  protected final long value;
 
   public CompUInt64(byte[] bytes) {
     this(bytes, false);
@@ -81,7 +81,7 @@ public CompUInt64 clearHighBits() {
 
   @Override
   public CompUInt64 toBitRep() {
-    return null;
+    return new CompUInt64Bit(value << 31);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
new file mode 100644
index 000000000..ff7785f19
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
@@ -0,0 +1,70 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+public class CompUInt64Bit extends CompUInt64 {
+
+  public CompUInt64Bit(int high, int bit) {
+    super((UInt.toUnLong(high) << 32) | UInt.toUnLong(bit) << 31);
+  }
+
+  public CompUInt64Bit(long value) {
+    super(value);
+  }
+
+  @Override
+  public CompUInt64 toBitRep() {
+    throw new IllegalStateException("Already in bit form.");
+  }
+
+  @Override
+  public CompUInt64 toArithmeticRep() {
+    return new CompUInt64(value);
+  }
+
+  @Override
+  public CompUInt64 multiply(CompUInt64 other) {
+    return new CompUInt64Bit(((value >>> 31) * (other.value >>> 31)) << 31);
+  }
+
+  @Override
+  public CompUInt64 add(CompUInt64 other) {
+    return new CompUInt64Bit(((value >>> 31) + (other.value >>> 31)) << 31);
+  }
+
+  @Override
+  public String toString() {
+    return toBigInteger().toString() + "B";
+  }
+
+  @Override
+  public CompUInt64 subtract(CompUInt64 other) {
+    throw new UnsupportedOperationException("Subtraction not supported by bit representation");
+  }
+
+  @Override
+  public CompUInt64 negate() {
+    throw new UnsupportedOperationException("Negation not supported by bit representation");
+  }
+
+  @Override
+  public int bitValue() {
+    return ((int) (value & 0x80000000)) >>> 31;
+  }
+
+  @Override
+  public byte[] serializeLeastSignificant() {
+    return new byte[]{(byte) bitValue()};
+  }
+
+  @Override
+  public CompUInt64 clearHighBits() {
+    return new CompUInt64Bit((value & 0xffffffffL));
+  }
+
+  @Override
+  public CompUInt64 multiplyByBit(int bitValue) {
+    long low = (value & 0x80000000) & (bitValue << 31);
+    long high = (this.value & 0xffffffff00000000L) * bitValue;
+    return new CompUInt64Bit(high | low);
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java
new file mode 100644
index 000000000..31c4e5d62
--- /dev/null
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java
@@ -0,0 +1,110 @@
+package dk.alexandra.fresco.suite.spdz2k.datatypes;
+
+import java.math.BigInteger;
+import java.util.Random;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestCompUInt64Bit {
+
+  private static final BigInteger twoTo64 = BigInteger.ONE.shiftLeft(64);
+
+  private static int rand(int seed) {
+    return new Random(seed).nextInt();
+  }
+
+  private static BigInteger bigInt64(BigInteger value33) {
+    return value33.shiftLeft(31).mod(twoTo64);
+  }
+
+  private static BigInteger bigInt33(int high, int bit) {
+    return BigInteger.valueOf(high).shiftLeft(1)
+        .add(BigInteger.valueOf(bit))
+        .mod(twoTo64);
+  }
+
+  @Test
+  public void testConstruct() {
+    Assert.assertEquals(BigInteger.valueOf(111).shiftLeft(32),
+        new CompUInt64Bit(111, 0).toBigInteger());
+    Assert.assertEquals(BigInteger.valueOf(rand(1)).shiftLeft(32).mod(twoTo64),
+        new CompUInt64Bit(rand(1), 0).toBigInteger());
+    Assert.assertEquals(
+        BigInteger.valueOf(rand(2)).shiftLeft(32).add(BigInteger.valueOf(1L).shiftLeft(31))
+            .mod(twoTo64),
+        new CompUInt64Bit(rand(2), 1).toBigInteger());
+  }
+
+  @Test
+  public void testBitValue() {
+    Assert.assertEquals(
+        0,
+        new CompUInt64Bit(111, 0).bitValue());
+    Assert.assertEquals(
+        0,
+        new CompUInt64Bit(rand(1), 0).bitValue());
+    Assert.assertEquals(
+        1,
+        new CompUInt64Bit(rand(2), 1).bitValue());
+    Assert.assertEquals(
+        1,
+        new CompUInt64Bit(0, 1).bitValue());
+    Assert.assertEquals(
+        0,
+        new CompUInt64Bit(0, 0).bitValue());
+  }
+
+  @Test
+  public void testMultiply() {
+    Assert.assertEquals(
+        bigInt64(bigInt33(rand(3), 0).multiply(bigInt33(rand(4), 0))),
+        new CompUInt64Bit(rand(3), 0).multiply(new CompUInt64Bit(rand(4), 0)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt64(bigInt33(rand(3), 1).multiply(bigInt33(rand(4), 0))),
+        new CompUInt64Bit(rand(3), 1).multiply(new CompUInt64Bit(rand(4), 0)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt64(bigInt33(1, 1).multiply(bigInt33(1, 1))),
+        new CompUInt64Bit(1, 1).multiply(new CompUInt64Bit(1, 1)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt64(bigInt33(rand(3), 1).multiply(bigInt33(rand(4), 1))),
+        new CompUInt64Bit(rand(3), 1).multiply(new CompUInt64Bit(rand(4), 1)).toBigInteger()
+    );
+  }
+
+  @Test
+  public void testAdd() {
+    Assert.assertEquals(
+        bigInt64(bigInt33(rand(3), 0).add(bigInt33(rand(4), 0))),
+        new CompUInt64Bit(rand(3), 0).add(new CompUInt64Bit(rand(4), 0)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt64(bigInt33(rand(3), 1).add(bigInt33(rand(4), 0))).toString(2),
+        new CompUInt64Bit(rand(3), 1).add(new CompUInt64Bit(rand(4), 0)).toBigInteger()
+            .toString(2)
+    );
+    Assert.assertEquals(
+        bigInt64(bigInt33(1, 1).add(bigInt33(1, 1))),
+        new CompUInt64Bit(1, 1).add(new CompUInt64Bit(1, 1)).toBigInteger()
+    );
+    Assert.assertEquals(
+        bigInt64(bigInt33(rand(3), 1).add(bigInt33(rand(4), 1))),
+        new CompUInt64Bit(rand(3), 1).add(new CompUInt64Bit(rand(4), 1)).toBigInteger()
+    );
+  }
+
+  @Test
+  public void testSerializeLeastSignificant() {
+    Assert.assertArrayEquals(
+        new byte[]{0},
+        new CompUInt128Bit(rand(42), 0).serializeLeastSignificant()
+    );
+    Assert.assertArrayEquals(
+        new byte[]{1},
+        new CompUInt128Bit(rand(42), 1).serializeLeastSignificant()
+    );
+  }
+
+}

From 2a95b98f168310d7743e556cec2217a722276b14 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 3 Sep 2018 18:02:17 +0200
Subject: [PATCH 197/231] Boolean mode

---
 .../fresco/lib/compare/CompareTests.java      | 21 +++++++++++------
 .../fresco/suite/spdz2k/Spdz2kComparison.java |  4 ++--
 .../suite/spdz2k/datatypes/CompUInt.java      |  4 ----
 .../spdz2k/datatypes/CompUInt128Bit.java      |  4 ----
 .../suite/spdz2k/datatypes/CompUInt64.java    | 16 +++++++++----
 .../suite/spdz2k/datatypes/CompUInt64Bit.java |  8 +++----
 .../spdz2k/datatypes/CompUInt64Factory.java   |  2 +-
 .../spdz2k/datatypes/CompUIntConverter64.java |  6 +++--
 .../suite/spdz2k/datatypes/Spdz2kSInt.java    |  4 ----
 .../MacCheckComputationSpdz2k.java            | 16 ++++++++++++-
 .../natives/Spdz2kAndBatchedProtocol.java     |  3 +++
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  |  2 +-
 .../spdz2k/datatypes/TestCompUInt64.java      | 10 ++++++++
 .../spdz2k/datatypes/TestCompUInt64Bit.java   |  4 ++--
 .../datatypes/TestSpdz2kSIntBoolean.java      | 23 ++++++++++++++++---
 .../TestLogicalOperationsSpdz2k.java          |  2 +-
 16 files changed, 87 insertions(+), 42 deletions(-)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index c98124eac..e0bbc292c 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -201,26 +201,33 @@ public void test() throws Exception {
   public static class TestCompareEQZero<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
+    private int bitLength;
+
+    public TestCompareEQZero(int bitLength) {
+      this.bitLength = bitLength;
+    }
+
     @Override
     public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
       return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
 
+
         @Override
-        public void test() throws Exception {
+        public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = builder -> {
             Numeric input = builder.numeric();
             DRes<SInt> w = input.known(BigInteger.valueOf(-1));
             DRes<SInt> x = input.known(BigInteger.valueOf(0));
             // Max positive value
-            DRes<SInt> y = input.known(BigInteger.valueOf(2).pow(63).subtract(
+            DRes<SInt> y = input.known(BigInteger.valueOf(2).pow(bitLength - 1).subtract(
                 BigInteger.ONE));
             // Min negative value
-            DRes<SInt> z = input.known(BigInteger.valueOf(2).pow(63).negate());
+            DRes<SInt> z = input.known(BigInteger.valueOf(2).pow(bitLength - 1).negate());
             Comparison comparison = builder.comparison();
-            DRes<SInt> compResult1 = comparison.compareZero(w, 64);
-            DRes<SInt> compResult2 = comparison.compareZero(x, 64);
-            DRes<SInt> compResult3 = comparison.compareZero(y, 64);
-            DRes<SInt> compResult4 = comparison.compareZero(z, 64);
+            DRes<SInt> compResult1 = comparison.compareZero(w, bitLength);
+            DRes<SInt> compResult2 = comparison.compareZero(x, bitLength);
+            DRes<SInt> compResult3 = comparison.compareZero(y, bitLength);
+            DRes<SInt> compResult4 = comparison.compareZero(z, bitLength);
             Numeric open = builder.numeric();
             DRes<BigInteger> res1 = open.open(compResult1);
             DRes<BigInteger> res2 = open.open(compResult2);
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index 59f60942d..186b4de74 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -46,8 +46,8 @@ public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> sec
   }
 
   @Override
-  public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm) {
-    if (bitlength > factory.getLowBitLength()) {
+  public DRes<SInt> compareZero(DRes<SInt> x, int bitLength, Algorithm algorithm) {
+    if (bitLength > factory.getLowBitLength()) {
       throw new IllegalArgumentException(
           "Only support bit lengths up to " + factory.getLowBitLength());
     }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
index 9d236018e..4423e5c7c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt.java
@@ -110,10 +110,6 @@ default int getBitLength() {
     return getCompositeBitLength();
   }
 
-  default byte[] serializeWhole() {
-    return toByteArray();
-  }
-
   default byte[] serializeLeastSignificant() {
     return getLeastSignificant().toByteArray();
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
index b0eb0daf3..183a947bc 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Bit.java
@@ -10,10 +10,6 @@ public CompUInt128Bit(long high, int bit) {
     super(high, bit << 31, 0);
   }
 
-  public CompUInt128Bit(CompUInt128 other) {
-    super(other);
-  }
-
   @Override
   public CompUInt128 multiply(CompUInt128 other) {
     int bit = mid >>> 31;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
index 56f6e4ce8..7fc9b98d7 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
@@ -19,7 +19,7 @@ public CompUInt64(byte[] bytes, boolean requiresPadding) {
     byte[] padded = requiresPadding ? CompUInt.pad(bytes, 64) : bytes;
     if (padded.length == 4) {
       // we are instantiating from the least significant bits only
-      this.value = ByteAndBitConverter.toInt(padded, 0);
+      this.value = UInt.toUnLong(ByteAndBitConverter.toInt(padded, 0));
     } else {
       this.value = ByteAndBitConverter.toLong(padded, 0);
     }
@@ -40,12 +40,12 @@ public UInt32 getMostSignificant() {
 
   @Override
   public UInt32 getLeastSignificant() {
-    return new UInt32((int) (value));
+    return new UInt32((int) (value & 0xfffffffffL));
   }
 
   @Override
   public UInt32 getLeastSignificantAsHigh() {
-    return new UInt32((int) (value));
+    return new UInt32((int) (value & 0xfffffffffL));
   }
 
   @Override
@@ -116,7 +116,7 @@ public int getHighBitLength() {
 
   @Override
   public byte[] serializeLeastSignificant() {
-    return ByteAndBitConverter.toByteArray((int) value);
+    return ByteAndBitConverter.toByteArray((int) (value));
   }
 
   @Override
@@ -176,6 +176,12 @@ public long toLong() {
 
   @Override
   public int toInt() {
-    return (int) value;
+    return (int) (value & 0xffffffffL);
   }
+
+  @Override
+  public String toString() {
+    return toBigInteger().toString();
+  }
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
index ff7785f19..cce708f6c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
@@ -47,7 +47,7 @@ public CompUInt64 negate() {
 
   @Override
   public int bitValue() {
-    return ((int) (value & 0x80000000)) >>> 31;
+    return (int) (((value & 0x80000000L)) >>> 31);
   }
 
   @Override
@@ -57,14 +57,12 @@ public byte[] serializeLeastSignificant() {
 
   @Override
   public CompUInt64 clearHighBits() {
-    return new CompUInt64Bit((value & 0xffffffffL));
+    return new CompUInt64Bit(value & 0xffffffffL);
   }
 
   @Override
   public CompUInt64 multiplyByBit(int bitValue) {
-    long low = (value & 0x80000000) & (bitValue << 31);
-    long high = (this.value & 0xffffffff00000000L) * bitValue;
-    return new CompUInt64Bit(high | low);
+    return this.multiply(new CompUInt64Bit(0, bitValue));
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
index ef17a37d7..42cc3d680 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
@@ -26,7 +26,7 @@ public CompUInt64 createRandom() {
 
   @Override
   public CompUInt64 fromBit(int bit) {
-    throw new UnsupportedOperationException();
+    return new CompUInt64Bit(0, (bit) & 1);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java
index 80374ab21..f73ac5966 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntConverter64.java
@@ -4,12 +4,14 @@ public class CompUIntConverter64 implements CompUIntConverter<UInt32, UInt32, Co
 
   @Override
   public CompUInt64 createFromHigh(UInt32 value) {
-    return new CompUInt64(value.toInt());
+    return new CompUInt64(
+        UInt.toUnLong(value.toInt())
+    );
   }
 
   @Override
   public CompUInt64 createFromLow(UInt32 value) {
-    return new CompUInt64(value.toInt());
+    return new CompUInt64(UInt.toUnLong(value.toInt()));
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
index ae7f3dedb..f2c0f47e0 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/Spdz2kSInt.java
@@ -30,10 +30,6 @@ public byte[] serializeShareLow() {
     return share.serializeLeastSignificant();
   }
 
-  public byte[] serializeShareWhole() {
-    return share.serializeWhole();
-  }
-
   @Override
   public SInt out() {
     return this;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
index 2ebfb9e97..93554c6c0 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
@@ -67,6 +67,10 @@ public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<P
   public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
     PlainT macKeyShare = supplier.getSecretSharedKey();
     PlainT y = UInt.innerProduct(openValues, randomCoefficients);
+//    System.out.println("macKeyShare " + macKeyShare);
+//    System.out.println("openValues " + openValues);
+//    System.out.println("authenticatedElements " + authenticatedElements);
+//    System.out.println("randomCoefficients " + randomCoefficients);
     Spdz2kSIntArithmetic<PlainT> r = supplier.getNextRandomElementShare();
     return builder
         .seq(seq -> {
@@ -97,7 +101,11 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
 
   private HighT computePj(PlainT originalShare, PlainT randomCoefficient) {
     HighT overflow = computeDifference(originalShare);
+//    System.out.println("overflow " + overflow);
+//    System.out.println("randomCoefficient " + randomCoefficient);
     HighT randomCoefficientHigh = randomCoefficient.getLeastSignificantAsHigh();
+//    System.out.println(randomCoefficientHigh.getBitLength());
+//    System.out.println("randomCoefficientAsHigh " + randomCoefficientHigh);
     return overflow.multiply(randomCoefficientHigh);
   }
 
@@ -110,7 +118,9 @@ private DRes<List<byte[]>> computePValues(ProtocolBuilderNumeric builder,
       PlainT randomCoefficient = randomCoefficients.get(i);
       pj = pj.add(computePj(share, randomCoefficient));
     }
-    byte[] pjBytes = pj.add(r.getShare().getLeastSignificantAsHigh()).toByteArray();
+    final HighT add = pj.add(r.getShare().getLeastSignificantAsHigh());
+//    System.out.println("add " + add);
+    byte[] pjBytes = add.toByteArray();
     return new BroadcastComputation<ProtocolBuilderNumeric>(pjBytes).buildComputation(builder);
   }
 
@@ -119,6 +129,7 @@ private DRes<List<byte[]>> computeZValues(ProtocolBuilderNumeric builder,
       PlainT macKeyShare, PlainT y, Spdz2kSIntArithmetic<PlainT> r,
       List<byte[]> broadcastPjs) {
     List<PlainT> pjList = serializer.deserializeList(broadcastPjs);
+//    System.out.println(pjList);
     HighT pLow = UInt.sum(
         pjList.stream().map(PlainT::getLeastSignificantAsHigh).collect(Collectors.toList()));
     PlainT p = converter.createFromHigh(pLow);
@@ -130,6 +141,7 @@ private DRes<List<byte[]>> computeZValues(ProtocolBuilderNumeric builder,
         .subtract(mj)
         .subtract(p.multiply(macKeyShare).shiftLowIntoHigh())
         .add(r.getMacShare().shiftLowIntoHigh());
+//    System.out.println("zj " + zj);
     return new CommitmentComputationSpdz2k(commitmentSerializer, serializer.serialize(zj),
         noOfParties, localDrbg).buildComputation(builder);
   }
@@ -153,7 +165,9 @@ private List<PlainT> sampleCoefficients(Drbg drbg, CompUIntFactory<PlainT> facto
    * number of upper bits, compute ((low - s) % 2^{k + s} >> k) % 2^s.
    */
   private HighT computeDifference(PlainT value) {
+//    System.out.println("value " + value);
     PlainT low = converter.createFromLow(value.getLeastSignificant());
+//    System.out.println("low " + low);
     return low.subtract(value).getMostSignificant();
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
index 1d1d26bad..4d376cdee 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
@@ -74,8 +74,11 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
         Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = triples.get(i);
 
         PlainT e = openEpsilons.get(i);
+//        System.out.println(macKeyShare);
+//        System.out.println(epsilons.get(i).asArithmetic() + " " + e.toArithmeticRep());
         openedValueStore.pushOpenedValue(epsilons.get(i).asArithmetic(), e.toArithmeticRep());
         PlainT d = openDeltas.get(i);
+//        System.out.println(deltas.get(i).asArithmetic() + " " + d.toArithmeticRep());
         openedValueStore.pushOpenedValue(deltas.get(i).asArithmetic(), d.toArithmeticRep());
 
         Spdz2kSIntBoolean<PlainT> prod = andAfterReceive(e, d, triple, macKeyShare, factory,
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index f04fbb223..f5814edb7 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -183,7 +183,7 @@ public void testXorKnown() {
 
   @Test
   public void testCompareZeroLogRounds() {
-    runTest(new TestCompareEQZero<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+    runTest(new TestCompareEQZero<>(getMaxBitLength()), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
   @Test
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java
index 9644575f7..15e169b42 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64.java
@@ -7,6 +7,8 @@
 
 public class TestCompUInt64 {
 
+  private static BigInteger twoTo32 = BigInteger.ONE.shiftLeft(32);
+
   @Test
   public void clearAboveBitAt() {
     for (int i = 0; i < Long.SIZE - 2; i++) {
@@ -56,4 +58,12 @@ public void toByteArray() {
         ByteAndBitConverter.toByteArray(input),
         new CompUInt64(input).toByteArray());
   }
+
+  @Test
+  public void testToBit() {
+    Assert.assertEquals(BigInteger.ZERO, new CompUInt64(0).toBitRep().toBigInteger());
+    Assert.assertEquals(twoTo32.shiftRight(1), new CompUInt64(1).toBitRep().toBigInteger());
+    Assert.assertEquals(twoTo32.shiftLeft(31), new CompUInt64(twoTo32).toBitRep().toBigInteger());
+  }
+
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java
index 31c4e5d62..c5b257d45 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestCompUInt64Bit.java
@@ -99,11 +99,11 @@ public void testAdd() {
   public void testSerializeLeastSignificant() {
     Assert.assertArrayEquals(
         new byte[]{0},
-        new CompUInt128Bit(rand(42), 0).serializeLeastSignificant()
+        new CompUInt64Bit(rand(42), 0).serializeLeastSignificant()
     );
     Assert.assertArrayEquals(
         new byte[]{1},
-        new CompUInt128Bit(rand(42), 1).serializeLeastSignificant()
+        new CompUInt64Bit(rand(42), 1).serializeLeastSignificant()
     );
   }
 
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java
index fb16172c0..c9e89ac31 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/datatypes/TestSpdz2kSIntBoolean.java
@@ -5,9 +5,7 @@
 public class TestSpdz2kSIntBoolean {
 
   @Test
-  public void test() {
-//    CompUInt128 alphaA = new CompUInt128(0L, 1); // 2k - 1
-//    CompUInt128 alphaB = new CompUInt128(0L, 1); // 2k - 1
+  public void test128() {
     CompUInt128 alpha = new CompUInt128(11111L, (int) (1L << 31), 1);
 
     CompUInt128 valueA = new CompUInt128Bit(0L, 1);
@@ -24,4 +22,23 @@ public void test() {
         .multiply(alpha));
     System.out.println("alpha * sum (bool arithmetic) " + sum.multiply(alpha));
   }
+
+//  @Test
+//  public void test64() {
+//    CompUInt64 alpha = new CompUInt64(11111L, (int) (1L << 31), 1);
+//
+//    CompUInt128 valueA = new CompUInt128Bit(0L, 1);
+//    CompUInt128 macA = valueA.toArithmeticRep().multiply(alpha);
+//
+//    CompUInt128 valueB = new CompUInt128Bit(0L, 0);
+//    CompUInt128 macB = valueB.toArithmeticRep().multiply(alpha);
+//
+//    CompUInt128 sum = valueA.add(valueB);
+//    CompUInt128 macSum = macA.add(macB);
+//
+//    System.out.println("sum " + sum + " macSum " + macSum);
+//    System.out.println("alpha * sum (regular arithmetic) " + sum.toArithmeticRep()
+//        .multiply(alpha));
+//    System.out.println("alpha * sum (bool arithmetic) " + sum.multiply(alpha));
+//  }
 }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
index 52809aa6d..d9ba9dcab 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
@@ -421,7 +421,7 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
             BigInteger.ONE,
             BigInteger.ZERO,
             BigInteger.ONE,
-            BigInteger.ONE
+            BigInteger.ZERO
         );
         private final List<BigInteger> right = Arrays.asList(
             BigInteger.ONE,

From d774defe32525616499abf5c572da1d35d873b41 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 3 Sep 2018 18:03:28 +0200
Subject: [PATCH 198/231] Random sysouts

---
 .../computations/MacCheckComputationSpdz2k.java      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
index 93554c6c0..4184ecc11 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
@@ -67,10 +67,6 @@ public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<P
   public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
     PlainT macKeyShare = supplier.getSecretSharedKey();
     PlainT y = UInt.innerProduct(openValues, randomCoefficients);
-//    System.out.println("macKeyShare " + macKeyShare);
-//    System.out.println("openValues " + openValues);
-//    System.out.println("authenticatedElements " + authenticatedElements);
-//    System.out.println("randomCoefficients " + randomCoefficients);
     Spdz2kSIntArithmetic<PlainT> r = supplier.getNextRandomElementShare();
     return builder
         .seq(seq -> {
@@ -101,11 +97,7 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
 
   private HighT computePj(PlainT originalShare, PlainT randomCoefficient) {
     HighT overflow = computeDifference(originalShare);
-//    System.out.println("overflow " + overflow);
-//    System.out.println("randomCoefficient " + randomCoefficient);
     HighT randomCoefficientHigh = randomCoefficient.getLeastSignificantAsHigh();
-//    System.out.println(randomCoefficientHigh.getBitLength());
-//    System.out.println("randomCoefficientAsHigh " + randomCoefficientHigh);
     return overflow.multiply(randomCoefficientHigh);
   }
 
@@ -129,7 +121,6 @@ private DRes<List<byte[]>> computeZValues(ProtocolBuilderNumeric builder,
       PlainT macKeyShare, PlainT y, Spdz2kSIntArithmetic<PlainT> r,
       List<byte[]> broadcastPjs) {
     List<PlainT> pjList = serializer.deserializeList(broadcastPjs);
-//    System.out.println(pjList);
     HighT pLow = UInt.sum(
         pjList.stream().map(PlainT::getLeastSignificantAsHigh).collect(Collectors.toList()));
     PlainT p = converter.createFromHigh(pLow);
@@ -141,7 +132,6 @@ private DRes<List<byte[]>> computeZValues(ProtocolBuilderNumeric builder,
         .subtract(mj)
         .subtract(p.multiply(macKeyShare).shiftLowIntoHigh())
         .add(r.getMacShare().shiftLowIntoHigh());
-//    System.out.println("zj " + zj);
     return new CommitmentComputationSpdz2k(commitmentSerializer, serializer.serialize(zj),
         noOfParties, localDrbg).buildComputation(builder);
   }
@@ -165,9 +155,7 @@ private List<PlainT> sampleCoefficients(Drbg drbg, CompUIntFactory<PlainT> facto
    * number of upper bits, compute ((low - s) % 2^{k + s} >> k) % 2^s.
    */
   private HighT computeDifference(PlainT value) {
-//    System.out.println("value " + value);
     PlainT low = converter.createFromLow(value.getLeastSignificant());
-//    System.out.println("low " + low);
     return low.subtract(value).getMostSignificant();
   }
 

From 234020a490a43591cae6c6e8d452ab3d70723162 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 12 Sep 2018 14:49:51 +0200
Subject: [PATCH 199/231] Configurable stats security and different batches

---
 .../lib/field/integer/BasicNumericContext.java     |  2 +-
 .../fresco/suite/spdz/SpdzProtocolSuite.java       | 14 +++++++++-----
 .../suite/spdz/SpdzRoundSynchronization.java       |  2 +-
 .../suite/spdz/TestSpdzRoundSynchronization.java   |  2 +-
 .../suite/spdz2k/datatypes/CompUInt64Bit.java      |  2 ++
 .../Spdz2kRoundSynchronization.java                |  3 ++-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java b/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
index 7bd19f58d..024bda4c6 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/field/integer/BasicNumericContext.java
@@ -38,7 +38,7 @@ public BasicNumericContext(int maxBitLength, BigInteger modulus, int myId, int n
    *          my party id
    * @param noOfParties
    *          number of parties in computation
-   * @param statisticalSecurityParameter
+   * @param statisticalSecurityParam
    *          the statistical security parameter
    */
   public BasicNumericContext(int maxBitLength, BigInteger modulus, int myId, int noOfParties,
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzProtocolSuite.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzProtocolSuite.java
index 8b2d2b1a8..930473abc 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzProtocolSuite.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzProtocolSuite.java
@@ -8,18 +8,22 @@
 
 public class SpdzProtocolSuite implements ProtocolSuiteNumeric<SpdzResourcePool> {
 
+  private static final int DEFAULT_STATISTICAL_SECURITY = 40;
   private final int maxBitLength;
   private final int fixedPointPrecision;
+  private final int statisticalSecurityParam;
 
-  public SpdzProtocolSuite(int maxBitLength, int fixedPointPrecision) {
+  public SpdzProtocolSuite(int maxBitLength, int fixedPointPrecision,
+      int statisticalSecurityParam) {
     this.maxBitLength = maxBitLength;
     this.fixedPointPrecision = fixedPointPrecision;
+    this.statisticalSecurityParam = statisticalSecurityParam;
   }
 
   public SpdzProtocolSuite(int maxBitLength) {
-    this(maxBitLength, maxBitLength / 8);
+    this(maxBitLength, maxBitLength / 8, DEFAULT_STATISTICAL_SECURITY);
   }
-  
+
   @Override
   public BuilderFactoryNumeric init(SpdzResourcePool resourcePool, Network network) {
     BasicNumericContext numericContext = createNumericContext(resourcePool);
@@ -29,9 +33,9 @@ public BuilderFactoryNumeric init(SpdzResourcePool resourcePool, Network network
 
   BasicNumericContext createNumericContext(SpdzResourcePool resourcePool) {
     return new BasicNumericContext(maxBitLength, resourcePool.getModulus(),
-        resourcePool.getMyId(), resourcePool.getNoOfParties());
+        resourcePool.getMyId(), resourcePool.getNoOfParties(), statisticalSecurityParam);
   }
-  
+
   RealNumericContext createRealNumericContext() {
     return new RealNumericContext(fixedPointPrecision);
   }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
index 12c4f24d9..eba54c6c2 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
@@ -21,7 +21,7 @@
  */
 public class SpdzRoundSynchronization implements RoundSynchronization<SpdzResourcePool> {
 
-  private static final int DEFAULT_VALUE_THRESHOLD = 1000000;
+  private static final int DEFAULT_VALUE_THRESHOLD = 100000;
   private static final int DEFAULT_BATCH_SIZE = 128;
   private final int openValueThreshold;
   private final SpdzProtocolSuite spdzProtocolSuite;
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRoundSynchronization.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRoundSynchronization.java
index 8e54db670..16c574972 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRoundSynchronization.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzRoundSynchronization.java
@@ -36,7 +36,7 @@ protected SpdzProtocolSuite createProtocolSuite(int maxBitLength) {
   private class LowThresholdSpdzSuite extends SpdzProtocolSuite {
 
     public LowThresholdSpdzSuite(int maxBitLength, int fixedPointPrecision) {
-      super(maxBitLength, fixedPointPrecision);
+      super(maxBitLength, fixedPointPrecision, 40);
     }
 
     @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
index cce708f6c..c83027fe4 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
@@ -2,6 +2,8 @@
 
 public class CompUInt64Bit extends CompUInt64 {
 
+  // TODO switch to smarter representation
+
   public CompUInt64Bit(int high, int bit) {
     super((UInt.toUnLong(high) << 32) | UInt.toUnLong(bit) << 31);
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 90caf6d14..40f1df406 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -29,6 +29,7 @@ public class Spdz2kRoundSynchronization<
     PlainT extends CompUInt<HighT, LowT, PlainT>>
     implements RoundSynchronization<Spdz2kResourcePool<PlainT>> {
 
+  private static final int OPEN_VALUE_THRESHOLD = 100000;
   private final int openValueThreshold;
   private final int batchSize;
   private boolean isCheckRequired;
@@ -37,7 +38,7 @@ public class Spdz2kRoundSynchronization<
 
   public Spdz2kRoundSynchronization(Spdz2kProtocolSuite<HighT, LowT, PlainT> protocolSuite,
       CompUIntConverter<HighT, LowT, PlainT> converter) {
-    this(protocolSuite, converter, 1000000, 128);
+    this(protocolSuite, converter, OPEN_VALUE_THRESHOLD, 128);
   }
 
   public Spdz2kRoundSynchronization(Spdz2kProtocolSuite<HighT, LowT, PlainT> protocolSuite,

From b32db24ec7f836cfef066f998e7345957b190439 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 12 Sep 2018 16:03:28 +0200
Subject: [PATCH 200/231] Clean up zero test

---
 .../compare/zerotest/ZeroTestLogRounds.java   | 56 ++++++++++---------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index 13657a3b5..1125f3351 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -12,6 +12,7 @@
 import dk.alexandra.fresco.framework.value.SInt;
 
 public class ZeroTestLogRounds implements Computation<SInt, ProtocolBuilderNumeric> {
+
   // TODO add paper reference
   private final DRes<SInt> input;
   private final int maxBitlength;
@@ -26,32 +27,33 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     final int statisticalSecurity = builder.getBasicNumericContext().getStatisticalSecurityParam();
     return builder.seq(seq -> seq.advancedNumeric().randomBitMask(maxBitlength
         + statisticalSecurity)).seq((seq, r) -> {
-          // Use the integer interpretation of r to compute c = 2^maxLength+(input + r)
-          DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
-              .getOIntArithmetic().twoTo(maxBitlength), seq.numeric().add(
-                  input, r.getValue())));
-          return () -> new Pair<>(r.getBits(), c);
-        }).seq((seq, pair) -> {
-          List<OInt> cbits = seq.getOIntArithmetic().toBits(pair
-              .getSecond().out(), maxBitlength);
-          // Reverse the bits of c as they are stored in big endian whereas the
-          // composed r values from random bit mask will be in little endian as
-          // it is based on a list of bits
-          Collections.reverse(cbits);
-          return () -> new Pair<>(pair.getFirst().out(), cbits);
-        }).par((par, pair) -> {
-          List<DRes<SInt>> d = new ArrayList<>(maxBitlength);
-          for (int i = 0; i < maxBitlength; i++) {
-            DRes<SInt> ri = pair.getFirst().get(i);
-            DRes<OInt> ci = pair.getSecond().get(i);
-            DRes<SInt> di = par.logical().xorKnown(ci, ri);
-            d.add(di);
-          }
-          return () -> d;
-        }).seq((seq, d) -> {
-          // return 1 - OR-list(d)
-          return seq.numeric().subFromOpen(seq.getOIntArithmetic().one(), seq
-              .logical().orOfList(() -> d));
-        });
+      // Use the integer interpretation of r to compute c = 2^maxLength+(input + r)
+      DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
+          .getOIntArithmetic().twoTo(maxBitlength), seq.numeric().add(
+          input, r.getValue())));
+      final Pair<DRes<List<DRes<SInt>>>, DRes<OInt>> bitsAndC = new Pair<>(r.getBits(), c);
+      return () -> bitsAndC;
+    }).seq((seq, pair) -> {
+      final List<DRes<SInt>> first = pair.getFirst().out();
+      List<OInt> cbits = seq.getOIntArithmetic().toBits(pair.getSecond().out(), maxBitlength);
+      // Reverse the bits of c as they are stored in big endian whereas the
+      // composed r values from random bit mask will be in little endian as
+      // it is based on a list of bits
+      Collections.reverse(cbits);
+      return () -> new Pair<>(first, cbits);
+    }).par((par, pair) -> {
+      List<DRes<SInt>> d = new ArrayList<>(maxBitlength);
+      for (int i = 0; i < maxBitlength; i++) {
+        DRes<SInt> ri = pair.getFirst().get(i);
+        DRes<OInt> ci = pair.getSecond().get(i);
+        DRes<SInt> di = par.logical().xorKnown(ci, ri);
+        d.add(di);
+      }
+      return () -> d;
+    }).seq((seq, d) -> {
+      // return 1 - OR-list(d)
+      return seq.numeric().subFromOpen(seq.getOIntArithmetic().one(), seq
+          .logical().orOfList(() -> d));
+    });
   }
 }

From ac988d16c26987b59ea79f84a8d32d57c769fd7d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 12 Sep 2018 17:23:46 +0200
Subject: [PATCH 201/231] Batched or in spdz2k

---
 .../builder/numeric/DefaultLogical.java       |  51 ++++-
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |   7 +
 .../natives/Spdz2kOrBatchedProtocol.java      | 186 ++++++++++++++++++
 3 files changed, 235 insertions(+), 9 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 950424bee..7cda7c855 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -109,14 +109,19 @@ private DRes<List<DRes<SInt>>> pairWise(
       DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB,
       BiFunction<DRes<SInt>, DRes<SInt>, DRes<SInt>> op) {
-    List<DRes<SInt>> leftOut = bitsB.out();
-    List<DRes<SInt>> rightOut = bitsA.out();
+    List<DRes<SInt>> leftOut = bitsA.out();
+    List<DRes<SInt>> rightOut = bitsB.out();
     List<DRes<SInt>> resultBits = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       DRes<SInt> leftBit = leftOut.get(i);
       DRes<SInt> rightBit = rightOut.get(i);
-      DRes<SInt> resultBit = op.apply(leftBit, rightBit);
-      resultBits.add(resultBit);
+      // TODO hack hack hack
+      if (rightBit == null) {
+        resultBits.add(leftBit);
+      } else {
+        DRes<SInt> resultBit = op.apply(leftBit, rightBit);
+        resultBits.add(resultBit);
+      }
     }
     return () -> resultBits;
   }
@@ -187,25 +192,53 @@ public DRes<List<DRes<SInt>>> pairWiseXor(DRes<List<DRes<SInt>>> bitsA,
     });
   }
 
+//  @Override
+//  public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
+//    return builder.seq(seq -> bits
+//        ).whileLoop((inputs) -> inputs.size() > 1,
+//        (prevSeq, inputs) -> prevSeq.par(par -> {
+//          List<DRes<SInt>> out = new ArrayList<>();
+//          DRes<SInt> left = null;
+//          for (DRes<SInt> currentInput : inputs) {
+//            if (left == null) {
+//              left = currentInput;
+//            } else {
+//              out.add(par.logical().or(left, currentInput));
+//              left = null;
+//            }
+//          }
+//          if (left != null) {
+//            out.add(left);
+//          }
+//          return () -> out;
+//        })).seq((builder, out) -> out.get(0));
+//  }
+
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
     return builder.seq(seq -> bits
-        ).whileLoop((inputs) -> inputs.size() > 1,
+    ).whileLoop((inputs) -> inputs.size() > 1,
         (prevSeq, inputs) -> prevSeq.par(par -> {
-          List<DRes<SInt>> out = new ArrayList<>();
+          List<DRes<SInt>> leftBits = new ArrayList<>();
+          List<DRes<SInt>> rightBits = new ArrayList<>();
           DRes<SInt> left = null;
           for (DRes<SInt> currentInput : inputs) {
             if (left == null) {
               left = currentInput;
             } else {
-              out.add(par.logical().or(left, currentInput));
+              leftBits.add(left);
+              rightBits.add(currentInput);
               left = null;
             }
           }
+          // TODO this is ugly but I'm not sure what a cleaner solution would look like that still
+          // uses pairWiseOr
           if (left != null) {
-            out.add(left);
+            leftBits.add(left);
+            rightBits.add(null);
           }
-          return () -> out;
+
+          return par.logical().pairWiseOr(() -> leftBits, () -> rightBits);
         })).seq((builder, out) -> out.get(0));
   }
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index d485dc895..20901c9eb 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -14,6 +14,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownBatchedProtocol;
@@ -94,6 +95,12 @@ public DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits) {
     return builder.append(new Spdz2kNotBatchedProtocol<>(bits));
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    return builder.append(new Spdz2kOrBatchedProtocol<>(bitsA, bitsB));
+  }
+
   @Override
   public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
new file mode 100644
index 000000000..ffcbdd08f
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
@@ -0,0 +1,186 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Native protocol for computing logical AND of two values in boolean form.
+ */
+public class Spdz2kOrBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private DRes<List<DRes<SInt>>> bitsADef;
+  private DRes<List<DRes<SInt>>> bitsBDef;
+  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
+  private List<Spdz2kSIntBoolean<PlainT>> epsilons;
+  private List<Spdz2kSIntBoolean<PlainT>> deltas;
+  private List<PlainT> openEpsilons;
+  private List<PlainT> openDeltas;
+  private List<DRes<SInt>> products;
+
+  public Spdz2kOrBatchedProtocol(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    this.bitsADef = bitsA;
+    this.bitsBDef = bitsB;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    List<DRes<SInt>> bitsA = bitsADef.out();
+    List<DRes<SInt>> bitsB = bitsBDef.out();
+    if (round == 0) {
+      triples = new ArrayList<>(bitsA.size());
+      epsilons = new ArrayList<>(bitsA.size());
+      deltas = new ArrayList<>(bitsA.size());
+      openEpsilons = new ArrayList<>(bitsA.size());
+      openDeltas = new ArrayList<>(bitsA.size());
+      products = new ArrayList<>(bitsA.size());
+
+      for (int i = 0; i < bitsA.size(); i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = resourcePool
+            .getDataSupplier()
+            .getNextBitTripleShares();
+        triples.add(triple);
+
+        Spdz2kSIntBoolean<PlainT> left = factory.toSpdz2kSIntBoolean(bitsA.get(i));
+        Spdz2kSIntBoolean<PlainT> right = factory.toSpdz2kSIntBoolean(bitsB.get(i));
+
+        epsilons.add(factory.toSpdz2kSIntBoolean(left).xor(triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(right).xor(triple.getRight()));
+      }
+
+      serializeAndSend(network, epsilons, deltas);
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
+
+      OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
+          .getOpenedValueStore();
+
+      for (int i = 0; i < bitsA.size(); i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = triples.get(i);
+
+        PlainT e = openEpsilons.get(i);
+        openedValueStore.pushOpenedValue(epsilons.get(i).asArithmetic(), e.toArithmeticRep());
+        PlainT d = openDeltas.get(i);
+        openedValueStore.pushOpenedValue(deltas.get(i).asArithmetic(), d.toArithmeticRep());
+
+        Spdz2kSIntBoolean<PlainT> prod = andAfterReceive(e, d, triple, macKeyShare, factory,
+            resourcePool.getMyId());
+        Spdz2kSIntBoolean<PlainT> xored = factory.toSpdz2kSIntBoolean(bitsA.get(i))
+            .xor(factory.toSpdz2kSIntBoolean(bitsB.get(i)));
+
+        products.add(prod.xor(xored));
+      }
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  private Spdz2kSIntBoolean<PlainT> andAfterReceive(
+      PlainT e,
+      PlainT d,
+      Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,
+      PlainT macKeyShare,
+      CompUIntFactory<PlainT> factory,
+      int myId) {
+    int eBit = e.bitValue();
+    int dBit = d.bitValue();
+    PlainT ed = e.multiply(d);
+    // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+    Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+    Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+    Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+    return tripleProduct
+        .xor(tripleRight.and(eBit))
+        .xor(tripleLeft.and(dBit))
+        .xorOpen(ed,
+            macKeyShare,
+            factory.zero().toBitRep(),
+            myId == 1);
+  }
+
+  /**
+   * Retrieves shares for epsilons and deltas and reconstructs each.
+   */
+  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory,
+      int noOfParties) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+
+    for (int i = 0; i < epsilons.size(); i++) {
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+      PlainT e = factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte));
+      openEpsilons.add(e);
+      PlainT d = factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte));
+      openDeltas.add(d);
+    }
+
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      for (int j = 0; j < epsilons.size(); j++) {
+        int currentByteIdx = j / Byte.SIZE;
+        int bitIndexWithinByte = j % Byte.SIZE;
+        openEpsilons.set(j, openEpsilons.get(j).add(
+            factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+        openDeltas.set(j, openDeltas.get(j).add(
+            factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+      }
+    }
+  }
+
+  /**
+   * Serializes and sends epsilon and delta values.
+   */
+  private void serializeAndSend(Network network,
+      List<Spdz2kSIntBoolean<PlainT>> epsilons,
+      List<Spdz2kSIntBoolean<PlainT>> deltas) {
+    int numBytes = epsilons.size() / Byte.SIZE;
+    if (epsilons.size() % 8 != 0) {
+      numBytes++;
+    }
+    byte[] epsilonBytes = new byte[numBytes];
+    byte[] deltaBytes = new byte[numBytes];
+
+    for (int i = 0; i < epsilons.size(); i++) {
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+
+      int serializedEpsilon = epsilons.get(i).getShare().bitValue();
+      epsilonBytes[currentByteIdx] |= ((serializedEpsilon << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+
+      int serializedDelta = deltas
+          .get(i)
+          .getShare()
+          .bitValue();
+      deltaBytes[currentByteIdx] |= ((serializedDelta << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+    }
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return products;
+  }
+
+}

From df0084af35cba375ef4d98335196df23915f321e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 13 Sep 2018 10:59:49 +0200
Subject: [PATCH 202/231] Clean up or of list

---
 .../builder/numeric/DefaultLogical.java       | 84 +++++++------------
 .../framework/builder/numeric/Logical.java    |  6 ++
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |  8 +-
 .../OrNeighborsComputationSpdz2k.java         | 34 ++++++++
 .../natives/Spdz2kOrBatchedProtocol.java      | 12 ++-
 .../fresco/suite/spdz2k/Spdz2kTestSuite.java  |  6 ++
 .../TestLogicalOperationsSpdz2k.java          | 50 ++++++++++-
 7 files changed, 142 insertions(+), 58 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/OrNeighborsComputationSpdz2k.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
index 7cda7c855..c2f49c4b4 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultLogical.java
@@ -109,19 +109,14 @@ private DRes<List<DRes<SInt>>> pairWise(
       DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB,
       BiFunction<DRes<SInt>, DRes<SInt>, DRes<SInt>> op) {
-    List<DRes<SInt>> leftOut = bitsA.out();
-    List<DRes<SInt>> rightOut = bitsB.out();
+    List<DRes<SInt>> leftOut = bitsB.out();
+    List<DRes<SInt>> rightOut = bitsA.out();
     List<DRes<SInt>> resultBits = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       DRes<SInt> leftBit = leftOut.get(i);
       DRes<SInt> rightBit = rightOut.get(i);
-      // TODO hack hack hack
-      if (rightBit == null) {
-        resultBits.add(leftBit);
-      } else {
-        DRes<SInt> resultBit = op.apply(leftBit, rightBit);
-        resultBits.add(resultBit);
-      }
+      DRes<SInt> resultBit = op.apply(leftBit, rightBit);
+      resultBits.add(resultBit);
     }
     return () -> resultBits;
   }
@@ -192,53 +187,32 @@ public DRes<List<DRes<SInt>>> pairWiseXor(DRes<List<DRes<SInt>>> bitsA,
     });
   }
 
-//  @Override
-//  public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
-//    return builder.seq(seq -> bits
-//        ).whileLoop((inputs) -> inputs.size() > 1,
-//        (prevSeq, inputs) -> prevSeq.par(par -> {
-//          List<DRes<SInt>> out = new ArrayList<>();
-//          DRes<SInt> left = null;
-//          for (DRes<SInt> currentInput : inputs) {
-//            if (left == null) {
-//              left = currentInput;
-//            } else {
-//              out.add(par.logical().or(left, currentInput));
-//              left = null;
-//            }
-//          }
-//          if (left != null) {
-//            out.add(left);
-//          }
-//          return () -> out;
-//        })).seq((builder, out) -> out.get(0));
-//  }
-
   @Override
   public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
-    return builder.seq(seq -> bits
-    ).whileLoop((inputs) -> inputs.size() > 1,
-        (prevSeq, inputs) -> prevSeq.par(par -> {
-          List<DRes<SInt>> leftBits = new ArrayList<>();
-          List<DRes<SInt>> rightBits = new ArrayList<>();
-          DRes<SInt> left = null;
-          for (DRes<SInt> currentInput : inputs) {
-            if (left == null) {
-              left = currentInput;
-            } else {
-              leftBits.add(left);
-              rightBits.add(currentInput);
-              left = null;
-            }
-          }
-          // TODO this is ugly but I'm not sure what a cleaner solution would look like that still
-          // uses pairWiseOr
-          if (left != null) {
-            leftBits.add(left);
-            rightBits.add(null);
-          }
-
-          return par.logical().pairWiseOr(() -> leftBits, () -> rightBits);
-        })).seq((builder, out) -> out.get(0));
+    return builder.seq(seq -> bits)
+        .whileLoop((inputs) -> inputs.size() > 1,
+            (prevSeq, inputs) -> prevSeq.logical().orNeighbors(inputs))
+        // end while
+        .seq((builder, out) -> out.get(0));
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
+    return builder.par(par -> {
+      List<DRes<SInt>> out = new ArrayList<>();
+      DRes<SInt> left = null;
+      for (DRes<SInt> currentInput : bits) {
+        if (left == null) {
+          left = currentInput;
+        } else {
+          out.add(par.logical().or(left, currentInput));
+          left = null;
+        }
+      }
+      if (left != null) {
+        out.add(left);
+      }
+      return () -> out;
+    });
   }
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
index b46e0f57d..775fecdbf 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Logical.java
@@ -107,4 +107,10 @@ DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
    */
   DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits);
 
+  /**
+   * Given a list of bits, computes or of each neighbor pair of bits, i.e., given b1, b2, b3, b4,
+   * will output b1 OR b2, b3 OR b4. <p>Also handles uneven number of elements.</p>
+   */
+  DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits);
+
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 20901c9eb..202247ae8 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -9,10 +9,11 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.OrNeighborsComputationSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
@@ -101,6 +102,11 @@ public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
     return builder.append(new Spdz2kOrBatchedProtocol<>(bitsA, bitsB));
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
+    return builder.seq(new OrNeighborsComputationSpdz2k(bits));
+  }
+
   @Override
   public DRes<OInt> openAsBit(DRes<SInt> secretBit) {
     // quite heavy machinery...
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/OrNeighborsComputationSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/OrNeighborsComputationSpdz2k.java
new file mode 100644
index 000000000..abebf144b
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/OrNeighborsComputationSpdz2k.java
@@ -0,0 +1,34 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.computations;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrBatchedProtocol;
+import java.util.ArrayList;
+import java.util.List;
+
+public class OrNeighborsComputationSpdz2k implements
+    Computation<List<DRes<SInt>>, ProtocolBuilderNumeric> {
+
+  private final List<DRes<SInt>> bits;
+
+  public OrNeighborsComputationSpdz2k(List<DRes<SInt>> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> buildComputation(ProtocolBuilderNumeric builder) {
+    List<DRes<SInt>> leftBits = new ArrayList<>(bits.size() / 2);
+    List<DRes<SInt>> rightBits = new ArrayList<>(bits.size() / 2);
+    for (int i = 0; i < bits.size() - 1; i += 2) {
+      leftBits.add(bits.get(i));
+      rightBits.add(bits.get(i + 1));
+    }
+    final boolean isOdd = bits.size() % 2 != 0;
+    return builder.append(new Spdz2kOrBatchedProtocol<>(
+        () -> leftBits,
+        () -> rightBits,
+        isOdd ? bits.get(bits.size() - 1) : null));
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
index ffcbdd08f..8b6d4616d 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
@@ -26,12 +26,19 @@ public class Spdz2kOrBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> exte
   private List<Spdz2kSIntBoolean<PlainT>> deltas;
   private List<PlainT> openEpsilons;
   private List<PlainT> openDeltas;
+  private DRes<SInt> extraBit;
   private List<DRes<SInt>> products;
 
   public Spdz2kOrBatchedProtocol(DRes<List<DRes<SInt>>> bitsA,
-      DRes<List<DRes<SInt>>> bitsB) {
+      DRes<List<DRes<SInt>>> bitsB, DRes<SInt> extraBit) {
     this.bitsADef = bitsA;
     this.bitsBDef = bitsB;
+    this.extraBit = extraBit;
+  }
+
+  public Spdz2kOrBatchedProtocol(DRes<List<DRes<SInt>>> bitsA,
+      DRes<List<DRes<SInt>>> bitsB) {
+    this(bitsA, bitsB, null);
   }
 
   @Override
@@ -85,6 +92,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
 
         products.add(prod.xor(xored));
       }
+      if (extraBit != null) {
+        products.add(extraBit);
+      }
       return EvaluationStatus.IS_DONE;
     }
   }
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
index f5814edb7..71ed7ddb5 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kTestSuite.java
@@ -15,6 +15,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestAndKnownSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestAndSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestNotSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestOrListSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestOrSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.TestLogicalOperationsSpdz2k.TestXorKnownSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
@@ -166,6 +167,11 @@ public void testAnd() {
     runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testOrOfList() {
+    runTest(new TestOrListSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
   @Test
   public void testOr() {
     runTest(new TestOrSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
index d9ba9dcab..9d84eaf01 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
@@ -45,6 +45,11 @@ public void testOr() {
     runTest(new TestOrSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testOrList() {
+    runTest(new TestOrListSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
   @Test
   public void testAndXorSequence() {
     runTest(new TestAndXorSequence<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
@@ -90,7 +95,6 @@ public void testNot() {
     runTest(new TestNotSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
-
   @Override
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
@@ -112,6 +116,50 @@ protected ProtocolSuiteNumeric<Spdz2kResourcePool<CompUInt128>> createProtocolSu
     return new Spdz2kProtocolSuite128(true);
   }
 
+  public static class TestOrListSpdz2k<ResourcePoolT extends ResourcePool> extends
+      TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> input1 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ZERO, BigInteger.ZERO, BigInteger.ONE);
+        private final List<BigInteger> input2 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ZERO, BigInteger.ZERO, BigInteger.ZERO);
+        private final List<BigInteger> input3 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ONE, BigInteger.ZERO, BigInteger.ZERO);
+        private final List<BigInteger> input4 = Arrays.asList(BigInteger.ZERO,
+            BigInteger.ZERO, BigInteger.ONE, BigInteger.ZERO, BigInteger.ONE);
+
+        @Override
+        public void test() {
+          List<List<BigInteger>> inputLists = Arrays.asList(input1, input2,
+              input3, input4);
+          List<BigInteger> expectedOutput = Arrays.asList(BigInteger.ONE,
+              BigInteger.ZERO, BigInteger.ONE, BigInteger.ONE);
+
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app = root -> {
+            OIntFactory factory = root.getOIntFactory();
+            List<DRes<OInt>> results = inputLists.stream().map(
+                current -> {
+                  final DRes<List<DRes<SInt>>> arithmeticBatch = root.numeric()
+                      .knownAsDRes(current);
+                  final DRes<List<DRes<SInt>>> bits = root.conversion()
+                      .toBooleanBatch(arithmeticBatch);
+                  final DRes<SInt> orred = root.logical().orOfList(bits);
+                  return root.logical().openAsBit(orred);
+                }).collect(Collectors.toList());
+            return () -> results.stream().map(d -> factory.toBigInteger(d.out()))
+                .collect(Collectors.toList());
+          };
+          List<BigInteger> actual = runApplication(app);
+          Assert.assertArrayEquals(expectedOutput.toArray(), actual.toArray());
+        }
+      };
+    }
+  }
+
   public static class TestNotSpdz2k<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 

From 5be4b0d06c5dc30a61050285dbde5f276620804e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Mon, 17 Sep 2018 13:00:42 +0200
Subject: [PATCH 203/231] Handle large packets in betch deco

---
 .../framework/network/socket/Connector.java   |  4 +-
 .../sce/evaluator/NetworkBatchDecorator.java  | 55 ++++++++++----
 .../network/NetworkBatchDecoratorTest.java    | 74 ++++++++++++-------
 .../natives/Spdz2kAndBatchedProtocol.java     |  3 -
 .../TestLogicalOperationsSpdz2k.java          | 49 ++++++++++++
 5 files changed, 140 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/network/socket/Connector.java b/core/src/main/java/dk/alexandra/fresco/framework/network/socket/Connector.java
index 31a723d9f..850d12afa 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/network/socket/Connector.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/network/socket/Connector.java
@@ -32,11 +32,11 @@ public class Connector implements NetworkConnector {
   private final SocketFactory socketFactory;
   private final ServerSocketFactory serverFactory;
 
-  Connector(NetworkConfiguration conf, Duration timeout) {
+  public Connector(NetworkConfiguration conf, Duration timeout) {
     this(conf, timeout, SocketFactory.getDefault(), ServerSocketFactory.getDefault());
   }
 
-  Connector(NetworkConfiguration conf, Duration timeout, SocketFactory socketFactory,
+  public Connector(NetworkConfiguration conf, Duration timeout, SocketFactory socketFactory,
       ServerSocketFactory serverFactory) {
     this.socketFactory = socketFactory;
     this.serverFactory = serverFactory;
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java b/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
index b74a4e160..6fac941ce 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
@@ -1,18 +1,17 @@
 package dk.alexandra.fresco.framework.sce.evaluator;
 
 import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.ByteAndBitConverter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Default network for the evaluators, this interface bridges the raw network4
- * with the fresco default evaluators. This class makes the
- * communication on the network batched and hence throttled so evaluators behave nice
- * on the network.
- * <br/>
- * It is important to call flush to empty all buffers after sending and before receiving data
+ * Default network for the evaluators, this interface bridges the raw network4 with the fresco
+ * default evaluators. This class makes the communication on the network batched and hence throttled
+ * so evaluators behave nice on the network. <br/> It is important to call flush to empty all
+ * buffers after sending and before receiving data
  */
 public class NetworkBatchDecorator implements Network {
 
@@ -38,9 +37,22 @@ public byte[] receive(int id) {
     }
 
     int count = byteInputStream.read();
-    byte[] bytes = new byte[count];
-    byteInputStream.read(bytes, 0, count);
-    return bytes;
+//    System.out.println(count);
+    boolean isLargePacket = (count & 0x80) == 0x80;
+//    System.out.println(isLargePacket);
+    if (!isLargePacket) {
+      byte[] bytes = new byte[count];
+      byteInputStream.read(bytes, 0, count);
+      return bytes;
+    } else {
+      byte[] lengthBytes = new byte[4];
+      lengthBytes[0] = (byte) (count & 0x7f); // zero out indicator bit
+      byteInputStream.read(lengthBytes, 1, 3);
+      int numBytes = ByteAndBitConverter.toInt(lengthBytes, 0);
+      byte[] bytes = new byte[numBytes];
+      byteInputStream.read(bytes, 0, numBytes);
+      return bytes;
+    }
   }
 
   @Override
@@ -52,12 +64,27 @@ public int getNoOfParties() {
   public void send(int id, byte[] data) {
     ByteArrayOutputStream buffer = this.output
         .computeIfAbsent(id, (i) -> new ByteArrayOutputStream());
-    if (data.length > Byte.MAX_VALUE) {
-      throw new IllegalStateException(
-          "Current implementation only supports small packages, data.length=" + data.length);
+    final int packetLength = data.length;
+    // we need the top bit to be free because we use it as an indicator for the packet type
+    if (packetLength <= 0x7f) {
+      // small packet case
+      // set msb in byte to 0 to indicate small packet
+      byte packetLengthAsByte = (byte) (packetLength & 0x7f);
+      buffer.write(packetLengthAsByte);
+      buffer.write(data, 0, packetLengthAsByte);
+    } else {
+      // large packet case
+      // we need the top bit to be free because we use it as an indicator for the packet type
+      if (packetLength >= 0x7fffffff) {
+        throw new IllegalStateException(
+            "Current implementation only supports small packages, data.length=" + packetLength);
+      }
+      // set top bit to 1 to indicate large packet
+      int withSetBit = packetLength | 0x80000000;
+      final byte[] b = ByteAndBitConverter.toByteArray(withSetBit);
+      buffer.write(b, 0, 4);
+      buffer.write(data, 0, packetLength);
     }
-    buffer.write(data.length);
-    buffer.write(data, 0, data.length);
   }
 
   /**
diff --git a/core/src/test/java/dk/alexandra/fresco/framework/network/NetworkBatchDecoratorTest.java b/core/src/test/java/dk/alexandra/fresco/framework/network/NetworkBatchDecoratorTest.java
index e80598aa8..58b441b1f 100644
--- a/core/src/test/java/dk/alexandra/fresco/framework/network/NetworkBatchDecoratorTest.java
+++ b/core/src/test/java/dk/alexandra/fresco/framework/network/NetworkBatchDecoratorTest.java
@@ -14,13 +14,13 @@ public class NetworkBatchDecoratorTest {
   private Map<Integer, byte[]> transmissions = new HashMap<>();
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     DummyNetwork network = new DummyNetwork();
     networkBatchDecorator = new NetworkBatchDecorator(3, network);
   }
 
   @Test
-  public void receive() throws Exception {
+  public void receive() {
     transmissions.put(1, new byte[]{4, 2, 2, 23, 3, 3, 22, 0, 0});
     transmissions.put(2, new byte[]{0});
     Assert.assertArrayEquals(new byte[]{2, 2, 23, 3}, networkBatchDecorator.receive(1));
@@ -29,7 +29,7 @@ public void receive() throws Exception {
   }
 
   @Test
-  public void receiveFromAll() throws Exception {
+  public void receiveFromAll() {
     transmissions.put(1, new byte[]{4, 2, 2, 23, 3, 42});
     transmissions.put(2, new byte[]{4, 2, 2, 23, 3, 42});
     transmissions.put(3, new byte[]{4, 2, 2, 23, 3, 42});
@@ -40,14 +40,14 @@ public void receiveFromAll() throws Exception {
   }
 
   @Test(expected = NullPointerException.class)
-  public void receiveFromAllNoData() throws Exception {
+  public void receiveFromAllNoData() {
     transmissions.put(1, new byte[]{4, 2, 2, 23, 3, 42});
     transmissions.put(2, new byte[]{4, 2, 2, 23, 3, 42});
     networkBatchDecorator.receiveFromAll();
   }
 
   @Test
-  public void send() throws Exception {
+  public void send() {
     networkBatchDecorator.send(1, new byte[]{123});
     Assert.assertTrue(transmissions.isEmpty());
     networkBatchDecorator.flush();
@@ -56,7 +56,7 @@ public void send() throws Exception {
   }
 
   @Test
-  public void sendToAll() throws Exception {
+  public void sendToAll() {
     networkBatchDecorator.sendToAll(new byte[]{123});
     networkBatchDecorator.flush();
     Assert.assertEquals(3, transmissions.size());
@@ -65,25 +65,47 @@ public void sendToAll() throws Exception {
     Assert.assertArrayEquals(new byte[]{1, 123}, transmissions.get(3));
   }
 
-  @Test(expected = RuntimeException.class)
-  public void errorOnBigPackets() throws Exception {
-    networkBatchDecorator.sendToAll(
-        new byte[]{
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-            123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-        });
-
+  @Test
+  public void handleBigPackets() {
+    final byte[] payload = {
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123
+    };
+    networkBatchDecorator.sendToAll(payload);
+    byte[] expected = new byte[]{
+        -128, 0, 0, -116,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+        123, 123, 123, 123, 123, 123, 123, 123, 123, 123
+    };
+    networkBatchDecorator.flush();
+    Assert.assertEquals(3, transmissions.size());
+    Assert.assertArrayEquals(expected, transmissions.get(1));
+    Assert.assertArrayEquals(expected, transmissions.get(2));
+    Assert.assertArrayEquals(expected, transmissions.get(3));
   }
 
   private class DummyNetwork implements Network {
@@ -104,4 +126,4 @@ public int getNoOfParties() {
       return 3;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
index 4d376cdee..1d1d26bad 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
@@ -74,11 +74,8 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
         Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = triples.get(i);
 
         PlainT e = openEpsilons.get(i);
-//        System.out.println(macKeyShare);
-//        System.out.println(epsilons.get(i).asArithmetic() + " " + e.toArithmeticRep());
         openedValueStore.pushOpenedValue(epsilons.get(i).asArithmetic(), e.toArithmeticRep());
         PlainT d = openDeltas.get(i);
-//        System.out.println(deltas.get(i).asArithmetic() + " " + d.toArithmeticRep());
         openedValueStore.pushOpenedValue(deltas.get(i).asArithmetic(), d.toArithmeticRep());
 
         Spdz2kSIntBoolean<PlainT> prod = andAfterReceive(e, d, triple, macKeyShare, factory,
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
index 9d84eaf01..511045dfa 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
@@ -40,6 +40,11 @@ public void testAnd() {
     runTest(new TestAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
   }
 
+  @Test
+  public void testBatchedAnd() {
+    runTest(new TestBatchedAndSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
+  }
+
   @Test
   public void testOr() {
     runTest(new TestOrSpdz2k<>(), EvaluationStrategy.SEQUENTIAL_BATCHED);
@@ -510,6 +515,50 @@ public void test() {
     }
   }
 
+  public static class TestBatchedAndSpdz2k<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        BigInteger leftBit = BigInteger.ONE;
+        BigInteger rightBit = BigInteger.ZERO;
+        final int repetitions = 20000;
+
+        @Override
+        public void test() {
+          Application<List<BigInteger>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<SInt> leftBitClosed =
+                    root.conversion().toBoolean(root.numeric().input(leftBit, 1));
+                DRes<SInt> rightBitClosed =
+                    root.conversion().toBoolean(root.numeric().input(rightBit, 1));
+                List<DRes<SInt>> leftBits = new ArrayList<>(repetitions);
+                List<DRes<SInt>> rightBits = new ArrayList<>(repetitions);
+                for (int i = 0; i < repetitions; i++) {
+                  leftBits.add(leftBitClosed);
+                  rightBits.add(rightBitClosed);
+                }
+                DRes<List<DRes<SInt>>> anded = root.logical().pairWiseAnd(
+                    () ->leftBits,
+                    () -> rightBits
+                );
+                DRes<List<DRes<OInt>>> opened = root.logical().openAsBits(anded);
+                OIntFactory factory = root.getOIntFactory();
+                return () -> opened.out().stream().map(v -> factory.toBigInteger(v.out()))
+                    .collect(Collectors.toList());
+              };
+          List<BigInteger> actual = runApplication(app);
+          Assert.assertEquals(repetitions, actual.size());
+          for (BigInteger actualBit : actual) {
+            Assert.assertEquals(BigInteger.ZERO, actualBit);
+          }
+        }
+      };
+    }
+  }
+
   public static class TestXorSpdz2kRandom<ResourcePoolT extends ResourcePool>
       extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 

From 4549ca8b56bcbf7fd37a3bb30e5e1fe7cf57d491 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 18 Sep 2018 16:06:46 +0200
Subject: [PATCH 204/231] Include comparison between neg and pos

---
 .../test/java/dk/alexandra/fresco/lib/compare/CompareTests.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
index e0bbc292c..e0b7a7b73 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/compare/CompareTests.java
@@ -392,6 +392,7 @@ public TestLessThanLogRounds(int maxBitLength) {
           BigInteger.valueOf(-1),
           BigInteger.valueOf(-111111),
           BigInteger.valueOf(-111),
+          BigInteger.valueOf(-110),
           BigInteger.ONE,
           two.pow(maxBitLength - 1).subtract(BigInteger.ONE),
           two.pow(maxBitLength - 1).subtract(two),
@@ -406,6 +407,7 @@ public TestLessThanLogRounds(int maxBitLength) {
           BigInteger.valueOf(-1),
           BigInteger.valueOf(-111112),
           BigInteger.valueOf(-110),
+          BigInteger.valueOf(10),
           BigInteger.valueOf(5),
           two.pow(maxBitLength - 1).subtract(two),
           two.pow(maxBitLength - 1).subtract(BigInteger.ONE),

From 451c50a03beb6824e934a0e4b63e7cb5f278803d Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Tue, 18 Sep 2018 16:07:25 +0200
Subject: [PATCH 205/231] Remove unnecessary broadcast validation steps

---
 .../sce/evaluator/NetworkBatchDecorator.java    |  2 --
 .../suite/spdz/SpdzRoundSynchronization.java    |  2 +-
 .../computations/BroadcastComputation.java      | 16 +++++++++++-----
 .../CommitmentComputationSpdz2k.java            |  3 ++-
 .../computations/MacCheckComputationSpdz2k.java | 17 ++++++++++++++---
 .../Spdz2kRoundSynchronization.java             |  2 +-
 .../TestBroadcastComputationSpdz2k.java         | 13 ++++++++-----
 7 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java b/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
index 6fac941ce..51328f2ba 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
@@ -37,9 +37,7 @@ public byte[] receive(int id) {
     }
 
     int count = byteInputStream.read();
-//    System.out.println(count);
     boolean isLargePacket = (count & 0x80) == 0x80;
-//    System.out.println(isLargePacket);
     if (!isLargePacket) {
       byte[] bytes = new byte[count];
       byteInputStream.read(bytes, 0, count);
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
index eba54c6c2..ac1dea8fa 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
@@ -21,7 +21,7 @@
  */
 public class SpdzRoundSynchronization implements RoundSynchronization<SpdzResourcePool> {
 
-  private static final int DEFAULT_VALUE_THRESHOLD = 100000;
+  private static final int DEFAULT_VALUE_THRESHOLD = 300000;
   private static final int DEFAULT_BATCH_SIZE = 128;
   private final int openValueThreshold;
   private final SpdzProtocolSuite spdzProtocolSuite;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/BroadcastComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/BroadcastComputation.java
index 4c5a29982..ba42b6431 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/BroadcastComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/BroadcastComputation.java
@@ -17,13 +17,15 @@ public class BroadcastComputation<BuilderT extends ProtocolBuilderImpl<BuilderT>
     Computation<List<byte[]>, BuilderT> {
 
   private final List<byte[]> input;
+  private final boolean doValidation;
 
-  BroadcastComputation(List<byte[]> input) {
+  BroadcastComputation(List<byte[]> input, boolean doValidation) {
     this.input = input;
+    this.doValidation = doValidation;
   }
 
-  BroadcastComputation(byte[] input) {
-    this(java.util.Collections.singletonList(input));
+  BroadcastComputation(byte[] input, boolean doValidation) {
+    this(java.util.Collections.singletonList(input), doValidation);
   }
 
   @Override
@@ -38,8 +40,12 @@ public DRes<List<byte[]>> buildComputation(BuilderT builder) {
       List<byte[]> toValidate = lst.stream()
           .flatMap(broadcast -> broadcast.out().stream())
           .collect(Collectors.toList());
-      seq.append(new BroadcastValidationProtocol<>(toValidate));
-      return () -> toValidate;
+      if (doValidation) {
+        seq.append(new BroadcastValidationProtocol<>(toValidate));
+        return () -> toValidate;
+      } else {
+        return () -> toValidate;
+      }
     });
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CommitmentComputationSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CommitmentComputationSpdz2k.java
index 16f7d3b62..b5fc9c576 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CommitmentComputationSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/CommitmentComputationSpdz2k.java
@@ -33,7 +33,8 @@ public CommitmentComputationSpdz2k(ByteSerializer<HashBasedCommitment> commitmen
   public DRes<List<byte[]>> buildComputation(ProtocolBuilderNumeric builder) {
     HashBasedCommitment ownCommitment = new HashBasedCommitment();
     byte[] ownOpening = ownCommitment.commit(localDrbg, value);
-    return builder.seq(new BroadcastComputation<>(commitmentSerializer.serialize(ownCommitment)))
+    return builder.seq(new BroadcastComputation<>(
+        commitmentSerializer.serialize(ownCommitment), noOfParties > 2))
         .seq((seq, rawCommitments) -> {
           DRes<List<byte[]>> openingsDRes = seq.append(new InsecureBroadcastProtocol<>(ownOpening));
           List<HashBasedCommitment> commitments = commitmentSerializer
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
index 4184ecc11..46937fde7 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
@@ -37,6 +37,7 @@ public class MacCheckComputationSpdz2k<
   private ByteSerializer<HashBasedCommitment> commitmentSerializer;
   private final int noOfParties;
   private final Drbg localDrbg;
+  private long then;
 
   /**
    * Creates new {@link MacCheckComputationSpdz2k}.
@@ -49,6 +50,7 @@ public class MacCheckComputationSpdz2k<
   public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<PlainT>> toCheck,
       Spdz2kResourcePool<PlainT> resourcePool,
       CompUIntConverter<HighT, LowT, PlainT> converter) {
+    this.then = System.currentTimeMillis();
     this.authenticatedElements = toCheck.getFirst();
     this.openValues = toCheck.getSecond();
     this.converter = converter;
@@ -58,6 +60,11 @@ public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<P
         resourcePool.getRandomGenerator(),
         resourcePool.getFactory(),
         authenticatedElements.size());
+//    System.out.println("Done sampling " + (System.currentTimeMillis() - then));
+//    then = System.currentTimeMillis();
+//    if (resourcePool.getMyId() == 1) {
+//      System.out.println(authenticatedElements.size());
+//    }
     this.commitmentSerializer = resourcePool.getCommitmentSerializer();
     this.noOfParties = resourcePool.getNoOfParties();
     this.localDrbg = resourcePool.getLocalRandomGenerator();
@@ -66,7 +73,9 @@ public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<P
   @Override
   public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
     PlainT macKeyShare = supplier.getSecretSharedKey();
+    long thenthen = System.currentTimeMillis();
     PlainT y = UInt.innerProduct(openValues, randomCoefficients);
+//    System.out.println("Inner product " + (System.currentTimeMillis() - thenthen));
     Spdz2kSIntArithmetic<PlainT> r = supplier.getNextRandomElementShare();
     return builder
         .seq(seq -> {
@@ -74,7 +83,7 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
             List<byte[]> sharesLowBits = authenticatedElements.stream()
                 .map(element -> element.getShare().getLeastSignificant().toByteArray())
                 .collect(Collectors.toList());
-            return new BroadcastComputation<ProtocolBuilderNumeric>(sharesLowBits)
+            return new BroadcastComputation<ProtocolBuilderNumeric>(sharesLowBits, true)
                 .buildComputation(seq);
           } else {
             return null;
@@ -91,6 +100,8 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
           }
           authenticatedElements.clear();
           openValues.clear();
+//          System.out.println("Done mac-check " + (System.currentTimeMillis() - then));
+          then = System.currentTimeMillis();
           return null;
         });
   }
@@ -111,9 +122,9 @@ private DRes<List<byte[]>> computePValues(ProtocolBuilderNumeric builder,
       pj = pj.add(computePj(share, randomCoefficient));
     }
     final HighT add = pj.add(r.getShare().getLeastSignificantAsHigh());
-//    System.out.println("add " + add);
     byte[] pjBytes = add.toByteArray();
-    return new BroadcastComputation<ProtocolBuilderNumeric>(pjBytes).buildComputation(builder);
+    return new BroadcastComputation<ProtocolBuilderNumeric>(pjBytes, noOfParties > 2)
+        .buildComputation(builder);
   }
 
   private DRes<List<byte[]>> computeZValues(ProtocolBuilderNumeric builder,
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 40f1df406..a109267ea 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -29,7 +29,7 @@ public class Spdz2kRoundSynchronization<
     PlainT extends CompUInt<HighT, LowT, PlainT>>
     implements RoundSynchronization<Spdz2kResourcePool<PlainT>> {
 
-  private static final int OPEN_VALUE_THRESHOLD = 100000;
+  private static final int OPEN_VALUE_THRESHOLD = 300000;
   private final int openValueThreshold;
   private final int batchSize;
   private boolean isCheckRequired;
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestBroadcastComputationSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestBroadcastComputationSpdz2k.java
index a8da81540..0ada34d15 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestBroadcastComputationSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestBroadcastComputationSpdz2k.java
@@ -91,7 +91,8 @@ public void test() throws Exception {
           }
           Application<List<byte[]>, ProtocolBuilderNumeric> testApplication =
               root -> new BroadcastComputation<ProtocolBuilderNumeric>(
-                  inputs.get(root.getBasicNumericContext().getMyId() - 1)).buildComputation(root);
+                  inputs.get(root.getBasicNumericContext().getMyId() - 1), (noParties > 2))
+                  .buildComputation(root);
           List<byte[]> actual = runApplication(testApplication);
           assertEquals(inputs.size(), actual.size());
           for (int i = 0; i < actual.size(); i++) {
@@ -122,10 +123,12 @@ public void test() throws Exception {
           Application<List<byte[]>, ProtocolBuilderNumeric> testApplication;
           if (partyId == 2) {
             testApplication = root -> new MaliciousBroadcastComputation(
-                inputs.get(root.getBasicNumericContext().getMyId() - 1)).buildComputation(root);
+                inputs.get(root.getBasicNumericContext().getMyId() - 1), noParties > 2)
+                .buildComputation(root);
           } else {
             testApplication = root -> new BroadcastComputation<ProtocolBuilderNumeric>(
-                inputs.get(root.getBasicNumericContext().getMyId() - 1)).buildComputation(root);
+                inputs.get(root.getBasicNumericContext().getMyId() - 1), noParties > 2)
+                .buildComputation(root);
           }
           // we need that new test framework...
           try {
@@ -143,8 +146,8 @@ private static class MaliciousBroadcastComputation extends
 
     private final List<byte[]> inputCopy;
 
-    MaliciousBroadcastComputation(byte[] input) {
-      super(input);
+    MaliciousBroadcastComputation(byte[] input, boolean doValidation) {
+      super(input, doValidation);
       this.inputCopy = Collections.singletonList(input);
     }
 

From 8c8523e4e3579c0733d80e5558bbe81c2417fa67 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 19 Sep 2018 16:08:52 +0200
Subject: [PATCH 206/231] Updated argmin

---
 .../framework/builder/numeric/Comparison.java |   8 ++
 .../builder/numeric/DefaultComparison.java    |   7 ++
 .../fresco/lib/math/integer/min/ArgMin.java   | 111 ++++++++++++++++++
 .../arithmetic/ComparisonLoggerDecorator.java |   6 +
 4 files changed, 132 insertions(+)
 create mode 100644 core/src/main/java/dk/alexandra/fresco/lib/math/integer/min/ArgMin.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
index 20080b167..20ef51884 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/Comparison.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.ComputationDirectory;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -120,6 +121,13 @@ default DRes<SInt> compareLT(DRes<SInt> x, DRes<SInt> y) {
    */
   DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm);
 
+  /**
+   * Computes the index of the minimum element in a list and the element itself. <p>The index is
+   * expressed as a list of bits where all bits are 0 except for the bit at the index of the minimum
+   * element, which is set to 1.</p>
+   */
+  DRes<Pair<List<DRes<SInt>>, SInt>> argMin(List<DRes<SInt>> xs);
+
   /**
    * Call to {@link #compareZero(DRes, int, Algorithm)} with default comparison algorithm.
    */
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 0851ef22f..43bf46e7e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -1,6 +1,7 @@
 package dk.alexandra.fresco.framework.builder.numeric;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -11,6 +12,7 @@
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestConstRounds;
 import dk.alexandra.fresco.lib.compare.zerotest.ZeroTestLogRounds;
 
+import dk.alexandra.fresco.lib.math.integer.min.ArgMin;
 import java.math.BigInteger;
 import java.util.List;
 
@@ -113,4 +115,9 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm)
     }
   }
 
+  @Override
+  public DRes<Pair<List<DRes<SInt>>, SInt>> argMin(List<DRes<SInt>> xs) {
+    return builder.seq(new ArgMin(xs));
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/min/ArgMin.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/min/ArgMin.java
new file mode 100644
index 000000000..4a2007be9
--- /dev/null
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/min/ArgMin.java
@@ -0,0 +1,111 @@
+package dk.alexandra.fresco.lib.math.integer.min;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
+import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.builder.numeric.Numeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.lib.conditional.ConditionalSelect;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Computes the index of the minimum element in a list and the element itself. <p>The index is
+ * expressed as a list of bits where all bits are 0 except for the bit at the index of the minimum
+ * element, which is set to 1.</p>
+ */
+public class ArgMin implements
+    Computation<Pair<List<DRes<SInt>>, SInt>, ProtocolBuilderNumeric> {
+
+  private final List<DRes<SInt>> xs;
+  private final int size;
+
+  public ArgMin(List<DRes<SInt>> xs) {
+    this.size = xs.size();
+    if (this.size < 2) {
+      throw new IllegalArgumentException("Minimum protocol. Size should never be less than 2.");
+    }
+    this.xs = xs;
+  }
+
+
+  @Override
+  public DRes<Pair<List<DRes<SInt>>, SInt>> buildComputation(
+      ProtocolBuilderNumeric builder) {
+    if (this.size == 2) {
+      Comparison comparison = builder.comparison();
+      Numeric numeric = builder.numeric();
+      DRes<SInt> firstValue = this.xs.get(0);
+      DRes<SInt> secondValue = this.xs.get(1);
+      DRes<SInt> firstCompare = comparison.compareLT(firstValue, secondValue);
+      DRes<SInt> minimum = builder
+          .seq(new ConditionalSelect(firstCompare, firstValue, secondValue));
+      DRes<SInt> secondCompare = numeric
+          .subFromOpen(builder.getOIntFactory().one(), firstCompare);
+      return () -> new Pair<>(
+          Arrays.asList(firstCompare, secondCompare),
+          minimum.out());
+    } else if (this.size == 3) {
+      Comparison comparison = builder.comparison();
+      Numeric numeric = builder.numeric();
+      DRes<SInt> firstValue = this.xs.get(0);
+      DRes<SInt> secondValue = this.xs.get(1);
+      DRes<SInt> thirdValue = this.xs.get(2);
+      DRes<SInt> c1Prime = comparison.compareLT(firstValue, secondValue);
+
+      DRes<SInt> m1 = builder.seq(new ConditionalSelect(c1Prime, firstValue, secondValue));
+
+      DRes<SInt> c2Prime = comparison.compareLT(m1, thirdValue);
+
+      DRes<SInt> m2 = builder.seq(new ConditionalSelect(c2Prime, m1, thirdValue));
+
+      DRes<SInt> firstComparison = numeric.mult(c1Prime, c2Prime);
+      DRes<SInt> secondComparison = numeric.sub(c2Prime, firstComparison);
+      DRes<SInt> tmp = numeric.subFromOpen(builder.getOIntFactory().one(), firstComparison);
+      DRes<SInt> thirdComparison = numeric.sub(tmp, secondComparison);
+      return () -> new Pair<>(
+          Arrays.asList(firstComparison, secondComparison, thirdComparison),
+          m2.out());
+    } else {
+      return builder.seq((seq) -> {
+        int k1 = size / 2;
+        List<DRes<SInt>> x1 = xs.subList(0, k1);
+        List<DRes<SInt>> x2 = xs.subList(k1, size);
+        return Pair.lazy(x1, x2);
+      }).pairInPar(
+          (seq, pair) -> seq.seq(new ArgMin(pair.getFirst())),
+          (seq, pair) -> seq.seq(new ArgMin(pair.getSecond()))
+      ).seq((seq, pair) -> {
+        Comparison comparison = seq.comparison();
+        Numeric numeric = seq.numeric();
+        Pair<List<DRes<SInt>>, SInt> minimum1 = pair.getFirst();
+        Pair<List<DRes<SInt>>, SInt> minimum2 = pair.getSecond();
+        SInt m1 = minimum1.getSecond();
+        SInt m2 = minimum2.getSecond();
+
+        DRes<SInt> compare = comparison.compareLT(() -> m1, () -> m2);
+        DRes<SInt> oneMinusCompare = numeric.subFromOpen(seq.getOIntFactory().one(), compare);
+        DRes<SInt> m = seq.seq(new ConditionalSelect(compare, () -> m1, () -> m2));
+        DRes<List<DRes<SInt>>> enteringIndexes = seq.par((par) -> {
+          Numeric parNumeric = par.numeric();
+          List<DRes<SInt>> cs = new ArrayList<>(size);
+          for (DRes<SInt> c : minimum1.getFirst()) {
+            cs.add(parNumeric.mult(c, compare));
+          }
+          for (DRes<SInt> c : minimum2.getFirst()) {
+            cs.add(parNumeric.mult(c, oneMinusCompare));
+          }
+          return () -> cs;
+        });
+        return () -> {
+          List<DRes<SInt>> out = enteringIndexes.out();
+          SInt out1 = m.out();
+          return new Pair<>(out, out1);
+        };
+      });
+    }
+  }
+}
diff --git a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
index 5aa5c69da..23d6a6f3c 100644
--- a/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/logging/arithmetic/ComparisonLoggerDecorator.java
@@ -2,6 +2,7 @@
 
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.Comparison;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
@@ -94,6 +95,11 @@ public DRes<SInt> compareZero(DRes<SInt> x, int bitlength, Algorithm algorithm)
     return this.delegate.compareZero(x, bitlength, algorithm);
   }
 
+  @Override
+  public DRes<Pair<List<DRes<SInt>>, SInt>> argMin(List<DRes<SInt>> xs) {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
   @Override
   public void reset() {
     eqCount = 0;

From af602501899c86c28305fab4461dae2016964a25 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 19 Sep 2018 17:12:34 +0200
Subject: [PATCH 207/231] Cache powers of two

---
 .../framework/value/BigIntegerOIntArithmetic.java | 15 +++++++++++----
 .../framework/value/BigIntegerOIntFactory.java    | 10 ++++++++++
 .../fresco/framework/value/OIntFactory.java       |  5 +++++
 .../arithmetic/DummyArithmeticBuilderFactory.java |  2 +-
 .../alexandra/fresco/suite/spdz/SpdzBuilder.java  |  2 +-
 .../suite/spdz2k/datatypes/CompUIntFactory.java   |  5 +++++
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
index 3bb9bcbb9..9f976db97 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntArithmetic.java
@@ -13,12 +13,15 @@ public class BigIntegerOIntArithmetic implements OIntArithmetic {
 
   private static final BigInteger TWO = new BigInteger("2");
   private List<OInt> twoPowersList;
+  private final List<OInt> cachedTwoPowersList;
   private final OIntFactory factory;
 
   public BigIntegerOIntArithmetic(OIntFactory factory) {
     this.factory = factory;
     twoPowersList = new ArrayList<>(1);
     twoPowersList.add(new BigIntegerOInt(BigInteger.ONE));
+    cachedTwoPowersList = Collections
+        .unmodifiableList(getPowersOfTwo(2 * factory.getMaxBitLength()));
   }
 
   @Override
@@ -70,14 +73,18 @@ public List<OInt> getPowersOfTwo(int numPowers) {
 
   @Override
   public OInt twoTo(int power) {
-    // TODO look up in pre-computed powers
-    return factory.fromBigInteger(TWO.pow(power));
+    if (power < cachedTwoPowersList.size()) {
+      return cachedTwoPowersList.get(power);
+    } else {
+      System.out.println("Not cached!");
+      return factory.fromBigInteger(TWO.pow(power));
+    }
   }
 
   @Override
   public OInt modTwoTo(OInt input, int power) {
-    return factory.fromBigInteger(factory.toBigInteger(input).mod(TWO.pow(
-        power)));
+    OInt pow = twoTo(power);
+    return factory.fromBigInteger(factory.toBigInteger(input).mod(factory.toBigInteger(pow)));
   }
 
   @Override
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
index ae1974d52..a597a9015 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/BigIntegerOIntFactory.java
@@ -11,6 +11,11 @@ public class BigIntegerOIntFactory implements OIntFactory {
   private static final OInt ZERO = new BigIntegerOInt(BigInteger.ZERO);
   private static final OInt ONE = new BigIntegerOInt(BigInteger.ONE);
   private static final OInt TWO = new BigIntegerOInt(BigInteger.valueOf(2));
+  private final int maxBitLength;
+
+  public BigIntegerOIntFactory(int maxBitLength) {
+    this.maxBitLength = maxBitLength;
+  }
 
   @Override
   public BigInteger toBigInteger(OInt value) {
@@ -37,4 +42,9 @@ public OInt two() {
     return TWO;
   }
 
+  @Override
+  public int getMaxBitLength() {
+    return maxBitLength;
+  }
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
index 9896e6fe4..58f9b2ea5 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/value/OIntFactory.java
@@ -44,4 +44,9 @@ default List<OInt> fromBigInteger(List<BigInteger> values) {
    */
   OInt two();
 
+  /**
+   * Returns the bit length of the max. representable value.
+   */
+  int getMaxBitLength();
+
 }
diff --git a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
index 4b5f07aa7..f639f0cb5 100644
--- a/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
+++ b/core/src/main/java/dk/alexandra/fresco/suite/dummy/arithmetic/DummyArithmeticBuilderFactory.java
@@ -43,7 +43,7 @@ public DummyArithmeticBuilderFactory(BasicNumericContext basicNumericContext,
     this.basicNumericContext = basicNumericContext;
     this.realNumericContext = realNumericContext;
     this.rand = new Random(0);
-    this.oIntFactory = new BigIntegerOIntFactory();
+    this.oIntFactory = new BigIntegerOIntFactory(basicNumericContext.getMaxBitLength());
     this.oIntArithmetic = new BigIntegerOIntArithmetic(oIntFactory);
   }
 
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index ae1e634e4..748637b46 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -47,7 +47,7 @@ class SpdzBuilder implements BuilderFactoryNumeric {
   SpdzBuilder(BasicNumericContext basicNumericContext, RealNumericContext realNumericContext) {
     this.basicNumericContext = basicNumericContext;
     this.realNumericContext = realNumericContext;
-    this.oIntFactory = new BigIntegerOIntFactory();
+    this.oIntFactory = new BigIntegerOIntFactory(basicNumericContext.getMaxBitLength());
     this.oIntArithmetic = new BigIntegerOIntArithmetic(oIntFactory);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index efffb99ee..c3d634077 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -74,6 +74,11 @@ default Spdz2kSIntBoolean<CompT> toSpdz2kSIntBoolean(DRes<SInt> value) {
    */
   int getLowBitLength();
 
+  @Override
+  default int getMaxBitLength() {
+    return getLowBitLength();
+  }
+
   /**
    * Get total bit length.
    */

From 1bcb17836359cfc3755c581be06a46a146fc658e Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 20 Sep 2018 14:33:19 +0200
Subject: [PATCH 208/231] Updated spdz2k input

---
 .../suite/spdz2k/Spdz2kAdvancedNumeric.java   | 25 -------------------
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  6 +++--
 .../suite/spdz2k/datatypes/CompUInt128.java   |  4 +++
 .../spdz2k/datatypes/CompUInt128Factory.java  |  5 ++++
 .../spdz2k/datatypes/CompUInt64Factory.java   |  5 ++++
 .../spdz2k/datatypes/CompUIntFactory.java     |  5 ++++
 6 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
deleted file mode 100644
index d143bfa74..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
-import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
-import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kTruncationPairProtocol;
-
-/**
- * Spdz2k-specific advanced numeric functionality.
- */
-public class Spdz2kAdvancedNumeric extends DefaultAdvancedNumeric {
-
-  Spdz2kAdvancedNumeric(
-      BuilderFactoryNumeric factoryNumeric,
-      ProtocolBuilderNumeric builder) {
-    super(factoryNumeric, builder);
-  }
-
-  @Override
-  public DRes<TruncationPair> generateTruncationPair(int d) {
-    return builder.seq(seq -> seq.append(new Spdz2kTruncationPairProtocol<>(d)));
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index d9a05b5cc..a80d5c0d4 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -159,13 +159,15 @@ public DRes<SInt> randomElement() {
 
       @Override
       public DRes<SInt> known(BigInteger value) {
-        return builder.append(new Spdz2kKnownSIntProtocol<>(factory.createFromBigInteger(value)));
+        return builder.append(new Spdz2kKnownSIntProtocol<>(
+            (value != null) ? factory.fromLong(value.longValue()) : null));
       }
 
       @Override
       public DRes<SInt> input(BigInteger value, int inputParty) {
         return builder.seq(
-            new InputComputationSpdz2k<>(factory.createFromBigInteger(value), inputParty)
+            new InputComputationSpdz2k<>(
+                (value != null) ? factory.fromLong(value.longValue()) : null, inputParty)
         );
       }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
index a2de5c1ae..a7e08c839 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128.java
@@ -53,6 +53,10 @@ public CompUInt128(BigInteger value) {
     this(value.shiftRight(64).longValue(), value.shiftRight(32).intValue(), value.intValue());
   }
 
+  public CompUInt128(BigInteger value, boolean lowOnly) {
+    this(value.longValue());
+  }
+
   CompUInt128(long high, int mid, int low) {
     this.high = high;
     this.mid = mid;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
index 9a8bbb659..d0acc8f62 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt128Factory.java
@@ -49,6 +49,11 @@ public CompUInt128 createFromBigInteger(BigInteger value) {
     return value == null ? null : new CompUInt128(value);
   }
 
+  @Override
+  public CompUInt128 fromLong(long value) {
+    return new CompUInt128(value);
+  }
+
   @Override
   public CompUInt128 zero() {
     return ZERO;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
index 42cc3d680..cf9c01aba 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Factory.java
@@ -49,6 +49,11 @@ public CompUInt64 createFromBigInteger(BigInteger value) {
     return value == null ? null : new CompUInt64(value);
   }
 
+  @Override
+  public CompUInt64 fromLong(long value) {
+    return new CompUInt64(value & 0xffffffffL);
+  }
+
   @Override
   public CompUInt64 zero() {
     return ZERO;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
index c3d634077..e859d4196 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUIntFactory.java
@@ -93,6 +93,11 @@ default CompT createFromBigInteger(BigInteger value) {
     return (value == null) ? null : createFromBytes(value.toByteArray());
   }
 
+  /**
+   * Creates new {@link CompT} from a {@link long}.
+   */
+  CompT fromLong(long value);
+
   /**
    * Creates element whose value is zero.
    */

From ea8505539f44a0c0eeb65583c140540da521b5c1 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 20 Sep 2018 14:38:28 +0200
Subject: [PATCH 209/231] Missing file

---
 .../suite/spdz2k/Spdz2kAdvancedNumeric.java   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
new file mode 100644
index 000000000..d143bfa74
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kAdvancedNumeric.java
@@ -0,0 +1,25 @@
+package dk.alexandra.fresco.suite.spdz2k;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kTruncationPairProtocol;
+
+/**
+ * Spdz2k-specific advanced numeric functionality.
+ */
+public class Spdz2kAdvancedNumeric extends DefaultAdvancedNumeric {
+
+  Spdz2kAdvancedNumeric(
+      BuilderFactoryNumeric factoryNumeric,
+      ProtocolBuilderNumeric builder) {
+    super(factoryNumeric, builder);
+  }
+
+  @Override
+  public DRes<TruncationPair> generateTruncationPair(int d) {
+    return builder.seq(seq -> seq.append(new Spdz2kTruncationPairProtocol<>(d)));
+  }
+
+}

From bb1bc5765834d84fa00123e5ec4915f0a3af0c29 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Thu, 20 Sep 2018 17:16:43 +0200
Subject: [PATCH 210/231] Faster spdz2k input

---
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    | 11 +--
 .../natives/Spdz2kTwoPartyInputProtocol.java  | 68 +++++++++++++++++++
 2 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTwoPartyInputProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index a80d5c0d4..198592d64 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -29,6 +29,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomBitProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomElementProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kSubtractFromKnownProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kTwoPartyInputProtocol;
 import java.math.BigInteger;
 
 /**
@@ -165,10 +166,12 @@ public DRes<SInt> known(BigInteger value) {
 
       @Override
       public DRes<SInt> input(BigInteger value, int inputParty) {
-        return builder.seq(
-            new InputComputationSpdz2k<>(
-                (value != null) ? factory.fromLong(value.longValue()) : null, inputParty)
-        );
+        PlainT val = (value != null) ? factory.fromLong(value.longValue()) : null;
+        if (builder.getBasicNumericContext().getNoOfParties() <= 2) {
+          return builder.append(new Spdz2kTwoPartyInputProtocol<>(val, inputParty));
+        } else {
+          return builder.seq(new InputComputationSpdz2k<>(val, inputParty));
+        }
       }
 
       @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTwoPartyInputProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTwoPartyInputProtocol.java
new file mode 100644
index 000000000..3ed6bf7a7
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kTwoPartyInputProtocol.java
@@ -0,0 +1,68 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kInputMask;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
+
+/**
+ * Native protocol for inputting data.
+ */
+public class Spdz2kTwoPartyInputProtocol<PlainT extends CompUInt<?, ?, PlainT>>
+    extends Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final PlainT input;
+  private final int inputPartyId;
+  private Spdz2kInputMask<PlainT> inputMask;
+  private SInt share;
+
+  /**
+   * Creates new {@link Spdz2kTwoPartyInputProtocol}.
+   *
+   * @param input value to secret-share
+   * @param inputPartyId id of input party
+   */
+  public Spdz2kTwoPartyInputProtocol(PlainT input, int inputPartyId) {
+    this.input = input;
+    this.inputPartyId = inputPartyId;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    int myId = resourcePool.getMyId();
+    ByteSerializer<PlainT> serializer = resourcePool.getPlainSerializer();
+    Spdz2kDataSupplier<PlainT> dataSupplier = resourcePool.getDataSupplier();
+    if (round == 0) {
+      inputMask = dataSupplier.getNextInputMask(inputPartyId);
+      if (myId == inputPartyId) {
+        PlainT bcValue = this.input.subtract(inputMask.getOpenValue());
+        network.sendToAll(serializer.serialize(bcValue));
+      }
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      byte[] inputMaskBytes = network.receive(inputPartyId);
+      PlainT macKeyShare = dataSupplier.getSecretSharedKey();
+      Spdz2kSIntArithmetic<PlainT> maskShare = inputMask.getMaskShare();
+      Spdz2kSIntArithmetic<PlainT> out = maskShare.addConstant(
+          serializer.deserialize(inputMaskBytes),
+          macKeyShare,
+          factory.zero(),
+          myId == 1);
+      this.share = out;
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  @Override
+  public SInt out() {
+    return share;
+  }
+
+}

From 265ad1d11bfbc83be51e8c3b508020097fdd8b31 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 26 Sep 2018 11:34:29 +0200
Subject: [PATCH 211/231] Re-arrange mod2m protocol

---
 .../fresco/lib/math/integer/mod/Mod2m.java    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
index f857fe7ca..05f4dce02 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/math/integer/mod/Mod2m.java
@@ -3,9 +3,11 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.lib.math.integer.binary.RandomBitMask;
+import java.util.List;
 
 /**
  * Computes modular reduction of value mod 2^m.
@@ -37,26 +39,25 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     if (m >= k) {
       return input;
     }
-    DRes<RandomBitMask> r = builder.advancedNumeric().randomBitMask(k + kappa);
-    // Construct a new RandomBitMask consisting of the first m bits of r
-    DRes<RandomBitMask> rPrime = builder.seq(seq -> seq.advancedNumeric()
-        .randomBitMask(() -> r.out().getBits().out().subList(0, m)));
-
+    final DRes<RandomBitMask> r = builder.advancedNumeric().randomBitMask(k + kappa);
     return builder.seq(seq -> {
+      // Construct a new RandomBitMask consisting of the first m bits of r
+      final List<DRes<SInt>> rBits = r.out().getBits().out().subList(0, m);
+      DRes<RandomBitMask> rPrime = seq.advancedNumeric().randomBitMask(() -> rBits);
       // Use the integer interpretation of r to compute c = 2^{k-1}+(input + r)
       DRes<OInt> c = seq.numeric().openAsOInt(seq.numeric().addOpen(seq
-          .getOIntArithmetic().twoTo(k - 1), seq.numeric().add(input, r.out()
-              .getValue())));
-      return c;
-    }).seq((seq, c) -> {
-      DRes<OInt> cPrime = seq.getOIntArithmetic().modTwoTo(c, m);
+          .getOIntArithmetic().twoTo(k - 1), seq.numeric().add(input, r.out().getValue())));
+      Pair<DRes<RandomBitMask>, DRes<OInt>> pair = new Pair<>(rPrime, c);
+      return () -> pair;
+    }).seq((seq, pair) -> {
+      DRes<RandomBitMask> rPrime = pair.getFirst();
+      DRes<OInt> c = pair.getSecond();
+      DRes<OInt> cPrime = seq.getOIntArithmetic().modTwoTo(c.out(), m);
       DRes<SInt> u = seq.comparison().compareLTBits(cPrime, rPrime.out().getBits());
       // Return cPrime - 2^m * u
       return seq.numeric().add(seq.numeric().multByOpen(seq.getOIntArithmetic()
-          .twoTo(m), u),
+              .twoTo(m), u),
           seq.numeric().subFromOpen(cPrime, rPrime.out().getValue()));
     });
-
   }
-
 }

From a6de58f8fa4c8f7b354dfbbb46824ab5ea46dd15 Mon Sep 17 00:00:00 2001
From: Nikolaj Volgushev <n1v0lg@users.noreply.github.com>
Date: Wed, 26 Sep 2018 17:43:57 +0200
Subject: [PATCH 212/231] Replace xor with halfOr

---
 .../main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
index 558dcb99c..64f34c430 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/CarryOut.java
@@ -75,7 +75,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       // need to account for carry-in bit
       int lastIdx = pairs.size() - 1;
       SIntPair lastPair = pairs.get(lastIdx);
-      DRes<SInt> lastCarryPropagator = seq.logical().xor(
+      DRes<SInt> lastCarryPropagator = seq.logical().halfOr(
           lastPair.getSecond(),
           seq.logical().andKnown(carryIn, lastPair.getFirst()));
       pairs.set(lastIdx, new SIntPair(lastPair.getFirst(), lastCarryPropagator));

From 5a4ac9d0233f9297aaaef2d7ca3c2e802376267f Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Fri, 11 Jan 2019 14:35:26 +0300
Subject: [PATCH 213/231] Batched operations in carry

---
 .../builder/numeric/DefaultComparison.java    |  2 +-
 .../fresco/lib/compare/lt/Carry.java          | 80 ++++++++++++-------
 .../fresco/suite/spdz2k/Spdz2kComparison.java |  5 --
 3 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
index 43bf46e7e..9ea68153e 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/builder/numeric/DefaultComparison.java
@@ -68,7 +68,7 @@ public DRes<SInt> compareLTBits(DRes<OInt> openValue, DRes<List<DRes<SInt>>> sec
 
   @Override
   public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
-    return builder.par(new Carry(bitPairs));
+    return builder.seq(new Carry(bitPairs));
   }
 
   @Override
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java
index df6bbd4bb..6c8284110 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/Carry.java
@@ -1,14 +1,16 @@
 package dk.alexandra.fresco.lib.compare.lt;
 
 import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.ComputationParallel;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.SInt;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Carry implements ComputationParallel<List<SIntPair>, ProtocolBuilderNumeric> {
+public class Carry implements Computation<List<SIntPair>, ProtocolBuilderNumeric> {
 
   private final List<SIntPair> pairs;
 
@@ -18,37 +20,59 @@ public Carry(List<SIntPair> pairs) {
 
   @Override
   public DRes<List<SIntPair>> buildComputation(ProtocolBuilderNumeric builder) {
-    padIfUneven(pairs);
-    List<SIntPair> nextRoundInner = new ArrayList<>(pairs.size() / 2);
-    for (int i = 0; i < pairs.size() / 2; i++) {
-      SIntPair left = pairs.get(2 * i + 1);
-      SIntPair right = pairs.get(2 * i);
-      nextRoundInner.add(carry(builder, left, right));
+    if (pairs.size() == 1) {
+      return () -> pairs;
     }
-    return () -> nextRoundInner;
-  }
+    final boolean isOdd = pairs.size() % 2 != 0;
+    final int lastFullPairIdx = pairs.size() / 2;
+    return (builder.par(par -> {
+      // TODO pre-initialize to correct size
+      List<DRes<SInt>> pFactorsLeft = new ArrayList<>();
+      List<DRes<SInt>> pFactorsRight = new ArrayList<>();
+      List<DRes<SInt>> qFactorsLeft = new ArrayList<>();
+      List<DRes<SInt>> qFactorsRight = new ArrayList<>();
 
-  private SIntPair carry(ProtocolBuilderNumeric builder, SIntPair left, SIntPair right) {
-    if (left == null) {
-      return right;
-    }
-    DRes<SInt> p1 = left.getFirst();
-    DRes<SInt> g1 = left.getSecond();
-    DRes<SInt> p2 = right.getFirst();
-    DRes<SInt> g2 = right.getSecond();
-    DRes<SInt> p = builder.logical().and(p1, p2);
-    DRes<SInt> q = builder.seq(seq -> {
-      DRes<SInt> temp = seq.logical().and(p2, g1);
-      return seq.logical().halfOr(temp, g2);
+      for (int i = 0; i < lastFullPairIdx; i++) {
+        SIntPair left = pairs.get(2 * i + 1);
+        SIntPair right = pairs.get(2 * i);
+        DRes<SInt> p1 = left.getFirst();
+        DRes<SInt> g1 = left.getSecond();
+        DRes<SInt> p2 = right.getFirst();
+
+        pFactorsLeft.add(p1);
+        pFactorsRight.add(p2);
+
+        qFactorsLeft.add(p2);
+        qFactorsRight.add(g1);
+      }
+
+      DRes<List<DRes<SInt>>> ps = par.logical().pairWiseAnd(
+          () -> pFactorsLeft,
+          () -> pFactorsRight
+      );
+      DRes<List<DRes<SInt>>> qs = par.logical().pairWiseAnd(
+          () -> qFactorsLeft,
+          () -> qFactorsRight
+      );
+      Pair<DRes<List<DRes<SInt>>>, DRes<List<DRes<SInt>>>> resPair = new Pair<>(ps, qs);
+      return () -> resPair;
+    })).par((par, res) -> {
+      List<SIntPair> nextRoundInner = new ArrayList<>(pairs.size() / 2);
+      List<DRes<SInt>> ps = res.getFirst().out();
+      List<DRes<SInt>> qs = res.getSecond().out();
+      for (int i = 0; i < lastFullPairIdx; i++) {
+        DRes<SInt> oldQ = qs.get(i);
+        DRes<SInt> g2 = pairs.get(2 * i)
+            .getSecond();
+        DRes<SInt> q = par.logical().halfOr(oldQ, g2);
+        nextRoundInner.add(new SIntPair(ps.get(i), q));
+      }
+      if (isOdd) {
+        nextRoundInner.add(pairs.get(pairs.size() - 1));
+      }
+      return () -> nextRoundInner;
     });
-    return new SIntPair(p, q);
-  }
 
-  private void padIfUneven(List<SIntPair> pairs) {
-    int size = pairs.size();
-    if (size % 2 != 0 && size != 1) {
-      pairs.add(null);
-    }
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index 186b4de74..7573cbce8 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -64,11 +64,6 @@ public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm al
     return compareZero(builder.numeric().sub(x, y), bitlength, algorithm);
   }
 
-  @Override
-  public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
-    return builder.append(new Spdz2kCarryProtocol<>(bitPairs));
-  }
-
   protected CompUIntFactory<PlainT> getFactory() {
     return factory;
   }

From 3edb84b855d88be13ee8408306fe35a293ec9838 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Fri, 11 Jan 2019 14:36:38 +0300
Subject: [PATCH 214/231] Remove unused classes

---
 .../fresco/suite/spdz2k/Spdz2kComparison.java |   2 -
 .../natives/Spdz2kCarryProtocol.java          | 213 ------------------
 2 files changed, 215 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index 7573cbce8..7afc1ba45 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -4,14 +4,12 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
-import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.eq.ZeroTestSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kCarryProtocol;
 import java.util.List;
 
 /**
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
deleted file mode 100644
index 713b7d657..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
-
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.util.OpenedValueStore;
-import dk.alexandra.fresco.framework.util.SIntPair;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Spdz2kCarryProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
-    Spdz2kNativeProtocol<List<SIntPair>, PlainT> {
-
-  private final List<SIntPair> bits;
-  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
-  private List<Spdz2kSIntBoolean<PlainT>> epsilons;
-  private List<Spdz2kSIntBoolean<PlainT>> deltas;
-  private List<PlainT> openEpsilons;
-  private List<PlainT> openDeltas;
-  private List<SIntPair> carried;
-
-  public Spdz2kCarryProtocol(List<SIntPair> bits) {
-    this.bits = bits;
-  }
-
-  @Override
-  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
-      Network network) {
-    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
-    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    if (round == 0) {
-      triples = new ArrayList<>(bits.size());
-      epsilons = new ArrayList<>(bits.size());
-      deltas = new ArrayList<>(bits.size());
-      openEpsilons = new ArrayList<>(bits.size());
-      openDeltas = new ArrayList<>(bits.size());
-      carried = new ArrayList<>(bits.size() / 2);
-
-      for (int i = 0; i < bits.size() / 2; i++) {
-        // two multiplications
-        triples.add(resourcePool.getDataSupplier().getNextBitTripleShares());
-        triples.add(resourcePool.getDataSupplier().getNextBitTripleShares());
-
-        SIntPair left = bits.get(2 * i + 1);
-        SIntPair right = bits.get(2 * i);
-
-        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p1p2Triple = triples.get(2 * i + 1);
-        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p2g1Triple = triples.get(2 * i);
-
-        Spdz2kSIntBoolean<PlainT> p1 = factory.toSpdz2kSIntBoolean(left.getFirst());
-        Spdz2kSIntBoolean<PlainT> g1 = factory.toSpdz2kSIntBoolean(left.getSecond());
-        Spdz2kSIntBoolean<PlainT> p2 = factory.toSpdz2kSIntBoolean(right.getFirst());
-
-        // p2 * g1
-        epsilons.add(factory.toSpdz2kSIntBoolean(p2).xor(p2g1Triple.getLeft()));
-        deltas.add(factory.toSpdz2kSIntBoolean(g1).xor(p2g1Triple.getRight()));
-
-        // p1 * p2
-        epsilons.add(factory.toSpdz2kSIntBoolean(p1).xor(p1p2Triple.getLeft()));
-        deltas.add(factory.toSpdz2kSIntBoolean(p2).xor(p1p2Triple.getRight()));
-      }
-
-      serializeAndSend(network, epsilons, deltas);
-      return EvaluationStatus.HAS_MORE_ROUNDS;
-    } else {
-      receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
-
-      OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
-          .getOpenedValueStore();
-
-      for (int i = 0; i < bits.size() / 2; i++) {
-        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p1p2Triple = triples.get(2 * i + 1);
-        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p2g1Triple = triples.get(2 * i);
-
-        PlainT p1p2E = openEpsilons.get(2 * i + 1);
-        openedValueStore.pushOpenedValue(
-            epsilons.get(2 * i + 1).asArithmetic(),
-            p1p2E.toArithmeticRep()
-        );
-        PlainT p2g1E = openEpsilons.get(2 * i);
-        openedValueStore.pushOpenedValue(
-            epsilons.get(2 * i).asArithmetic(),
-            p2g1E.toArithmeticRep()
-        );
-
-        PlainT p1p2D = openDeltas.get(2 * i + 1);
-        openedValueStore.pushOpenedValue(
-            deltas.get(2 * i + 1).asArithmetic(),
-            p1p2D.toArithmeticRep()
-        );
-        PlainT p2g1D = openDeltas.get(2 * i);
-        openedValueStore.pushOpenedValue(
-            deltas.get(2 * i).asArithmetic(),
-            p2g1D.toArithmeticRep()
-        );
-        Spdz2kSIntBoolean<PlainT> p = andAfterReceive(p1p2E, p1p2D, p1p2Triple, macKeyShare,
-            factory,
-            resourcePool.getMyId());
-
-        Spdz2kSIntBoolean<PlainT> g2 = factory.toSpdz2kSIntBoolean(bits.get(2 * i).getSecond());
-
-        Spdz2kSIntBoolean<PlainT> g = andAfterReceive(p2g1E, p2g1D, p2g1Triple, macKeyShare,
-            factory,
-            resourcePool.getMyId()).xor(g2);
-        carried.add(new SIntPair(p, g));
-      }
-      // if we have an odd number of elements the last pair can just be taken directly from the input
-      if (bits.size() % 2 != 0) {
-        carried.add(bits.get(bits.size() - 1));
-      }
-      return EvaluationStatus.IS_DONE;
-    }
-  }
-
-  private Spdz2kSIntBoolean<PlainT> andAfterReceive(
-      PlainT e,
-      PlainT d,
-      Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,
-      PlainT macKeyShare,
-      CompUIntFactory<PlainT> factory,
-      int myId) {
-    int eBit = e.bitValue();
-    int dBit = d.bitValue();
-    PlainT ed = e.multiply(d);
-    // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
-    Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
-    Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
-    Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
-    return tripleProduct
-        .xor(tripleRight.and(eBit))
-        .xor(tripleLeft.and(dBit))
-        .xorOpen(ed,
-            macKeyShare,
-            factory.zero().toBitRep(),
-            myId == 1);
-  }
-
-  /**
-   * Retrieves shares for epsilons and deltas and reconstructs each.
-   */
-  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory,
-      int noOfParties) {
-    byte[] rawEpsilons = network.receive(1);
-    byte[] rawDeltas = network.receive(1);
-
-    for (int i = 0; i < epsilons.size(); i++) {
-      int currentByteIdx = i / Byte.SIZE;
-      int bitIndexWithinByte = i % Byte.SIZE;
-      PlainT e = factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte));
-      openEpsilons.add(e);
-      PlainT d = factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte));
-      openDeltas.add(d);
-    }
-
-    for (int i = 2; i <= noOfParties; i++) {
-      rawEpsilons = network.receive(i);
-      rawDeltas = network.receive(i);
-
-      for (int j = 0; j < epsilons.size(); j++) {
-        int currentByteIdx = j / Byte.SIZE;
-        int bitIndexWithinByte = j % Byte.SIZE;
-        openEpsilons.set(j, openEpsilons.get(j).add(
-            factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte))
-        ));
-        openDeltas.set(j, openDeltas.get(j).add(
-            factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte))
-        ));
-      }
-    }
-  }
-
-  /**
-   * Serializes and sends epsilon and delta values.
-   */
-  private void serializeAndSend(Network network,
-      List<Spdz2kSIntBoolean<PlainT>> epsilons,
-      List<Spdz2kSIntBoolean<PlainT>> deltas) {
-    int numBytes = epsilons.size() / Byte.SIZE;
-    if (epsilons.size() % 8 != 0) {
-      numBytes++;
-    }
-    byte[] epsilonBytes = new byte[numBytes];
-    byte[] deltaBytes = new byte[numBytes];
-
-    for (int i = 0; i < epsilons.size(); i++) {
-      int currentByteIdx = i / Byte.SIZE;
-      int bitIndexWithinByte = i % Byte.SIZE;
-
-      int serializedEpsilon = epsilons.get(i).getShare().bitValue();
-      epsilonBytes[currentByteIdx] |= ((serializedEpsilon << bitIndexWithinByte)
-          & (1 << bitIndexWithinByte));
-
-      int serializedDelta = deltas
-          .get(i)
-          .getShare()
-          .bitValue();
-      deltaBytes[currentByteIdx] |= ((serializedDelta << bitIndexWithinByte)
-          & (1 << bitIndexWithinByte));
-    }
-    network.sendToAll(epsilonBytes);
-    network.sendToAll(deltaBytes);
-  }
-
-  @Override
-  public List<SIntPair> out() {
-    return carried;
-  }
-
-}

From 04b2025644cac2fb8c1c4ff1276db43004a2e10e Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Fri, 11 Jan 2019 15:01:03 +0300
Subject: [PATCH 215/231] Don't used batched local ops

---
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 20 -------
 .../Spdz2kAndKnownBatchedProtocol.java        | 50 ------------------
 .../natives/Spdz2kNotBatchedProtocol.java     | 45 ----------------
 .../natives/Spdz2kOrBatchedProtocol.java      |  2 +-
 .../Spdz2kXorKnownBatchedProtocol.java        | 52 -------------------
 5 files changed, 1 insertion(+), 168 deletions(-)
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
 delete mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 202247ae8..640684abe 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -11,14 +11,11 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.OrNeighborsComputationSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndBatchedProtocol;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
-import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
 import java.util.List;
@@ -79,23 +76,6 @@ public DRes<SInt> not(DRes<SInt> secretBit) {
     return xorKnown(builder.getOIntFactory().one(), secretBit);
   }
 
-  @Override
-  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
-      DRes<List<DRes<SInt>>> secretBits) {
-    return builder.append(new Spdz2kXorKnownBatchedProtocol<>(knownBits, secretBits));
-  }
-
-  @Override
-  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
-      DRes<List<DRes<SInt>>> secretBits) {
-    return builder.append(new Spdz2kAndKnownBatchedProtocol<>(knownBits, secretBits));
-  }
-
-  @Override
-  public DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits) {
-    return builder.append(new Spdz2kNotBatchedProtocol<>(bits));
-  }
-
   @Override
   public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
deleted file mode 100644
index 104e9e610..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.value.OInt;
-import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Spdz2kAndKnownBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
-    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
-
-  private final DRes<List<OInt>> left;
-  private final DRes<List<DRes<SInt>>> right;
-  private List<DRes<SInt>> result;
-
-  public Spdz2kAndKnownBatchedProtocol(
-      DRes<List<OInt>> left,
-      DRes<List<DRes<SInt>>> right) {
-    this.left = left;
-    this.right = right;
-  }
-
-  @Override
-  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
-      Network network) {
-    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    List<OInt> leftOut = left.out();
-    List<DRes<SInt>> rightOut = right.out();
-    this.result = new ArrayList<>(leftOut.size());
-    for (int i = 0; i < leftOut.size(); i++) {
-      PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();
-      DRes<SInt> secretBit = rightOut.get(i);
-      Spdz2kSIntBoolean<PlainT> andedBit = factory.toSpdz2kSIntBoolean(secretBit)
-          .and(knownBit.bitValue());
-      result.add(andedBit);
-    }
-    return EvaluationStatus.IS_DONE;
-  }
-
-  @Override
-  public List<DRes<SInt>> out() {
-    return result;
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
deleted file mode 100644
index 4707250a9..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Spdz2kNotBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
-    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
-
-  private final DRes<List<DRes<SInt>>> bits;
-  private List<DRes<SInt>> result;
-
-  public Spdz2kNotBatchedProtocol(DRes<List<DRes<SInt>>> bits) {
-    this.bits = bits;
-  }
-
-  @Override
-  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
-      Network network) {
-    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
-    List<DRes<SInt>> bitsOut = bits.out();
-    this.result = new ArrayList<>(bitsOut.size());
-    for (int i = 0; i < bitsOut.size(); i++) {
-      DRes<SInt> secretBit = bitsOut.get(i);
-      Spdz2kSIntBoolean<PlainT> notBit = factory.toSpdz2kSIntBoolean(secretBit)
-          .xorOpen(factory.one().toBitRep(), secretSharedKey, factory.zero().toBitRep(),
-              resourcePool.getMyId() == 1);
-      result.add(notBit);
-    }
-    return EvaluationStatus.IS_DONE;
-  }
-
-  @Override
-  public List<DRes<SInt>> out() {
-    return result;
-  }
-
-}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
index 8b6d4616d..4d36de414 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
@@ -14,7 +14,7 @@
 import java.util.List;
 
 /**
- * Native protocol for computing logical AND of two values in boolean form.
+ * Native protocol for computing logical OR of twos lists of values.
  */
 public class Spdz2kOrBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
     Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
deleted file mode 100644
index dfc8109bc..000000000
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
-
-import dk.alexandra.fresco.framework.DRes;
-import dk.alexandra.fresco.framework.network.Network;
-import dk.alexandra.fresco.framework.value.OInt;
-import dk.alexandra.fresco.framework.value.SInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
-import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
-import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Spdz2kXorKnownBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
-    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
-
-  private final DRes<List<OInt>> left;
-  private final DRes<List<DRes<SInt>>> right;
-  private List<DRes<SInt>> result;
-
-  public Spdz2kXorKnownBatchedProtocol(
-      DRes<List<OInt>> left,
-      DRes<List<DRes<SInt>>> right) {
-    this.left = left;
-    this.right = right;
-  }
-
-  @Override
-  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
-      Network network) {
-    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
-    PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
-    List<OInt> leftOut = left.out();
-    List<DRes<SInt>> rightOut = right.out();
-    this.result = new ArrayList<>(leftOut.size());
-    for (int i = 0; i < leftOut.size(); i++) {
-      PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();
-      DRes<SInt> secretBit = rightOut.get(i);
-      Spdz2kSIntBoolean<PlainT> xoredBit = factory.toSpdz2kSIntBoolean(secretBit)
-          .xorOpen(knownBit, secretSharedKey, factory.zero().toBitRep(),
-              resourcePool.getMyId() == 1);
-      result.add(xoredBit);
-    }
-    return EvaluationStatus.IS_DONE;
-  }
-
-  @Override
-  public List<DRes<SInt>> out() {
-    return result;
-  }
-
-}

From 541590580077ffbd71f7395b5842707b733c9950 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Sat, 12 Jan 2019 15:29:16 +0300
Subject: [PATCH 216/231] Spdz batched AND

---
 .../fresco/suite/spdz/SpdzBuilder.java        |  23 ++++
 .../spdz/gates/SpdzAndBatchedProtocol.java    | 103 ++++++++++++++++++
 .../natives/Spdz2kAndBatchedProtocol.java     |   1 +
 3 files changed, 127 insertions(+)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 748637b46..58005e2aa 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -5,6 +5,8 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.Conversion;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
+import dk.alexandra.fresco.framework.builder.numeric.Logical;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.PreprocessedValues;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
@@ -19,6 +21,7 @@
 import dk.alexandra.fresco.lib.real.RealNumericContext;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocolKnownLeft;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzAndBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputTwoPartyProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzKnownSIntProtocol;
@@ -32,6 +35,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzSubtractProtocolKnownRight;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzTruncationPairProtocol;
 import java.math.BigInteger;
+import java.util.List;
 
 /**
  * Basic native builder for the SPDZ protocol suite.
@@ -75,6 +79,11 @@ public AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
     return new SpdzAdvancedNumeric(this, builder);
   }
 
+  @Override
+  public Logical createLogical(ProtocolBuilderNumeric builder) {
+    return new SpdzLogical(builder);
+  }
+
   @Override
   public Numeric createNumeric(ProtocolBuilderNumeric protocolBuilder) {
     return new Numeric() {
@@ -226,6 +235,20 @@ public OIntArithmetic getOIntArithmetic() {
     return oIntArithmetic;
   }
 
+  class SpdzLogical extends DefaultLogical {
+
+    protected SpdzLogical(
+        ProtocolBuilderNumeric builder) {
+      super(builder);
+    }
+
+    @Override
+    public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
+        DRes<List<DRes<SInt>>> bitsB) {
+      return builder.append(new SpdzAndBatchedProtocol(bitsA, bitsB));
+    }
+  }
+
   class SpdzAdvancedNumeric extends DefaultAdvancedNumeric {
 
     protected SpdzAdvancedNumeric(
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
new file mode 100644
index 000000000..2d037de8a
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
@@ -0,0 +1,103 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzTriple;
+import dk.alexandra.fresco.suite.spdz.storage.SpdzDataSupplier;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpdzAndBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>> {
+
+  private final DRes<List<DRes<SInt>>> leftDef;
+  private final DRes<List<DRes<SInt>>> rightDef;
+  private List<SpdzTriple> triples;
+  private List<SpdzSInt> epsilons;
+  private List<SpdzSInt> deltas;
+  private List<DRes<SInt>> products;
+
+  public SpdzAndBatchedProtocol(DRes<List<DRes<SInt>>> left, DRes<List<DRes<SInt>>> right) {
+    this.leftDef = left;
+    this.rightDef = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
+      Network network) {
+    SpdzDataSupplier dataSupplier = spdzResourcePool.getDataSupplier();
+    int noOfPlayers = spdzResourcePool.getNoOfParties();
+    ByteSerializer<BigInteger> serializer = spdzResourcePool.getSerializer();
+    final List<DRes<SInt>> leftFactors = leftDef.out();
+    final List<DRes<SInt>> rightFactors = rightDef.out();
+    if (round == 0) {
+      triples = new ArrayList<>(leftFactors.size());
+      epsilons = new ArrayList<>(leftFactors.size());
+      deltas = new ArrayList<>(leftFactors.size());
+      products = new ArrayList<>(leftFactors.size());
+
+      for (int i = 0; i < leftFactors.size(); i++) {
+        SpdzTriple triple = dataSupplier.getNextTriple();
+        triples.add(triple);
+
+        SpdzSInt left = (SpdzSInt) leftFactors.get(i).out();
+        SpdzSInt right = (SpdzSInt) rightFactors.get(i).out();
+
+        SpdzSInt epsilon = left.subtract(triple.getA());
+        SpdzSInt delta = right.subtract(triple.getB());
+        epsilons.add(epsilon);
+        deltas.add(delta);
+
+        network.sendToAll(serializer.serialize(epsilon.getShare()));
+        network.sendToAll(serializer.serialize(delta.getShare()));
+      }
+
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      for (int i = 0; i < leftFactors.size(); i++) {
+        BigInteger[] epsilonShares = new BigInteger[noOfPlayers];
+        BigInteger[] deltaShares = new BigInteger[noOfPlayers];
+        for (int p = 0; p < noOfPlayers; p++) {
+          epsilonShares[p] = serializer.deserialize(network.receive(p + 1));
+          deltaShares[p] = serializer.deserialize(network.receive(p + 1));
+        }
+
+        BigInteger e = epsilonShares[0];
+        BigInteger d = deltaShares[0];
+        for (int p = 1; p < epsilonShares.length; p++) {
+          e = e.add(epsilonShares[p]);
+          d = d.add(deltaShares[p]);
+        }
+        BigInteger modulus = spdzResourcePool.getModulus();
+        e = e.mod(modulus);
+        d = d.mod(modulus);
+
+        BigInteger product = e.multiply(d).mod(modulus);
+        SpdzSInt ed = new SpdzSInt(
+            product,
+            dataSupplier.getSecretSharedKey().multiply(product).mod(modulus),
+            modulus);
+        SpdzTriple triple = triples.get(i);
+        SpdzSInt res = triple.getC();
+        SpdzSInt prod = res.add(triple.getB().multiply(e))
+            .add(triple.getA().multiply(d))
+            .add(ed, spdzResourcePool.getMyId());
+        products.add(prod);
+        // Set the opened and closed value.
+        spdzResourcePool.getOpenedValueStore().pushOpenedValue(epsilons.get(i), e);
+        spdzResourcePool.getOpenedValueStore().pushOpenedValue(deltas.get(i), d);
+      }
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return products;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
index 1d1d26bad..67e424c87 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
@@ -21,6 +21,7 @@ public class Spdz2kAndBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> ext
 
   private DRes<List<DRes<SInt>>> bitsADef;
   private DRes<List<DRes<SInt>>> bitsBDef;
+  // TODO final LinkedLists?
   private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
   private List<Spdz2kSIntBoolean<PlainT>> epsilons;
   private List<Spdz2kSIntBoolean<PlainT>> deltas;

From 94252a05695ec272cc07a1be2970d06ef440124d Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Tue, 15 Jan 2019 15:41:26 +0100
Subject: [PATCH 217/231] SPDZ batched OR and tests

---
 .../logical/LogicalOperationsTests.java       |  39 +++++-
 .../fresco/suite/spdz/SpdzBuilder.java        |  24 ++++
 .../spdz/gates/SpdzOrBatchedProtocol.java     | 118 ++++++++++++++++++
 .../fresco/suite/spdz/TestSpdzLogical.java    |  52 ++++++++
 .../natives/Spdz2kOrBatchedProtocol.java      |   2 +-
 5 files changed, 233 insertions(+), 2 deletions(-)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
 create mode 100644 suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzLogical.java

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
index 7dd9265ae..0f4549404 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
@@ -183,6 +183,43 @@ public void test() {
     }
   }
 
+  public static class TestOrNeighbors<ResourcePoolT extends ResourcePool>
+      extends TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
+
+    @Override
+    public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
+
+      return new TestThread<ResourcePoolT, ProtocolBuilderNumeric>() {
+        private final List<BigInteger> list = Arrays.asList(
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ONE,
+            BigInteger.ZERO,
+            BigInteger.ZERO);
+
+        @Override
+        public void test() {
+          Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
+              root -> {
+                DRes<List<DRes<SInt>>> leftClosed = root.numeric().knownAsDRes(list);
+                return root.seq(seq -> {
+                  DRes<List<DRes<SInt>>> orred = seq.logical().orNeighbors(leftClosed.out());
+                  return seq.collections().openList(orred);
+                });
+              };
+          List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
+              .collect(Collectors.toList());
+          List<BigInteger> expected = Arrays.asList(
+              BigInteger.ONE,
+              BigInteger.ONE,
+              BigInteger.ZERO
+          );
+          Assert.assertEquals(expected, actual);
+        }
+      };
+    }
+  }
+
   public static class TestOrList<ResourcePoolT extends ResourcePool> extends
       TestThreadFactory<ResourcePoolT, ProtocolBuilderNumeric> {
 
@@ -209,7 +246,7 @@ public void test() {
           Application<List<BigInteger>, ProtocolBuilderNumeric> app = root -> {
             List<DRes<BigInteger>> results = inputLists.stream().map(
                 current -> root.numeric().open(root.logical().orOfList(root.numeric().knownAsDRes(
-                        current)))).collect(Collectors.toList());
+                    current)))).collect(Collectors.toList());
             return () -> results.stream().map(DRes::out).collect(Collectors
                 .toList());
           };
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 58005e2aa..8f094faa0 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -27,6 +27,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzKnownSIntProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMultProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMultProtocolKnownLeft;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzOrBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOutputSingleProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOutputToAllProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzRandomProtocol;
@@ -35,6 +36,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzSubtractProtocolKnownRight;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzTruncationPairProtocol;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -242,11 +244,33 @@ protected SpdzLogical(
       super(builder);
     }
 
+    @Override
+    public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
+        DRes<List<DRes<SInt>>> bitsB) {
+      return builder.append(new SpdzOrBatchedProtocol(bitsA, bitsB));
+    }
+
     @Override
     public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
         DRes<List<DRes<SInt>>> bitsB) {
       return builder.append(new SpdzAndBatchedProtocol(bitsA, bitsB));
     }
+
+    @Override
+    public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
+      // TODO same as SPDZ2k version
+      List<DRes<SInt>> leftBits = new ArrayList<>(bits.size() / 2);
+      List<DRes<SInt>> rightBits = new ArrayList<>(bits.size() / 2);
+      for (int i = 0; i < bits.size() - 1; i += 2) {
+        leftBits.add(bits.get(i));
+        rightBits.add(bits.get(i + 1));
+      }
+      final boolean isOdd = bits.size() % 2 != 0;
+      return builder.append(new SpdzOrBatchedProtocol(
+          () -> leftBits,
+          () -> rightBits,
+          isOdd ? bits.get(bits.size() - 1) : null));
+    }
   }
 
   class SpdzAdvancedNumeric extends DefaultAdvancedNumeric {
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
new file mode 100644
index 000000000..7493f8593
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
@@ -0,0 +1,118 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzTriple;
+import dk.alexandra.fresco.suite.spdz.storage.SpdzDataSupplier;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpdzOrBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>> {
+
+  private final DRes<List<DRes<SInt>>> leftDef;
+  private final DRes<List<DRes<SInt>>> rightDef;
+  private List<SpdzTriple> triples;
+  private List<SpdzSInt> epsilons;
+  private List<SpdzSInt> deltas;
+  private List<DRes<SInt>> disjunctions;
+  private final DRes<SInt> extraBit;
+
+  public SpdzOrBatchedProtocol(DRes<List<DRes<SInt>>> left, DRes<List<DRes<SInt>>> right,
+      DRes<SInt> extraBit) {
+    this.leftDef = left;
+    this.rightDef = right;
+    this.extraBit = extraBit;
+  }
+
+  public SpdzOrBatchedProtocol(DRes<List<DRes<SInt>>> left, DRes<List<DRes<SInt>>> right) {
+    this(left, right, null);
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
+      Network network) {
+    SpdzDataSupplier dataSupplier = spdzResourcePool.getDataSupplier();
+    int noOfPlayers = spdzResourcePool.getNoOfParties();
+    ByteSerializer<BigInteger> serializer = spdzResourcePool.getSerializer();
+    final List<DRes<SInt>> leftFactors = leftDef.out();
+    final List<DRes<SInt>> rightFactors = rightDef.out();
+    if (round == 0) {
+      triples = new ArrayList<>(leftFactors.size());
+      epsilons = new ArrayList<>(leftFactors.size());
+      deltas = new ArrayList<>(leftFactors.size());
+      disjunctions = new ArrayList<>(leftFactors.size());
+
+      for (int i = 0; i < leftFactors.size(); i++) {
+        SpdzTriple triple = dataSupplier.getNextTriple();
+        triples.add(triple);
+
+        SpdzSInt left = (SpdzSInt) leftFactors.get(i).out();
+        SpdzSInt right = (SpdzSInt) rightFactors.get(i).out();
+
+        SpdzSInt epsilon = left.subtract(triple.getA());
+        SpdzSInt delta = right.subtract(triple.getB());
+        epsilons.add(epsilon);
+        deltas.add(delta);
+
+        network.sendToAll(serializer.serialize(epsilon.getShare()));
+        network.sendToAll(serializer.serialize(delta.getShare()));
+      }
+
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      for (int i = 0; i < leftFactors.size(); i++) {
+        BigInteger[] epsilonShares = new BigInteger[noOfPlayers];
+        BigInteger[] deltaShares = new BigInteger[noOfPlayers];
+        for (int p = 0; p < noOfPlayers; p++) {
+          epsilonShares[p] = serializer.deserialize(network.receive(p + 1));
+          deltaShares[p] = serializer.deserialize(network.receive(p + 1));
+        }
+
+        BigInteger e = epsilonShares[0];
+        BigInteger d = deltaShares[0];
+        for (int p = 1; p < epsilonShares.length; p++) {
+          e = e.add(epsilonShares[p]);
+          d = d.add(deltaShares[p]);
+        }
+        BigInteger modulus = spdzResourcePool.getModulus();
+        e = e.mod(modulus);
+        d = d.mod(modulus);
+
+        BigInteger product = e.multiply(d).mod(modulus);
+        SpdzSInt ed = new SpdzSInt(
+            product,
+            dataSupplier.getSecretSharedKey().multiply(product).mod(modulus),
+            modulus);
+        SpdzTriple triple = triples.get(i);
+        SpdzSInt res = triple.getC();
+        SpdzSInt prod = res.add(triple.getB().multiply(e))
+            .add(triple.getA().multiply(d))
+            .add(ed, spdzResourcePool.getMyId());
+
+        SpdzSInt left = (SpdzSInt) leftFactors.get(i).out();
+        SpdzSInt right = (SpdzSInt) rightFactors.get(i).out();
+        // bitA + bitB - bitA * bitB
+        SpdzSInt disjunction = left.add(right).subtract(prod);
+        disjunctions.add(disjunction);
+        // Set the opened and closed value.
+        spdzResourcePool.getOpenedValueStore().pushOpenedValue(epsilons.get(i), e);
+        spdzResourcePool.getOpenedValueStore().pushOpenedValue(deltas.get(i), d);
+      }
+      if (extraBit != null) {
+        disjunctions.add(extraBit);
+      }
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return disjunctions;
+  }
+
+}
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzLogical.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzLogical.java
new file mode 100644
index 000000000..c890ddcb8
--- /dev/null
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzLogical.java
@@ -0,0 +1,52 @@
+package dk.alexandra.fresco.suite.spdz;
+
+import dk.alexandra.fresco.framework.sce.evaluator.EvaluationStrategy;
+import dk.alexandra.fresco.lib.math.integer.logical.LogicalOperationsTests;
+import dk.alexandra.fresco.suite.spdz.configuration.PreprocessingStrategy;
+import org.junit.Test;
+
+public class TestSpdzLogical extends AbstractSpdzTest {
+
+  @Test
+  public void testXorKnown() {
+    runTest(new LogicalOperationsTests.TestXorKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testAndKnown() {
+    runTest(new LogicalOperationsTests.TestAndKnown<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testAnd() {
+    runTest(new LogicalOperationsTests.TestAnd<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testOr() {
+    runTest(new LogicalOperationsTests.TestOr<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testOrOfList() {
+    runTest(new LogicalOperationsTests.TestOrList<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testOrNeighbors() {
+    runTest(new LogicalOperationsTests.TestOrNeighbors<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testNot() {
+    runTest(new LogicalOperationsTests.TestNot<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
index 4d36de414..7bea7e80a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
@@ -26,7 +26,7 @@ public class Spdz2kOrBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> exte
   private List<Spdz2kSIntBoolean<PlainT>> deltas;
   private List<PlainT> openEpsilons;
   private List<PlainT> openDeltas;
-  private DRes<SInt> extraBit;
+  private final DRes<SInt> extraBit;
   private List<DRes<SInt>> products;
 
   public Spdz2kOrBatchedProtocol(DRes<List<DRes<SInt>>> bitsA,

From 804c23a2def83e2e453c1d7048a682846f57a0de Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Thu, 17 Jan 2019 12:50:53 +0100
Subject: [PATCH 218/231] Fix off by one

---
 .../spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
index 5d5977942..fdefad32a 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/lt/MostSignBitSpdz2k.java
@@ -32,7 +32,7 @@ public MostSignBitSpdz2k(DRes<SInt> value, CompUIntFactory<PlainT> factory) {
   public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
     OIntArithmetic arithmetic = builder.getOIntArithmetic();
     DRes<OInt> twoTo2k1 = arithmetic.twoTo(k - 1);
-    return builder.seq(seq -> seq.advancedNumeric().randomBitMask(k - 2))
+    return builder.seq(seq -> seq.advancedNumeric().randomBitMask(k - 1))
         .seq((seq, mask) -> {
           Numeric numeric = seq.numeric();
           DRes<SInt> rPrime = mask.getValue();

From eae10ebd767675aeeea6b35a33ad774de3b4e1b4 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Thu, 17 Jan 2019 17:24:49 +0100
Subject: [PATCH 219/231] Bring back batched local ops

---
 .../spdz2k/Spdz2kLogicalBooleanMode.java      | 13 +++++
 .../natives/Spdz2kNotBatchedProtocol.java     | 44 ++++++++++++++++
 .../Spdz2kXorKnownBatchedProtocol.java        | 52 +++++++++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 640684abe..1c14d398e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -13,9 +13,11 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorProtocol;
 import java.util.List;
@@ -66,6 +68,17 @@ public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
     return builder.append(new Spdz2kAndBatchedProtocol<>(bitsA, bitsB));
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits) {
+    return builder.append(new Spdz2kNotBatchedProtocol<>(bits));
+  }
+
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits) {
+    return builder.append(new Spdz2kXorKnownBatchedProtocol<>(knownBits, secretBits));
+  }
+
   @Override
   public DRes<SInt> xorKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
     return builder.append(new Spdz2kXorKnownProtocol<>(knownBit, secretBit));
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
new file mode 100644
index 000000000..ef68480b1
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kNotBatchedProtocol.java
@@ -0,0 +1,44 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kNotBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private final DRes<List<DRes<SInt>>> bits;
+  private List<DRes<SInt>> result;
+
+  public Spdz2kNotBatchedProtocol(DRes<List<DRes<SInt>>> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
+    List<DRes<SInt>> bitsOut = bits.out();
+    this.result = new ArrayList<>(bitsOut.size());
+    for (DRes<SInt> secretBit : bitsOut) {
+      Spdz2kSIntBoolean<PlainT> notBit = factory.toSpdz2kSIntBoolean(secretBit)
+          .xorOpen(factory.one().toBitRep(), secretSharedKey, factory.zero().toBitRep(),
+              resourcePool.getMyId() == 1);
+      result.add(notBit);
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
new file mode 100644
index 000000000..dfc8109bc
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
@@ -0,0 +1,52 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kXorKnownBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private final DRes<List<OInt>> left;
+  private final DRes<List<DRes<SInt>>> right;
+  private List<DRes<SInt>> result;
+
+  public Spdz2kXorKnownBatchedProtocol(
+      DRes<List<OInt>> left,
+      DRes<List<DRes<SInt>>> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
+    List<OInt> leftOut = left.out();
+    List<DRes<SInt>> rightOut = right.out();
+    this.result = new ArrayList<>(leftOut.size());
+    for (int i = 0; i < leftOut.size(); i++) {
+      PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();
+      DRes<SInt> secretBit = rightOut.get(i);
+      Spdz2kSIntBoolean<PlainT> xoredBit = factory.toSpdz2kSIntBoolean(secretBit)
+          .xorOpen(knownBit, secretSharedKey, factory.zero().toBitRep(),
+              resourcePool.getMyId() == 1);
+      result.add(xoredBit);
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+
+}

From b3c54e7c36079db3b8305258b828868b00d5bddd Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Thu, 17 Jan 2019 17:46:44 +0100
Subject: [PATCH 220/231] SPDZ batched not

---
 .../logical/LogicalOperationsTests.java       |  9 +++--
 .../fresco/suite/spdz/SpdzBuilder.java        |  6 +++
 .../spdz/gates/SpdzNotBatchedProtocol.java    | 39 +++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzNotBatchedProtocol.java

diff --git a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
index 0f4549404..167ac6c8e 100644
--- a/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
+++ b/core/src/test/java/dk/alexandra/fresco/lib/math/integer/logical/LogicalOperationsTests.java
@@ -269,10 +269,11 @@ public TestThread<ResourcePoolT, ProtocolBuilderNumeric> next() {
         public void test() {
           Application<List<DRes<BigInteger>>, ProtocolBuilderNumeric> app =
               root -> {
-                DRes<SInt> notOne = root.logical().not(root.numeric().known(BigInteger.ONE));
-                DRes<SInt> notZero = root.logical().not(root.numeric().known(BigInteger.ZERO));
-                List<DRes<SInt>> notted = Arrays.asList(notOne, notZero);
-                return root.collections().openList(() -> notted);
+                DRes<List<DRes<SInt>>> bits = root.numeric().knownAsDRes(
+                    Arrays.asList(BigInteger.ONE, BigInteger.ZERO)
+                );
+                DRes<List<DRes<SInt>>> notted = root.logical().batchedNot(bits);
+                return root.collections().openList(notted);
               };
           List<BigInteger> actual = runApplication(app).stream().map(DRes::out)
               .collect(Collectors.toList());
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 8f094faa0..c9e4a5976 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -27,6 +27,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzKnownSIntProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMultProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMultProtocolKnownLeft;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOrBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOutputSingleProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOutputToAllProtocol;
@@ -256,6 +257,11 @@ public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
       return builder.append(new SpdzAndBatchedProtocol(bitsA, bitsB));
     }
 
+    @Override
+    public DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits) {
+      return builder.append(new SpdzNotBatchedProtocol(bits));
+    }
+
     @Override
     public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
       // TODO same as SPDZ2k version
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzNotBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzNotBatchedProtocol.java
new file mode 100644
index 000000000..1efd776e3
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzNotBatchedProtocol.java
@@ -0,0 +1,39 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpdzNotBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>> {
+
+  private final DRes<List<DRes<SInt>>> bits;
+  private List<DRes<SInt>> result;
+
+  public SpdzNotBatchedProtocol(
+      DRes<List<DRes<SInt>>> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool resourcePool, Network network) {
+    List<DRes<SInt>> bitsOut = bits.out();
+    this.result = new ArrayList<>(bitsOut.size());
+    for (DRes<SInt> secretBit : bitsOut) {
+      SpdzSInt left =
+          SpdzKnownSIntProtocol.createKnownSpdzElement(resourcePool, BigInteger.ONE);
+      SpdzSInt right = (SpdzSInt) secretBit.out();
+      result.add(left.subtract(right));
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+}

From 63031feb4166dbf4c79d2476fea58e18950cdf4e Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Thu, 17 Jan 2019 17:59:51 +0100
Subject: [PATCH 221/231] SPDZ batched XOR

---
 .../fresco/suite/spdz/SpdzBuilder.java        |  7 +++
 .../gates/SpdzXorKnownBatchedProtocol.java    | 47 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index c9e4a5976..01a752447 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -36,6 +36,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzSubtractProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzSubtractProtocolKnownRight;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzTruncationPairProtocol;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzXorKnownBatchedProtocol;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
@@ -262,6 +263,12 @@ public DRes<List<DRes<SInt>>> batchedNot(DRes<List<DRes<SInt>>> bits) {
       return builder.append(new SpdzNotBatchedProtocol(bits));
     }
 
+    @Override
+    public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
+        DRes<List<DRes<SInt>>> secretBits) {
+      return builder.append(new SpdzXorKnownBatchedProtocol(knownBits, secretBits));
+    }
+
     @Override
     public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
       // TODO same as SPDZ2k version
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java
new file mode 100644
index 000000000..dab30f735
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java
@@ -0,0 +1,47 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.BigIntegerOInt;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpdzXorKnownBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>> {
+
+  private static final BigInteger TWO = BigInteger.valueOf(2);
+  private final DRes<List<OInt>> left;
+  private final DRes<List<DRes<SInt>>> right;
+  private List<DRes<SInt>> result;
+
+  public SpdzXorKnownBatchedProtocol(
+      DRes<List<OInt>> left, DRes<List<DRes<SInt>>> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool resourcePool, Network network) {
+    List<OInt> leftOut = left.out();
+    List<DRes<SInt>> rightOut = right.out();
+    this.result = new ArrayList<>(leftOut.size());
+    for (int i = 0; i < leftOut.size(); i++) {
+      BigInteger leftEl = ((BigIntegerOInt) leftOut.get(i)).getValue();
+      SpdzSInt rightEl = (SpdzSInt) rightOut.get(i).out();
+      SpdzSInt prod = rightEl.multiply(leftEl.multiply(TWO));
+      SpdzSInt sum = rightEl.add(
+          SpdzKnownSIntProtocol.createKnownSpdzElement(resourcePool, leftEl));
+      result.add(sum.subtract(prod));
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+}

From 12f1fcd870f38395b8c92045ec987cfaa835977f Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Thu, 17 Jan 2019 18:09:00 +0100
Subject: [PATCH 222/231] Batched known AND

---
 .../gates/SpdzAndKnownBatchedProtocol.java    | 43 ++++++++++++++++
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |  9 ++++
 .../Spdz2kAndKnownBatchedProtocol.java        | 50 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java
new file mode 100644
index 000000000..924b2463c
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java
@@ -0,0 +1,43 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.BigIntegerOInt;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpdzAndKnownBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>> {
+
+  private final DRes<List<OInt>> left;
+  private final DRes<List<DRes<SInt>>> right;
+  private List<DRes<SInt>> result;
+
+  public SpdzAndKnownBatchedProtocol(
+      DRes<List<OInt>> left, DRes<List<DRes<SInt>>> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool resourcePool, Network network) {
+    List<OInt> leftOut = left.out();
+    List<DRes<SInt>> rightOut = right.out();
+    this.result = new ArrayList<>(leftOut.size());
+    for (int i = 0; i < leftOut.size(); i++) {
+      BigInteger leftEl = ((BigIntegerOInt) leftOut.get(i)).getValue();
+      SpdzSInt rightEl = (SpdzSInt) rightOut.get(i).out();
+      result.add(rightEl.multiply(leftEl));
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index 1c14d398e..e45844480 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -11,6 +11,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.OrNeighborsComputationSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndBatchedProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
@@ -62,6 +63,14 @@ public DRes<SInt> andKnown(DRes<OInt> knownBit, DRes<SInt> secretBit) {
     return builder.append(new Spdz2kAndKnownProtocol<>(knownBit, secretBit));
   }
 
+  @Override
+  public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
+      DRes<List<DRes<SInt>>> secretBits) {
+    return builder.append(new Spdz2kAndKnownBatchedProtocol<>(knownBits, secretBits));
+  }
+
+
+
   @Override
   public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
new file mode 100644
index 000000000..104e9e610
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
@@ -0,0 +1,50 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.OInt;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kAndKnownBatchedProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<DRes<SInt>>, PlainT> {
+
+  private final DRes<List<OInt>> left;
+  private final DRes<List<DRes<SInt>>> right;
+  private List<DRes<SInt>> result;
+
+  public Spdz2kAndKnownBatchedProtocol(
+      DRes<List<OInt>> left,
+      DRes<List<DRes<SInt>>> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    List<OInt> leftOut = left.out();
+    List<DRes<SInt>> rightOut = right.out();
+    this.result = new ArrayList<>(leftOut.size());
+    for (int i = 0; i < leftOut.size(); i++) {
+      PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();
+      DRes<SInt> secretBit = rightOut.get(i);
+      Spdz2kSIntBoolean<PlainT> andedBit = factory.toSpdz2kSIntBoolean(secretBit)
+          .and(knownBit.bitValue());
+      result.add(andedBit);
+    }
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public List<DRes<SInt>> out() {
+    return result;
+  }
+
+}

From df548d5182373c0e08bda032a06026214ff8c262 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Fri, 18 Jan 2019 18:13:38 +0100
Subject: [PATCH 223/231] Various opts

---
 .../compare/zerotest/ZeroTestLogRounds.java   | 16 ++------
 .../suite/spdz/SpdzRoundSynchronization.java  | 18 +++++----
 .../spdz/gates/SpdzMacCheckProtocol.java      |  3 ++
 .../spdz/TestSpdzBasicArithmetic2Parties.java |  6 +++
 .../fresco/suite/spdz2k/Spdz2kBuilder.java    |  7 ++--
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |  2 -
 .../suite/spdz2k/Spdz2kProtocolSuite.java     |  4 +-
 .../suite/spdz2k/datatypes/CompUInt64Bit.java | 30 +++++++-------
 ...2k.java => Spdz2kMacCheckComputation.java} | 19 +++------
 .../protocols/natives/Spdz2kAddProtocol.java  | 39 +++++++++++++++++++
 .../natives/Spdz2kSubtractProtocol.java       | 38 ++++++++++++++++++
 .../Spdz2kRoundSynchronization.java           | 19 ++++++---
 12 files changed, 141 insertions(+), 60 deletions(-)
 rename suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/{MacCheckComputationSpdz2k.java => Spdz2kMacCheckComputation.java} (90%)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index 1125f3351..2d9ba7a30 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -34,26 +34,16 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       final Pair<DRes<List<DRes<SInt>>>, DRes<OInt>> bitsAndC = new Pair<>(r.getBits(), c);
       return () -> bitsAndC;
     }).seq((seq, pair) -> {
-      final List<DRes<SInt>> first = pair.getFirst().out();
       List<OInt> cbits = seq.getOIntArithmetic().toBits(pair.getSecond().out(), maxBitlength);
       // Reverse the bits of c as they are stored in big endian whereas the
       // composed r values from random bit mask will be in little endian as
       // it is based on a list of bits
       Collections.reverse(cbits);
-      return () -> new Pair<>(first, cbits);
-    }).par((par, pair) -> {
-      List<DRes<SInt>> d = new ArrayList<>(maxBitlength);
-      for (int i = 0; i < maxBitlength; i++) {
-        DRes<SInt> ri = pair.getFirst().get(i);
-        DRes<OInt> ci = pair.getSecond().get(i);
-        DRes<SInt> di = par.logical().xorKnown(ci, ri);
-        d.add(di);
-      }
-      return () -> d;
-    }).seq((seq, d) -> {
+      DRes<List<DRes<SInt>>> d = seq
+          .par(par -> par.logical().pairWiseXorKnown(() -> cbits, pair.getFirst()));
       // return 1 - OR-list(d)
       return seq.numeric().subFromOpen(seq.getOIntArithmetic().one(), seq
-          .logical().orOfList(() -> d));
+          .logical().orOfList(d));
     });
   }
 }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
index ac1dea8fa..10bb6a5d1 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
@@ -26,7 +26,7 @@ public class SpdzRoundSynchronization implements RoundSynchronization<SpdzResour
   private final int openValueThreshold;
   private final SpdzProtocolSuite spdzProtocolSuite;
   private final SecureRandom secRand;
-  private boolean isCheckRequired = false;
+  private boolean isCheckRequired;
   private final int batchSize;
 
   /**
@@ -45,6 +45,7 @@ public SpdzRoundSynchronization(SpdzProtocolSuite spdzProtocolSuite, int openVal
     this.secRand = new SecureRandom();
     this.openValueThreshold = openValueThreshold;
     this.batchSize = batchSize;
+    this.isCheckRequired = false;
   }
 
   public SpdzRoundSynchronization(SpdzProtocolSuite spdzProtocolSuite) {
@@ -74,9 +75,11 @@ protected void doMacCheck(SpdzResourcePool resourcePool, Network network) {
   public void finishedBatch(int gatesEvaluated, SpdzResourcePool resourcePool, Network network) {
     OpenedValueStore<SpdzSInt, BigInteger> store = resourcePool.getOpenedValueStore();
     if (isCheckRequired) {
+//      System.out.println("Because required finished batch");
       doMacCheck(resourcePool, network);
       isCheckRequired = false;
     } else if (store.exceedsThreshold(openValueThreshold)) {
+//      System.out.println("Because exceeds ");
       doMacCheck(resourcePool, network);
       isCheckRequired = false;
     }
@@ -86,6 +89,7 @@ public void finishedBatch(int gatesEvaluated, SpdzResourcePool resourcePool, Net
   public void finishedEval(SpdzResourcePool resourcePool, Network network) {
     OpenedValueStore<SpdzSInt, BigInteger> store = resourcePool.getOpenedValueStore();
     if (store.hasPendingValues()) {
+//      System.out.println("Because eval finished");
       doMacCheck(resourcePool, network);
     }
   }
@@ -94,15 +98,13 @@ public void finishedEval(SpdzResourcePool resourcePool, Network network) {
   public void beforeBatch(
       ProtocolCollection<SpdzResourcePool> protocols, SpdzResourcePool resourcePool,
       Network network) {
-//    isCheckRequired = StreamSupport.stream(nativeProtocols.spliterator(), false)
-//        .anyMatch(p -> p instanceof RequiresMacCheck);
-//    OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
-//    if (store.hasPendingValues() && isCheckRequired) {
-//      doMacCheck(resourcePool, network);
-    isCheckRequired = StreamSupport.stream(protocols.spliterator(), false)
+    final boolean outputFound = StreamSupport.stream(protocols.spliterator(), false)
         .anyMatch(p -> p instanceof SpdzOutputProtocol);
+//    System.out.println(outputFound);
+    this.isCheckRequired = outputFound;
     OpenedValueStore<SpdzSInt, BigInteger> store = resourcePool.getOpenedValueStore();
-    if (store.hasPendingValues() && isCheckRequired) {
+    if (store.hasPendingValues() && this.isCheckRequired) {
+//      System.out.println("Because of output");
       doMacCheck(resourcePool, network);
     }
   }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java
index ec6a2c84f..8ffeb0be1 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java
@@ -19,6 +19,7 @@
  */
 public class SpdzMacCheckProtocol implements Computation<Void, ProtocolBuilderNumeric> {
 
+  private static int COUNT = 0;
   private final SecureRandom rand;
   private final MessageDigest digest;
   private final BigInteger modulus;
@@ -53,6 +54,8 @@ public SpdzMacCheckProtocol(
 
   @Override
   public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
+//    System.out.println("SPDZ Mac Check: " + COUNT++ + " " + openedValues.size());
+
     return builder
         .seq(seq -> {
           BigInteger[] rs = sampleRandomCoefficients(openedValues.size(), jointDrbg, modulus);
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzBasicArithmetic2Parties.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzBasicArithmetic2Parties.java
index 69a78e5a2..e00bf5bdd 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzBasicArithmetic2Parties.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzBasicArithmetic2Parties.java
@@ -117,6 +117,12 @@ public void test_Lots_Of_Mults_Sequential_Batched_Different_Modulus() {
         PreprocessingStrategy.DUMMY, 2, 256, 128, 16);
   }
 
+  @Test
+  public void test_Lots_() {
+    runTest(new BasicArithmeticTests.TestLotsMult<>(),
+        PreprocessingStrategy.DUMMY, 2, 64, 32, 16);
+  }
+
   @Test
   public void testOpenWithConversionMascot() {
     runTest(new BasicArithmeticTests.TestOpenWithConversion<>(), EvaluationStrategy.SEQUENTIAL_BATCHED,
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
index 198592d64..e4105bb60 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kBuilder.java
@@ -21,6 +21,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.InputComputationSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddKnownProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAddProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kKnownSIntProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultKnownProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kMultiplyProtocol;
@@ -29,6 +30,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomBitProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kRandomElementProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kSubtractFromKnownProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kSubtractProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kTwoPartyInputProtocol;
 import java.math.BigInteger;
 
@@ -91,7 +93,7 @@ public Numeric createNumeric(ProtocolBuilderNumeric builder) {
     return new Numeric() {
       @Override
       public DRes<SInt> add(DRes<SInt> a, DRes<SInt> b) {
-        return () -> factory.toSpdz2kSIntArithmetic(a).add(factory.toSpdz2kSIntArithmetic(b));
+        return builder.append(new Spdz2kAddProtocol<>(a, b));
       }
 
       @Override
@@ -106,8 +108,7 @@ public DRes<SInt> addOpen(DRes<OInt> a, DRes<SInt> b) {
 
       @Override
       public DRes<SInt> sub(DRes<SInt> a, DRes<SInt> b) {
-        return () -> (factory.toSpdz2kSIntArithmetic(a))
-            .subtract(factory.toSpdz2kSIntArithmetic(b));
+        return builder.append(new Spdz2kSubtractProtocol<>(a, b));
       }
 
       @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index e45844480..ac1f7562f 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -69,8 +69,6 @@ public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
     return builder.append(new Spdz2kAndKnownBatchedProtocol<>(knownBits, secretBits));
   }
 
-
-
   @Override
   public DRes<List<DRes<SInt>>> pairWiseAnd(DRes<List<DRes<SInt>>> bitsA,
       DRes<List<DRes<SInt>>> bitsB) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
index 48cccedf5..60b1b273b 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kProtocolSuite.java
@@ -8,7 +8,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.MacCheckComputationSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import dk.alexandra.fresco.suite.spdz2k.synchronization.Spdz2kRoundSynchronization;
 
@@ -18,7 +18,7 @@
  * HighT} and {@link LowT}, i.e., a most significant bit portion and a least significant bit
  * portion. The least-significant bit portion is used to store the actual value (or secret-share
  * thereof) we are computing on. The most-significant bit portion is required for security and is
- * used in the mac-check protocol implemented in {@link MacCheckComputationSpdz2k}.</p>
+ * used in the mac-check protocol implemented in {@link Spdz2kMacCheckComputation}.</p>
  *
  * @param <HighT> type representing most significant bit portion of open values
  * @param <LowT> type representing least significant bit portion of open values
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
index c83027fe4..fa4c4e014 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
@@ -1,14 +1,18 @@
 package dk.alexandra.fresco.suite.spdz2k.datatypes;
 
-public class CompUInt64Bit extends CompUInt64 {
+import java.math.BigInteger;
 
-  // TODO switch to smarter representation
+public class CompUInt64Bit extends CompUInt64 {
 
   public CompUInt64Bit(int high, int bit) {
-    super((UInt.toUnLong(high) << 32) | UInt.toUnLong(bit) << 31);
+    super((UInt.toUnLong(high) << 1) | UInt.toUnLong(bit));
   }
 
   public CompUInt64Bit(long value) {
+    super(value >>> 31);
+  }
+
+  public CompUInt64Bit(long value, boolean shift) {
     super(value);
   }
 
@@ -19,17 +23,22 @@ public CompUInt64 toBitRep() {
 
   @Override
   public CompUInt64 toArithmeticRep() {
-    return new CompUInt64(value);
+    return new CompUInt64(value << 31);
+  }
+
+  @Override
+  public BigInteger toBigInteger() {
+    return toArithmeticRep().toBigInteger();
   }
 
   @Override
   public CompUInt64 multiply(CompUInt64 other) {
-    return new CompUInt64Bit(((value >>> 31) * (other.value >>> 31)) << 31);
+    return new CompUInt64Bit(value * other.value, false);
   }
 
   @Override
   public CompUInt64 add(CompUInt64 other) {
-    return new CompUInt64Bit(((value >>> 31) + (other.value >>> 31)) << 31);
+    return new CompUInt64Bit(value + other.value, false);
   }
 
   @Override
@@ -49,7 +58,7 @@ public CompUInt64 negate() {
 
   @Override
   public int bitValue() {
-    return (int) (((value & 0x80000000L)) >>> 31);
+    return (int) (value & 1L);
   }
 
   @Override
@@ -57,14 +66,9 @@ public byte[] serializeLeastSignificant() {
     return new byte[]{(byte) bitValue()};
   }
 
-  @Override
-  public CompUInt64 clearHighBits() {
-    return new CompUInt64Bit(value & 0xffffffffL);
-  }
-
   @Override
   public CompUInt64 multiplyByBit(int bitValue) {
-    return this.multiply(new CompUInt64Bit(0, bitValue));
+    return new CompUInt64Bit(value * UInt.toUnLong(bitValue), false);
   }
 
 }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
similarity index 90%
rename from suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
rename to suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
index 46937fde7..61c7e120c 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/MacCheckComputationSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
@@ -22,12 +22,14 @@
 /**
  * Computation for performing batched mac-check on all currently opened, unchecked values.
  */
-public class MacCheckComputationSpdz2k<
+public class Spdz2kMacCheckComputation<
     HighT extends UInt<HighT>,
     LowT extends UInt<LowT>,
     PlainT extends CompUInt<HighT, LowT, PlainT>>
     implements Computation<Void, ProtocolBuilderNumeric> {
 
+  private static int COUNT = 0;
+
   private final CompUIntConverter<HighT, LowT, PlainT> converter;
   private final ByteSerializer<PlainT> serializer;
   private final Spdz2kDataSupplier<PlainT> supplier;
@@ -37,20 +39,18 @@ public class MacCheckComputationSpdz2k<
   private ByteSerializer<HashBasedCommitment> commitmentSerializer;
   private final int noOfParties;
   private final Drbg localDrbg;
-  private long then;
 
   /**
-   * Creates new {@link MacCheckComputationSpdz2k}.
+   * Creates new {@link Spdz2kMacCheckComputation}.
    *
    * @param toCheck authenticated elements and open values that must be checked
    * @param resourcePool resources for running Spdz2k
    * @param converter utility class for converting between {@link HighT} and {@link PlainT}, {@link
    * LowT} and {@link PlainT}
    */
-  public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<PlainT>> toCheck,
+  public Spdz2kMacCheckComputation(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<PlainT>> toCheck,
       Spdz2kResourcePool<PlainT> resourcePool,
       CompUIntConverter<HighT, LowT, PlainT> converter) {
-    this.then = System.currentTimeMillis();
     this.authenticatedElements = toCheck.getFirst();
     this.openValues = toCheck.getSecond();
     this.converter = converter;
@@ -60,11 +60,6 @@ public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<P
         resourcePool.getRandomGenerator(),
         resourcePool.getFactory(),
         authenticatedElements.size());
-//    System.out.println("Done sampling " + (System.currentTimeMillis() - then));
-//    then = System.currentTimeMillis();
-//    if (resourcePool.getMyId() == 1) {
-//      System.out.println(authenticatedElements.size());
-//    }
     this.commitmentSerializer = resourcePool.getCommitmentSerializer();
     this.noOfParties = resourcePool.getNoOfParties();
     this.localDrbg = resourcePool.getLocalRandomGenerator();
@@ -73,9 +68,7 @@ public MacCheckComputationSpdz2k(Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<P
   @Override
   public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
     PlainT macKeyShare = supplier.getSecretSharedKey();
-    long thenthen = System.currentTimeMillis();
     PlainT y = UInt.innerProduct(openValues, randomCoefficients);
-//    System.out.println("Inner product " + (System.currentTimeMillis() - thenthen));
     Spdz2kSIntArithmetic<PlainT> r = supplier.getNextRandomElementShare();
     return builder
         .seq(seq -> {
@@ -100,8 +93,6 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
           }
           authenticatedElements.clear();
           openValues.clear();
-//          System.out.println("Done mac-check " + (System.currentTimeMillis() - then));
-          then = System.currentTimeMillis();
           return null;
         });
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddProtocol.java
new file mode 100644
index 000000000..2d8700907
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAddProtocol.java
@@ -0,0 +1,39 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+public class Spdz2kAddProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<SInt> left;
+  private final DRes<SInt> right;
+  private SInt result;
+
+  public Spdz2kAddProtocol(
+      DRes<SInt> left,
+      DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    Spdz2kSIntArithmetic<PlainT> leftVal = resourcePool.getFactory().toSpdz2kSIntArithmetic(left);
+    Spdz2kSIntArithmetic<PlainT> rightVal = resourcePool.getFactory().toSpdz2kSIntArithmetic(right);
+    result = leftVal.add(rightVal);
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public SInt out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractProtocol.java
new file mode 100644
index 000000000..e3c0815c5
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kSubtractProtocol.java
@@ -0,0 +1,38 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+
+public class Spdz2kSubtractProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<SInt> left;
+  private final DRes<SInt> right;
+  private SInt result;
+
+  public Spdz2kSubtractProtocol(
+      DRes<SInt> left,
+      DRes<SInt> right) {
+    this.left = left;
+    this.right = right;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    Spdz2kSIntArithmetic<PlainT> leftVal = resourcePool.getFactory().toSpdz2kSIntArithmetic(left);
+    Spdz2kSIntArithmetic<PlainT> rightVal = resourcePool.getFactory().toSpdz2kSIntArithmetic(right);
+    result = leftVal.subtract(rightVal);
+    return EvaluationStatus.IS_DONE;
+  }
+
+  @Override
+  public SInt out() {
+    return result;
+  }
+
+}
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index a109267ea..5ba14e8a3 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -14,7 +14,7 @@
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
-import dk.alexandra.fresco.suite.spdz2k.protocols.computations.MacCheckComputationSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.RequiresMacCheck;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
 import java.util.stream.StreamSupport;
@@ -63,7 +63,7 @@ private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network
         protocolSuite,
         batchSize);
     OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
-    MacCheckComputationSpdz2k<HighT, LowT, PlainT> macCheck = new MacCheckComputationSpdz2k<>(
+    Spdz2kMacCheckComputation<HighT, LowT, PlainT> macCheck = new Spdz2kMacCheckComputation<>(
         store.popValues(),
         resourcePool, converter);
     ProtocolBuilderNumeric sequential = builder.createSequential();
@@ -75,7 +75,12 @@ private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network
   public void finishedBatch(int gatesEvaluated, Spdz2kResourcePool<PlainT> resourcePool,
       Network network) {
     OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
-    if (isCheckRequired || store.exceedsThreshold(openValueThreshold)) {
+    if (isCheckRequired) {
+//      System.out.println("Because required finished batch");
+      doMacCheck(resourcePool, network);
+      isCheckRequired = false;
+    } else if (store.exceedsThreshold(openValueThreshold)) {
+//      System.out.println("Because exceeds ");
       doMacCheck(resourcePool, network);
       isCheckRequired = false;
     }
@@ -85,6 +90,7 @@ public void finishedBatch(int gatesEvaluated, Spdz2kResourcePool<PlainT> resourc
   public void finishedEval(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
     OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
     if (store.hasPendingValues()) {
+//      System.out.println("Because eval finished");
       doMacCheck(resourcePool, network);
     }
   }
@@ -93,10 +99,13 @@ public void finishedEval(Spdz2kResourcePool<PlainT> resourcePool, Network networ
   public void beforeBatch(
       ProtocolCollection<Spdz2kResourcePool<PlainT>> nativeProtocols,
       Spdz2kResourcePool<PlainT> resourcePool, Network network) {
-    isCheckRequired = StreamSupport.stream(nativeProtocols.spliterator(), false)
+    final boolean outputFound = StreamSupport.stream(nativeProtocols.spliterator(), false)
         .anyMatch(p -> p instanceof RequiresMacCheck);
+//    System.out.println(outputFound);
+    this.isCheckRequired = outputFound;
     OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> store = resourcePool.getOpenedValueStore();
-    if (store.hasPendingValues() && isCheckRequired) {
+    if (store.hasPendingValues() && this.isCheckRequired) {
+//      System.out.println("Because of output");
       doMacCheck(resourcePool, network);
     }
   }

From 8863b23c1bb1e3f0651cb3a10f3fe8975d9e74e6 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Fri, 18 Jan 2019 18:29:05 +0100
Subject: [PATCH 224/231] Minor

---
 .../fresco/suite/spdz2k/datatypes/CompUInt64.java      |  2 +-
 .../fresco/suite/spdz2k/datatypes/CompUInt64Bit.java   | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
index 7fc9b98d7..543529fac 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64.java
@@ -81,7 +81,7 @@ public CompUInt64 clearHighBits() {
 
   @Override
   public CompUInt64 toBitRep() {
-    return new CompUInt64Bit(value << 31);
+    return new CompUInt64Bit(value);
   }
 
   @Override
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
index fa4c4e014..d4eade320 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/datatypes/CompUInt64Bit.java
@@ -9,10 +9,6 @@ public CompUInt64Bit(int high, int bit) {
   }
 
   public CompUInt64Bit(long value) {
-    super(value >>> 31);
-  }
-
-  public CompUInt64Bit(long value, boolean shift) {
     super(value);
   }
 
@@ -33,12 +29,12 @@ public BigInteger toBigInteger() {
 
   @Override
   public CompUInt64 multiply(CompUInt64 other) {
-    return new CompUInt64Bit(value * other.value, false);
+    return new CompUInt64Bit(value * other.value);
   }
 
   @Override
   public CompUInt64 add(CompUInt64 other) {
-    return new CompUInt64Bit(value + other.value, false);
+    return new CompUInt64Bit(value + other.value);
   }
 
   @Override
@@ -68,7 +64,7 @@ public byte[] serializeLeastSignificant() {
 
   @Override
   public CompUInt64 multiplyByBit(int bitValue) {
-    return new CompUInt64Bit(value * UInt.toUnLong(bitValue), false);
+    return new CompUInt64Bit(value * UInt.toUnLong(bitValue));
   }
 
 }

From 9b94a093eed710a98dacf363ed701fe7a9a3921a Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Mon, 21 Jan 2019 11:01:23 +0100
Subject: [PATCH 225/231] Fix bit length errors

---
 .../fresco/lib/compare/lt/LessThanOrEquals.java    | 14 +++++++++-----
 .../lib/compare/zerotest/ZeroTestLogRounds.java    |  3 ++-
 .../alexandra/fresco/suite/spdz/SpdzBuilder.java   |  7 +++++++
 .../suite/spdz/gates/SpdzAndBatchedProtocol.java   |  3 +++
 .../spdz/gates/SpdzAndKnownBatchedProtocol.java    |  3 +++
 .../suite/spdz/gates/SpdzOrBatchedProtocol.java    |  3 +++
 .../spdz/gates/SpdzXorKnownBatchedProtocol.java    |  3 +++
 .../natives/Spdz2kAndBatchedProtocol.java          |  3 +++
 .../natives/Spdz2kAndKnownBatchedProtocol.java     |  3 +++
 .../protocols/natives/Spdz2kOrBatchedProtocol.java |  3 +++
 .../natives/Spdz2kXorKnownBatchedProtocol.java     |  3 +++
 11 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
index 812080118..885d75bef 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/lt/LessThanOrEquals.java
@@ -3,6 +3,7 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.Computation;
 import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.Comparison.Algorithm;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
 import dk.alexandra.fresco.framework.util.Pair;
@@ -12,6 +13,7 @@
 import java.util.List;
 
 public class LessThanOrEquals implements Computation<SInt, ProtocolBuilderNumeric> {
+
   // params etc
   private final int bitLength;
   private final DRes<SInt> x;
@@ -45,7 +47,8 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           List<DRes<SInt>> rBottomBits = bits.subList(0, bitLengthBottom);
           List<BigInteger> twoPowsBottom =
               seq.getBigIntegerHelper().getTwoPowersList(bitLengthBottom);
-          return Pair.lazy(mask.random, seq.advancedNumeric().innerProductWithPublicPart(twoPowsBottom, rBottomBits));
+          return Pair.lazy(mask.random,
+              seq.advancedNumeric().innerProductWithPublicPart(twoPowsBottom, rBottomBits));
         }, (seq, mask) -> {
           List<DRes<SInt>> rTopBits =
               mask.bits.subList(bitLengthBottom, bitLengthBottom + bitLengthTop);
@@ -75,7 +78,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           DRes<SInt> mS = numeric.add(z, () -> r);
           DRes<BigInteger> mO = seq.numeric().open(mS);
 
-          return () -> new Object[] {mO, rBottom, rTop, rBar, z};
+          return () -> new Object[]{mO, rBottom, rTop, rBar, z};
         }).seq((ProtocolBuilderNumeric seq, Object[] input) -> {
           BigInteger mO = ((DRes<BigInteger>) input[0]).out();
           DRes<SInt> rBottom = (DRes<SInt>) input[1];
@@ -94,8 +97,9 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           DRes<SInt> dif = numeric.sub(mTop, rTop);
 
           // eqResult <- execute eq.test
-          DRes<SInt> eqResult = seq.comparison().compareZero(dif, bitLengthTop);
-          return () -> new Object[] {eqResult, rBottom, rTop, mBot, mTop, mBar, rBar, z};
+          DRes<SInt> eqResult = seq.comparison()
+              .compareZero(dif, bitLengthTop, Algorithm.CONST_ROUNDS);
+          return () -> new Object[]{eqResult, rBottom, rTop, mBot, mTop, mBar, rBar, z};
         }).seq((ProtocolBuilderNumeric seq, Object[] input) -> {
           DRes<SInt> eqResult = (DRes<SInt>) input[0];
           DRes<SInt> rBottom = (DRes<SInt>) input[1];
@@ -132,7 +136,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
             subComparisonResult =
                 seq.seq(new LessThanOrEquals(nextBitLength, rPrime, mPrime));
           }
-          return () -> new Object[] {subComparisonResult, mBar, rBar, z};
+          return () -> new Object[]{subComparisonResult, mBar, rBar, z};
         }).seq((ProtocolBuilderNumeric seq, Object[] input) -> {
           DRes<SInt> subComparisonResult = (DRes<SInt>) input[0];
           BigInteger mBar = (BigInteger) input[1];
diff --git a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
index 2d9ba7a30..a9546e30d 100644
--- a/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
+++ b/core/src/main/java/dk/alexandra/fresco/lib/compare/zerotest/ZeroTestLogRounds.java
@@ -39,8 +39,9 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
       // composed r values from random bit mask will be in little endian as
       // it is based on a list of bits
       Collections.reverse(cbits);
+      List<DRes<SInt>> secretBits = pair.getFirst().out().subList(0, maxBitlength);
       DRes<List<DRes<SInt>>> d = seq
-          .par(par -> par.logical().pairWiseXorKnown(() -> cbits, pair.getFirst()));
+          .par(par -> par.logical().pairWiseXorKnown(() -> cbits, () -> secretBits));
       // return 1 - OR-list(d)
       return seq.numeric().subFromOpen(seq.getOIntArithmetic().one(), seq
           .logical().orOfList(d));
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 01a752447..0466bee28 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -22,6 +22,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAndBatchedProtocol;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzAndKnownBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputTwoPartyProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzKnownSIntProtocol;
@@ -269,6 +270,12 @@ public DRes<List<DRes<SInt>>> pairWiseXorKnown(DRes<List<OInt>> knownBits,
       return builder.append(new SpdzXorKnownBatchedProtocol(knownBits, secretBits));
     }
 
+    @Override
+    public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
+        DRes<List<DRes<SInt>>> secretBits) {
+      return builder.append(new SpdzAndKnownBatchedProtocol(knownBits, secretBits));
+    }
+
     @Override
     public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
       // TODO same as SPDZ2k version
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
index 2d037de8a..b5125b411 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
@@ -34,6 +34,9 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
     ByteSerializer<BigInteger> serializer = spdzResourcePool.getSerializer();
     final List<DRes<SInt>> leftFactors = leftDef.out();
     final List<DRes<SInt>> rightFactors = rightDef.out();
+    if (leftFactors.size() != rightFactors.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     if (round == 0) {
       triples = new ArrayList<>(leftFactors.size());
       epsilons = new ArrayList<>(leftFactors.size());
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java
index 924b2463c..7fe93b764 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndKnownBatchedProtocol.java
@@ -27,6 +27,9 @@ public SpdzAndKnownBatchedProtocol(
   public EvaluationStatus evaluate(int round, SpdzResourcePool resourcePool, Network network) {
     List<OInt> leftOut = left.out();
     List<DRes<SInt>> rightOut = right.out();
+    if (leftOut.size() != rightOut.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     this.result = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       BigInteger leftEl = ((BigIntegerOInt) leftOut.get(i)).getValue();
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
index 7493f8593..a3389109f 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
@@ -41,6 +41,9 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
     ByteSerializer<BigInteger> serializer = spdzResourcePool.getSerializer();
     final List<DRes<SInt>> leftFactors = leftDef.out();
     final List<DRes<SInt>> rightFactors = rightDef.out();
+    if (leftFactors.size() != rightFactors.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     if (round == 0) {
       triples = new ArrayList<>(leftFactors.size());
       epsilons = new ArrayList<>(leftFactors.size());
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java
index dab30f735..c8e2587c6 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzXorKnownBatchedProtocol.java
@@ -28,6 +28,9 @@ public SpdzXorKnownBatchedProtocol(
   public EvaluationStatus evaluate(int round, SpdzResourcePool resourcePool, Network network) {
     List<OInt> leftOut = left.out();
     List<DRes<SInt>> rightOut = right.out();
+    if (leftOut.size() != rightOut.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     this.result = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       BigInteger leftEl = ((BigIntegerOInt) leftOut.get(i)).getValue();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
index 67e424c87..66162cfad 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndBatchedProtocol.java
@@ -42,6 +42,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     List<DRes<SInt>> bitsA = bitsADef.out();
     List<DRes<SInt>> bitsB = bitsBDef.out();
+    if (bitsA.size() != bitsB.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     if (round == 0) {
       triples = new ArrayList<>(bitsA.size());
       epsilons = new ArrayList<>(bitsA.size());
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
index 104e9e610..f6316b973 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kAndKnownBatchedProtocol.java
@@ -31,6 +31,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     List<OInt> leftOut = left.out();
     List<DRes<SInt>> rightOut = right.out();
+    if (leftOut.size() != rightOut.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     this.result = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
index 7bea7e80a..577f52930 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrBatchedProtocol.java
@@ -48,6 +48,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
     List<DRes<SInt>> bitsA = bitsADef.out();
     List<DRes<SInt>> bitsB = bitsBDef.out();
+    if (bitsA.size() != bitsB.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     if (round == 0) {
       triples = new ArrayList<>(bitsA.size());
       epsilons = new ArrayList<>(bitsA.size());
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
index dfc8109bc..fdf19c2b9 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kXorKnownBatchedProtocol.java
@@ -32,6 +32,9 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
     PlainT secretSharedKey = resourcePool.getDataSupplier().getSecretSharedKey();
     List<OInt> leftOut = left.out();
     List<DRes<SInt>> rightOut = right.out();
+    if (leftOut.size() != rightOut.size()) {
+      throw new IllegalArgumentException("Lists must be same size");
+    }
     this.result = new ArrayList<>(leftOut.size());
     for (int i = 0; i < leftOut.size(); i++) {
       PlainT knownBit = factory.fromOInt(leftOut.get(i)).toBitRep();

From 2a51522b27d7e4c3869349a64bc575bb0ebd5179 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Mon, 21 Jan 2019 13:38:03 +0100
Subject: [PATCH 226/231] SPDZ carry

---
 .../fresco/suite/spdz/SpdzBuilder.java        |  23 ++
 .../suite/spdz/gates/SpdzCarryProtocol.java   | 151 +++++++++++++
 .../fresco/suite/spdz/TestSpdzComparison.java |  37 +++
 .../suite/spdz/TestSpdzDEASolver2Parties.java |   2 +
 .../fresco/suite/spdz2k/Spdz2kComparison.java |   7 +
 .../natives/Spdz2kCarryProtocol.java          | 213 ++++++++++++++++++
 6 files changed, 433 insertions(+)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 0466bee28..42ee59a6c 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -3,13 +3,16 @@
 import dk.alexandra.fresco.framework.DRes;
 import dk.alexandra.fresco.framework.builder.numeric.AdvancedNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.Comparison;
 import dk.alexandra.fresco.framework.builder.numeric.Conversion;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultAdvancedNumeric;
+import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultLogical;
 import dk.alexandra.fresco.framework.builder.numeric.Logical;
 import dk.alexandra.fresco.framework.builder.numeric.Numeric;
 import dk.alexandra.fresco.framework.builder.numeric.PreprocessedValues;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntArithmetic;
 import dk.alexandra.fresco.framework.value.BigIntegerOIntFactory;
 import dk.alexandra.fresco.framework.value.OInt;
@@ -23,6 +26,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAddProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAndBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzAndKnownBatchedProtocol;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzCarryProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzInputTwoPartyProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzKnownSIntProtocol;
@@ -79,6 +83,11 @@ public PreprocessedValues createPreprocessedValues(ProtocolBuilderNumeric protoc
     };
   }
 
+  @Override
+  public Comparison createComparison(ProtocolBuilderNumeric builder) {
+    return new SpdzComparison(this, builder);
+  }
+
   @Override
   public AdvancedNumeric createAdvancedNumeric(ProtocolBuilderNumeric builder) {
     return new SpdzAdvancedNumeric(this, builder);
@@ -240,6 +249,20 @@ public OIntArithmetic getOIntArithmetic() {
     return oIntArithmetic;
   }
 
+  class SpdzComparison extends DefaultComparison {
+
+    public SpdzComparison(
+        BuilderFactoryNumeric factoryNumeric,
+        ProtocolBuilderNumeric builder) {
+      super(factoryNumeric, builder);
+    }
+
+    @Override
+    public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
+      return builder.append(new SpdzCarryProtocol(bitPairs));
+    }
+  }
+
   class SpdzLogical extends DefaultLogical {
 
     protected SpdzLogical(
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java
new file mode 100644
index 000000000..2360475e9
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java
@@ -0,0 +1,151 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzTriple;
+import dk.alexandra.fresco.suite.spdz.storage.SpdzDataSupplier;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpdzCarryProtocol extends SpdzNativeProtocol<List<SIntPair>> {
+
+  private final List<SIntPair> bits;
+  private List<SpdzTriple> triples;
+  private List<SpdzSInt> epsilons;
+  private List<SpdzSInt> deltas;
+  private List<BigInteger> openEpsilons;
+  private List<BigInteger> openDeltas;
+  private List<SIntPair> carried;
+
+  public SpdzCarryProtocol(List<SIntPair> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool, Network network) {
+    SpdzDataSupplier dataSupplier = spdzResourcePool.getDataSupplier();
+    int noOfPlayers = spdzResourcePool.getNoOfParties();
+    ByteSerializer<BigInteger> serializer = spdzResourcePool.getSerializer();
+    if (round == 0) {
+      triples = new ArrayList<>(bits.size());
+      epsilons = new ArrayList<>(bits.size());
+      deltas = new ArrayList<>(bits.size());
+      openEpsilons = new ArrayList<>(bits.size());
+      openDeltas = new ArrayList<>(bits.size());
+      carried = new ArrayList<>(bits.size() / 2);
+
+      for (int i = 0; i < bits.size() / 2; i++) {
+        // two multiplications
+        triples.add(spdzResourcePool.getDataSupplier().getNextTriple());
+        triples.add(spdzResourcePool.getDataSupplier().getNextTriple());
+
+        SIntPair left = bits.get(2 * i + 1);
+        SIntPair right = bits.get(2 * i);
+
+        SpdzTriple p1p2Triple = triples.get(2 * i + 1);
+        SpdzTriple p2g1Triple = triples.get(2 * i);
+
+        SpdzSInt p1 = (SpdzSInt) left.getFirst().out();
+        SpdzSInt g1 = (SpdzSInt) left.getSecond().out();
+        SpdzSInt p2 = (SpdzSInt) right.getFirst().out();
+
+        // p2 * g1
+        final SpdzSInt epsilonP2G1 = p2.subtract(p2g1Triple.getA());
+        epsilons.add(epsilonP2G1);
+        final SpdzSInt deltaP2G1 = g1.subtract(p2g1Triple.getB());
+        deltas.add(deltaP2G1);
+        network.sendToAll(serializer.serialize(epsilonP2G1.getShare()));
+        network.sendToAll(serializer.serialize(deltaP2G1.getShare()));
+
+        // p1 * p2
+        final SpdzSInt epsilonP1P2 = p1.subtract(p1p2Triple.getA());
+        epsilons.add(epsilonP1P2);
+        final SpdzSInt deltaP1P2 = p2.subtract(p1p2Triple.getB());
+        deltas.add(deltaP1P2);
+        network.sendToAll(serializer.serialize(epsilonP1P2.getShare()));
+        network.sendToAll(serializer.serialize(deltaP1P2.getShare()));
+      }
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      OpenedValueStore<SpdzSInt, BigInteger> openedValueStore = spdzResourcePool
+          .getOpenedValueStore();
+      receiveAndReconstruct(network, serializer, noOfPlayers, spdzResourcePool.getModulus());
+      for (int i = 0; i < bits.size() / 2; i++) {
+        SpdzTriple p1p2Triple = triples.get(2 * i + 1);
+        SpdzTriple p2g1Triple = triples.get(2 * i);
+
+        BigInteger p1p2E = openEpsilons.get(2 * i + 1);
+        openedValueStore.pushOpenedValue(epsilons.get(2 * i + 1), p1p2E);
+        BigInteger p2g1E = openEpsilons.get(2 * i);
+        openedValueStore.pushOpenedValue(epsilons.get(2 * i), p2g1E);
+
+        BigInteger p1p2D = openDeltas.get(2 * i + 1);
+        openedValueStore.pushOpenedValue(deltas.get(2 * i + 1), p1p2D);
+        BigInteger p2g1D = openDeltas.get(2 * i);
+        openedValueStore.pushOpenedValue(deltas.get(2 * i), p2g1D);
+
+        SpdzSInt p = computeProduct(spdzResourcePool.getMyId(), p1p2E, p1p2D,
+            spdzResourcePool.getModulus(), p1p2Triple, dataSupplier.getSecretSharedKey());
+
+        SpdzSInt g2 = (SpdzSInt) bits.get(2 * i).getSecond().out();
+
+        SpdzSInt g = computeProduct(spdzResourcePool.getMyId(), p2g1E, p2g1D,
+            spdzResourcePool.getModulus(), p2g1Triple, dataSupplier.getSecretSharedKey())
+            .add(g2);
+        carried.add(new SIntPair(p, g));
+      }
+      // if we have an odd number of elements the last pair can just be taken directly from the input
+      if (bits.size() % 2 != 0) {
+        carried.add(bits.get(bits.size() - 1));
+      }
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  private SpdzSInt computeProduct(int myId, BigInteger e, BigInteger d, BigInteger modulus,
+      SpdzTriple triple, BigInteger key) {
+    BigInteger product = e.multiply(d).mod(modulus);
+    SpdzSInt ed = new SpdzSInt(
+        product,
+        key.multiply(product).mod(modulus),
+        modulus);
+    SpdzSInt res = triple.getC();
+    return res.add(triple.getB().multiply(e))
+        .add(triple.getA().multiply(d))
+        .add(ed, myId);
+  }
+
+  private void receiveAndReconstruct(Network network, ByteSerializer<BigInteger> serializer,
+      int noOfParties, BigInteger modulus) {
+    for (int i = 0; i < epsilons.size(); i++) {
+      BigInteger[] epsilonShares = new BigInteger[noOfParties];
+      BigInteger[] deltaShares = new BigInteger[noOfParties];
+      for (int p = 0; p < noOfParties; p++) {
+        epsilonShares[p] = serializer.deserialize(network.receive(p + 1));
+        deltaShares[p] = serializer.deserialize(network.receive(p + 1));
+      }
+
+      BigInteger e = epsilonShares[0];
+      BigInteger d = deltaShares[0];
+      for (int p = 1; p < epsilonShares.length; p++) {
+        e = e.add(epsilonShares[p]);
+        d = d.add(deltaShares[p]);
+      }
+      e = e.mod(modulus);
+      d = d.mod(modulus);
+
+      openEpsilons.add(e);
+      openDeltas.add(d);
+    }
+  }
+
+  @Override
+  public List<SIntPair> out() {
+    return carried;
+  }
+}
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
index cef58f3bd..3eef31fbf 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzComparison.java
@@ -5,9 +5,14 @@
 import dk.alexandra.fresco.framework.sce.resources.storage.InMemoryStorage;
 import dk.alexandra.fresco.lib.compare.CompareTests;
 import dk.alexandra.fresco.lib.compare.CompareTests.TestLessThanLogRounds;
+import dk.alexandra.fresco.lib.compare.lt.CarryOutTests;
+import dk.alexandra.fresco.lib.compare.lt.CarryOutTests.TestCarryOut;
+import dk.alexandra.fresco.lib.compare.lt.PreCarryTests.TestPreCarryBits;
 import dk.alexandra.fresco.lib.list.EliminateDuplicatesTests.TestFindDuplicatesOne;
+import dk.alexandra.fresco.suite.dummy.arithmetic.AbstractDummyArithmeticTest.TestParameters;
 import dk.alexandra.fresco.suite.spdz.configuration.PreprocessingStrategy;
 import dk.alexandra.fresco.suite.spdz.storage.InitializeStorage;
+import java.util.Random;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -26,6 +31,38 @@ public void test_compareLTEdge_Sequential() {
         PreprocessingStrategy.DUMMY, 2);
   }
 
+  @Test
+  public void testPreCarry() {
+    runTest(new TestPreCarryBits<>(),
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testCarryOutZero() {
+    runTest(new TestCarryOut<>(0x00000000, 0x00000000), PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testCarryOutOne() {
+    runTest(new TestCarryOut<>(0x80000000, 0x80000000), PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testCarryOutAllOnes() {
+    runTest(new TestCarryOut<>(0xffffffff, 0xffffffff), PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testCarryOutOneFromCarry() {
+    runTest(new TestCarryOut<>(0x40000000, 0xc0000000), PreprocessingStrategy.DUMMY, 2);
+  }
+
+  @Test
+  public void testCarryOutRandom() {
+    runTest(new TestCarryOut<>(new Random(42).nextInt(), new Random(1).nextInt()),
+        PreprocessingStrategy.DUMMY, 2);
+  }
+
   @Test
   @Ignore("This is not tested on windows and does not work here")
   public void test_compareLT_Sequential_static() throws Exception {
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzDEASolver2Parties.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzDEASolver2Parties.java
index 64870d65e..71949445a 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzDEASolver2Parties.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/TestSpdzDEASolver2Parties.java
@@ -7,12 +7,14 @@
 import dk.alexandra.fresco.lib.statistics.DeaSolverTests.TestDeaFixed2;
 import dk.alexandra.fresco.suite.spdz.configuration.PreprocessingStrategy;
 import java.util.Random;
+import org.junit.Ignore;
 import org.junit.Test;
 
 
 /**
  * Tests for the DEASolver.
  */
+@Ignore
 public class TestSpdzDEASolver2Parties extends AbstractSpdzTest {
 
   @Test
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
index 7afc1ba45..186b4de74 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kComparison.java
@@ -4,12 +4,14 @@
 import dk.alexandra.fresco.framework.builder.numeric.BuilderFactoryNumeric;
 import dk.alexandra.fresco.framework.builder.numeric.DefaultComparison;
 import dk.alexandra.fresco.framework.builder.numeric.ProtocolBuilderNumeric;
+import dk.alexandra.fresco.framework.util.SIntPair;
 import dk.alexandra.fresco.framework.value.OInt;
 import dk.alexandra.fresco.framework.value.SInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.eq.ZeroTestSpdz2k;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.lt.MostSignBitSpdz2k;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kCarryProtocol;
 import java.util.List;
 
 /**
@@ -62,6 +64,11 @@ public DRes<SInt> equals(DRes<SInt> x, DRes<SInt> y, int bitlength, Algorithm al
     return compareZero(builder.numeric().sub(x, y), bitlength, algorithm);
   }
 
+  @Override
+  public DRes<List<SIntPair>> carry(List<SIntPair> bitPairs) {
+    return builder.append(new Spdz2kCarryProtocol<>(bitPairs));
+  }
+
   protected CompUIntFactory<PlainT> getFactory() {
     return factory;
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
new file mode 100644
index 000000000..713b7d657
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kCarryProtocol.java
@@ -0,0 +1,213 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.util.SIntPair;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kCarryProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<List<SIntPair>, PlainT> {
+
+  private final List<SIntPair> bits;
+  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
+  private List<Spdz2kSIntBoolean<PlainT>> epsilons;
+  private List<Spdz2kSIntBoolean<PlainT>> deltas;
+  private List<PlainT> openEpsilons;
+  private List<PlainT> openDeltas;
+  private List<SIntPair> carried;
+
+  public Spdz2kCarryProtocol(List<SIntPair> bits) {
+    this.bits = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    if (round == 0) {
+      triples = new ArrayList<>(bits.size());
+      epsilons = new ArrayList<>(bits.size());
+      deltas = new ArrayList<>(bits.size());
+      openEpsilons = new ArrayList<>(bits.size());
+      openDeltas = new ArrayList<>(bits.size());
+      carried = new ArrayList<>(bits.size() / 2);
+
+      for (int i = 0; i < bits.size() / 2; i++) {
+        // two multiplications
+        triples.add(resourcePool.getDataSupplier().getNextBitTripleShares());
+        triples.add(resourcePool.getDataSupplier().getNextBitTripleShares());
+
+        SIntPair left = bits.get(2 * i + 1);
+        SIntPair right = bits.get(2 * i);
+
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p1p2Triple = triples.get(2 * i + 1);
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p2g1Triple = triples.get(2 * i);
+
+        Spdz2kSIntBoolean<PlainT> p1 = factory.toSpdz2kSIntBoolean(left.getFirst());
+        Spdz2kSIntBoolean<PlainT> g1 = factory.toSpdz2kSIntBoolean(left.getSecond());
+        Spdz2kSIntBoolean<PlainT> p2 = factory.toSpdz2kSIntBoolean(right.getFirst());
+
+        // p2 * g1
+        epsilons.add(factory.toSpdz2kSIntBoolean(p2).xor(p2g1Triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(g1).xor(p2g1Triple.getRight()));
+
+        // p1 * p2
+        epsilons.add(factory.toSpdz2kSIntBoolean(p1).xor(p1p2Triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(p2).xor(p1p2Triple.getRight()));
+      }
+
+      serializeAndSend(network, epsilons, deltas);
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
+
+      OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
+          .getOpenedValueStore();
+
+      for (int i = 0; i < bits.size() / 2; i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p1p2Triple = triples.get(2 * i + 1);
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> p2g1Triple = triples.get(2 * i);
+
+        PlainT p1p2E = openEpsilons.get(2 * i + 1);
+        openedValueStore.pushOpenedValue(
+            epsilons.get(2 * i + 1).asArithmetic(),
+            p1p2E.toArithmeticRep()
+        );
+        PlainT p2g1E = openEpsilons.get(2 * i);
+        openedValueStore.pushOpenedValue(
+            epsilons.get(2 * i).asArithmetic(),
+            p2g1E.toArithmeticRep()
+        );
+
+        PlainT p1p2D = openDeltas.get(2 * i + 1);
+        openedValueStore.pushOpenedValue(
+            deltas.get(2 * i + 1).asArithmetic(),
+            p1p2D.toArithmeticRep()
+        );
+        PlainT p2g1D = openDeltas.get(2 * i);
+        openedValueStore.pushOpenedValue(
+            deltas.get(2 * i).asArithmetic(),
+            p2g1D.toArithmeticRep()
+        );
+        Spdz2kSIntBoolean<PlainT> p = andAfterReceive(p1p2E, p1p2D, p1p2Triple, macKeyShare,
+            factory,
+            resourcePool.getMyId());
+
+        Spdz2kSIntBoolean<PlainT> g2 = factory.toSpdz2kSIntBoolean(bits.get(2 * i).getSecond());
+
+        Spdz2kSIntBoolean<PlainT> g = andAfterReceive(p2g1E, p2g1D, p2g1Triple, macKeyShare,
+            factory,
+            resourcePool.getMyId()).xor(g2);
+        carried.add(new SIntPair(p, g));
+      }
+      // if we have an odd number of elements the last pair can just be taken directly from the input
+      if (bits.size() % 2 != 0) {
+        carried.add(bits.get(bits.size() - 1));
+      }
+      return EvaluationStatus.IS_DONE;
+    }
+  }
+
+  private Spdz2kSIntBoolean<PlainT> andAfterReceive(
+      PlainT e,
+      PlainT d,
+      Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,
+      PlainT macKeyShare,
+      CompUIntFactory<PlainT> factory,
+      int myId) {
+    int eBit = e.bitValue();
+    int dBit = d.bitValue();
+    PlainT ed = e.multiply(d);
+    // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+    Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+    Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+    Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+    return tripleProduct
+        .xor(tripleRight.and(eBit))
+        .xor(tripleLeft.and(dBit))
+        .xorOpen(ed,
+            macKeyShare,
+            factory.zero().toBitRep(),
+            myId == 1);
+  }
+
+  /**
+   * Retrieves shares for epsilons and deltas and reconstructs each.
+   */
+  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory,
+      int noOfParties) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+
+    for (int i = 0; i < epsilons.size(); i++) {
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+      PlainT e = factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte));
+      openEpsilons.add(e);
+      PlainT d = factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte));
+      openDeltas.add(d);
+    }
+
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      for (int j = 0; j < epsilons.size(); j++) {
+        int currentByteIdx = j / Byte.SIZE;
+        int bitIndexWithinByte = j % Byte.SIZE;
+        openEpsilons.set(j, openEpsilons.get(j).add(
+            factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+        openDeltas.set(j, openDeltas.get(j).add(
+            factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+      }
+    }
+  }
+
+  /**
+   * Serializes and sends epsilon and delta values.
+   */
+  private void serializeAndSend(Network network,
+      List<Spdz2kSIntBoolean<PlainT>> epsilons,
+      List<Spdz2kSIntBoolean<PlainT>> deltas) {
+    int numBytes = epsilons.size() / Byte.SIZE;
+    if (epsilons.size() % 8 != 0) {
+      numBytes++;
+    }
+    byte[] epsilonBytes = new byte[numBytes];
+    byte[] deltaBytes = new byte[numBytes];
+
+    for (int i = 0; i < epsilons.size(); i++) {
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+
+      int serializedEpsilon = epsilons.get(i).getShare().bitValue();
+      epsilonBytes[currentByteIdx] |= ((serializedEpsilon << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+
+      int serializedDelta = deltas
+          .get(i)
+          .getShare()
+          .bitValue();
+      deltaBytes[currentByteIdx] |= ((serializedDelta << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+    }
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  @Override
+  public List<SIntPair> out() {
+    return carried;
+  }
+
+}

From 667c10891ba93b0a2d090585122405ccfda4fdc1 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Mon, 21 Jan 2019 15:03:43 +0100
Subject: [PATCH 227/231] Improved serialization SPDZ

---
 .../spdz/gates/SpdzAndBatchedProtocol.java    | 92 ++++++++++++-------
 .../suite/spdz/gates/SpdzCarryProtocol.java   | 63 ++++++-------
 2 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
index b5125b411..d506bf9c6 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzAndBatchedProtocol.java
@@ -11,6 +11,7 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class SpdzAndBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>> {
 
@@ -19,6 +20,8 @@ public class SpdzAndBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>>
   private List<SpdzTriple> triples;
   private List<SpdzSInt> epsilons;
   private List<SpdzSInt> deltas;
+  private List<BigInteger> openEpsilons;
+  private List<BigInteger> openDeltas;
   private List<DRes<SInt>> products;
 
   public SpdzAndBatchedProtocol(DRes<List<DRes<SInt>>> left, DRes<List<DRes<SInt>>> right) {
@@ -41,6 +44,8 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
       triples = new ArrayList<>(leftFactors.size());
       epsilons = new ArrayList<>(leftFactors.size());
       deltas = new ArrayList<>(leftFactors.size());
+      openEpsilons = new ArrayList<>(leftFactors.size());
+      openDeltas = new ArrayList<>(leftFactors.size());
       products = new ArrayList<>(leftFactors.size());
 
       for (int i = 0; i < leftFactors.size(); i++) {
@@ -54,42 +59,20 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
         SpdzSInt delta = right.subtract(triple.getB());
         epsilons.add(epsilon);
         deltas.add(delta);
-
-        network.sendToAll(serializer.serialize(epsilon.getShare()));
-        network.sendToAll(serializer.serialize(delta.getShare()));
       }
 
+      serializeAndSend(network, serializer);
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
+      BigInteger modulus = spdzResourcePool.getModulus();
+      receiveAndReconstruct(network, serializer, noOfPlayers, modulus);
       for (int i = 0; i < leftFactors.size(); i++) {
-        BigInteger[] epsilonShares = new BigInteger[noOfPlayers];
-        BigInteger[] deltaShares = new BigInteger[noOfPlayers];
-        for (int p = 0; p < noOfPlayers; p++) {
-          epsilonShares[p] = serializer.deserialize(network.receive(p + 1));
-          deltaShares[p] = serializer.deserialize(network.receive(p + 1));
-        }
-
-        BigInteger e = epsilonShares[0];
-        BigInteger d = deltaShares[0];
-        for (int p = 1; p < epsilonShares.length; p++) {
-          e = e.add(epsilonShares[p]);
-          d = d.add(deltaShares[p]);
-        }
-        BigInteger modulus = spdzResourcePool.getModulus();
-        e = e.mod(modulus);
-        d = d.mod(modulus);
-
-        BigInteger product = e.multiply(d).mod(modulus);
-        SpdzSInt ed = new SpdzSInt(
-            product,
-            dataSupplier.getSecretSharedKey().multiply(product).mod(modulus),
-            modulus);
-        SpdzTriple triple = triples.get(i);
-        SpdzSInt res = triple.getC();
-        SpdzSInt prod = res.add(triple.getB().multiply(e))
-            .add(triple.getA().multiply(d))
-            .add(ed, spdzResourcePool.getMyId());
-        products.add(prod);
+        BigInteger e = openEpsilons.get(i);
+        BigInteger d = openDeltas.get(i);
+
+        SpdzSInt product = computeProduct(spdzResourcePool.getMyId(),
+            e, d, modulus, triples.get(i), dataSupplier.getSecretSharedKey());
+        products.add(product);
         // Set the opened and closed value.
         spdzResourcePool.getOpenedValueStore().pushOpenedValue(epsilons.get(i), e);
         spdzResourcePool.getOpenedValueStore().pushOpenedValue(deltas.get(i), d);
@@ -98,6 +81,53 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
     }
   }
 
+  static SpdzSInt computeProduct(int myId, BigInteger e, BigInteger d, BigInteger modulus,
+      SpdzTriple triple, BigInteger key) {
+    BigInteger product = e.multiply(d).mod(modulus);
+    SpdzSInt ed = new SpdzSInt(
+        product,
+        key.multiply(product).mod(modulus),
+        modulus);
+    SpdzSInt res = triple.getC();
+    return res.add(triple.getB().multiply(e))
+        .add(triple.getA().multiply(d))
+        .add(ed, myId);
+  }
+
+  private void serializeAndSend(Network network, ByteSerializer<BigInteger> serializer) {
+    byte[] epsilonBytes = serializer.serialize(
+        epsilons.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    byte[] deltaBytes = serializer.serialize(
+        deltas.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  private void receiveAndReconstruct(Network network, ByteSerializer<BigInteger> serializer,
+      int noOfParties, BigInteger modulus) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+    openEpsilons = serializer.deserializeList(rawEpsilons);
+    openDeltas = serializer.deserializeList(rawDeltas);
+
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      List<BigInteger> innerEpsilons = serializer.deserializeList(rawEpsilons);
+      List<BigInteger> innerDeltas = serializer.deserializeList(rawDeltas);
+      for (int j = 0; j < epsilons.size(); j++) {
+        openEpsilons.set(j, openEpsilons.get(j).add(innerEpsilons.get(j)));
+        openDeltas.set(j, openDeltas.get(j).add(innerDeltas.get(j)));
+      }
+    }
+
+    for (int j = 0; j < epsilons.size(); j++) {
+      openEpsilons.set(j, openEpsilons.get(j).mod(modulus));
+      openDeltas.set(j, openDeltas.get(j).mod(modulus));
+    }
+  }
+
   @Override
   public List<DRes<SInt>> out() {
     return products;
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java
index 2360475e9..43747577d 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzCarryProtocol.java
@@ -11,6 +11,7 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class SpdzCarryProtocol extends SpdzNativeProtocol<List<SIntPair>> {
 
@@ -59,17 +60,14 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool, N
         epsilons.add(epsilonP2G1);
         final SpdzSInt deltaP2G1 = g1.subtract(p2g1Triple.getB());
         deltas.add(deltaP2G1);
-        network.sendToAll(serializer.serialize(epsilonP2G1.getShare()));
-        network.sendToAll(serializer.serialize(deltaP2G1.getShare()));
 
         // p1 * p2
         final SpdzSInt epsilonP1P2 = p1.subtract(p1p2Triple.getA());
         epsilons.add(epsilonP1P2);
         final SpdzSInt deltaP1P2 = p2.subtract(p1p2Triple.getB());
         deltas.add(deltaP1P2);
-        network.sendToAll(serializer.serialize(epsilonP1P2.getShare()));
-        network.sendToAll(serializer.serialize(deltaP1P2.getShare()));
       }
+      serializeAndSend(network, serializer);
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
       OpenedValueStore<SpdzSInt, BigInteger> openedValueStore = spdzResourcePool
@@ -89,12 +87,12 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool, N
         BigInteger p2g1D = openDeltas.get(2 * i);
         openedValueStore.pushOpenedValue(deltas.get(2 * i), p2g1D);
 
-        SpdzSInt p = computeProduct(spdzResourcePool.getMyId(), p1p2E, p1p2D,
+        SpdzSInt p = SpdzAndBatchedProtocol.computeProduct(spdzResourcePool.getMyId(), p1p2E, p1p2D,
             spdzResourcePool.getModulus(), p1p2Triple, dataSupplier.getSecretSharedKey());
 
         SpdzSInt g2 = (SpdzSInt) bits.get(2 * i).getSecond().out();
 
-        SpdzSInt g = computeProduct(spdzResourcePool.getMyId(), p2g1E, p2g1D,
+        SpdzSInt g = SpdzAndBatchedProtocol.computeProduct(spdzResourcePool.getMyId(), p2g1E, p2g1D,
             spdzResourcePool.getModulus(), p2g1Triple, dataSupplier.getSecretSharedKey())
             .add(g2);
         carried.add(new SIntPair(p, g));
@@ -107,40 +105,37 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool, N
     }
   }
 
-  private SpdzSInt computeProduct(int myId, BigInteger e, BigInteger d, BigInteger modulus,
-      SpdzTriple triple, BigInteger key) {
-    BigInteger product = e.multiply(d).mod(modulus);
-    SpdzSInt ed = new SpdzSInt(
-        product,
-        key.multiply(product).mod(modulus),
-        modulus);
-    SpdzSInt res = triple.getC();
-    return res.add(triple.getB().multiply(e))
-        .add(triple.getA().multiply(d))
-        .add(ed, myId);
+  private void serializeAndSend(Network network, ByteSerializer<BigInteger> serializer) {
+    byte[] epsilonBytes = serializer.serialize(
+        epsilons.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    byte[] deltaBytes = serializer.serialize(
+        deltas.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
   }
 
   private void receiveAndReconstruct(Network network, ByteSerializer<BigInteger> serializer,
       int noOfParties, BigInteger modulus) {
-    for (int i = 0; i < epsilons.size(); i++) {
-      BigInteger[] epsilonShares = new BigInteger[noOfParties];
-      BigInteger[] deltaShares = new BigInteger[noOfParties];
-      for (int p = 0; p < noOfParties; p++) {
-        epsilonShares[p] = serializer.deserialize(network.receive(p + 1));
-        deltaShares[p] = serializer.deserialize(network.receive(p + 1));
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+    openEpsilons = serializer.deserializeList(rawEpsilons);
+    openDeltas = serializer.deserializeList(rawDeltas);
+
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      List<BigInteger> innerEpsilons = serializer.deserializeList(rawEpsilons);
+      List<BigInteger> innerDeltas = serializer.deserializeList(rawDeltas);
+      for (int j = 0; j < epsilons.size(); j++) {
+        openEpsilons.set(j, openEpsilons.get(j).add(innerEpsilons.get(j)));
+        openDeltas.set(j, openDeltas.get(j).add(innerDeltas.get(j)));
       }
+    }
 
-      BigInteger e = epsilonShares[0];
-      BigInteger d = deltaShares[0];
-      for (int p = 1; p < epsilonShares.length; p++) {
-        e = e.add(epsilonShares[p]);
-        d = d.add(deltaShares[p]);
-      }
-      e = e.mod(modulus);
-      d = d.mod(modulus);
-
-      openEpsilons.add(e);
-      openDeltas.add(d);
+    for (int j = 0; j < epsilons.size(); j++) {
+      openEpsilons.set(j, openEpsilons.get(j).mod(modulus));
+      openDeltas.set(j, openDeltas.get(j).mod(modulus));
     }
   }
 

From 7f002cce2c8e7c6bf483d7ed7a5692b918c2c998 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Mon, 21 Jan 2019 17:08:03 +0100
Subject: [PATCH 228/231] Native OrList

---
 .../spdz/gates/SpdzOrBatchedProtocol.java     |  80 ++++---
 .../spdz2k/Spdz2kLogicalBooleanMode.java      |   6 +
 .../Spdz2kBooleanToArithmeticProtocol.java    |   2 +-
 .../natives/Spdz2kOrOfListProtocol.java       | 205 ++++++++++++++++++
 .../TestLogicalOperationsSpdz2k.java          |   1 -
 5 files changed, 260 insertions(+), 34 deletions(-)
 create mode 100644 suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java

diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
index a3389109f..ec0266c16 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrBatchedProtocol.java
@@ -11,6 +11,7 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class SpdzOrBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>> {
 
@@ -19,6 +20,8 @@ public class SpdzOrBatchedProtocol extends SpdzNativeProtocol<List<DRes<SInt>>>
   private List<SpdzTriple> triples;
   private List<SpdzSInt> epsilons;
   private List<SpdzSInt> deltas;
+  private List<BigInteger> openEpsilons;
+  private List<BigInteger> openDeltas;
   private List<DRes<SInt>> disjunctions;
   private final DRes<SInt> extraBit;
 
@@ -48,6 +51,8 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
       triples = new ArrayList<>(leftFactors.size());
       epsilons = new ArrayList<>(leftFactors.size());
       deltas = new ArrayList<>(leftFactors.size());
+      openEpsilons = new ArrayList<>(leftFactors.size());
+      openDeltas = new ArrayList<>(leftFactors.size());
       disjunctions = new ArrayList<>(leftFactors.size());
 
       for (int i = 0; i < leftFactors.size(); i++) {
@@ -61,46 +66,23 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
         SpdzSInt delta = right.subtract(triple.getB());
         epsilons.add(epsilon);
         deltas.add(delta);
-
-        network.sendToAll(serializer.serialize(epsilon.getShare()));
-        network.sendToAll(serializer.serialize(delta.getShare()));
       }
-
+      serializeAndSend(network, serializer);
       return EvaluationStatus.HAS_MORE_ROUNDS;
     } else {
+      BigInteger modulus = spdzResourcePool.getModulus();
+      receiveAndReconstruct(network, serializer, noOfPlayers, modulus);
       for (int i = 0; i < leftFactors.size(); i++) {
-        BigInteger[] epsilonShares = new BigInteger[noOfPlayers];
-        BigInteger[] deltaShares = new BigInteger[noOfPlayers];
-        for (int p = 0; p < noOfPlayers; p++) {
-          epsilonShares[p] = serializer.deserialize(network.receive(p + 1));
-          deltaShares[p] = serializer.deserialize(network.receive(p + 1));
-        }
-
-        BigInteger e = epsilonShares[0];
-        BigInteger d = deltaShares[0];
-        for (int p = 1; p < epsilonShares.length; p++) {
-          e = e.add(epsilonShares[p]);
-          d = d.add(deltaShares[p]);
-        }
-        BigInteger modulus = spdzResourcePool.getModulus();
-        e = e.mod(modulus);
-        d = d.mod(modulus);
-
-        BigInteger product = e.multiply(d).mod(modulus);
-        SpdzSInt ed = new SpdzSInt(
-            product,
-            dataSupplier.getSecretSharedKey().multiply(product).mod(modulus),
-            modulus);
-        SpdzTriple triple = triples.get(i);
-        SpdzSInt res = triple.getC();
-        SpdzSInt prod = res.add(triple.getB().multiply(e))
-            .add(triple.getA().multiply(d))
-            .add(ed, spdzResourcePool.getMyId());
+        BigInteger e = openEpsilons.get(i);
+        BigInteger d = openDeltas.get(i);
+
+        SpdzSInt product = SpdzAndBatchedProtocol.computeProduct(spdzResourcePool.getMyId(),
+            e, d, modulus, triples.get(i), dataSupplier.getSecretSharedKey());
 
         SpdzSInt left = (SpdzSInt) leftFactors.get(i).out();
         SpdzSInt right = (SpdzSInt) rightFactors.get(i).out();
         // bitA + bitB - bitA * bitB
-        SpdzSInt disjunction = left.add(right).subtract(prod);
+        SpdzSInt disjunction = left.add(right).subtract(product);
         disjunctions.add(disjunction);
         // Set the opened and closed value.
         spdzResourcePool.getOpenedValueStore().pushOpenedValue(epsilons.get(i), e);
@@ -113,6 +95,40 @@ public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
     }
   }
 
+  private void serializeAndSend(Network network, ByteSerializer<BigInteger> serializer) {
+    byte[] epsilonBytes = serializer.serialize(
+        epsilons.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    byte[] deltaBytes = serializer.serialize(
+        deltas.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  private void receiveAndReconstruct(Network network, ByteSerializer<BigInteger> serializer,
+      int noOfParties, BigInteger modulus) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+    openEpsilons = serializer.deserializeList(rawEpsilons);
+    openDeltas = serializer.deserializeList(rawDeltas);
+
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      List<BigInteger> innerEpsilons = serializer.deserializeList(rawEpsilons);
+      List<BigInteger> innerDeltas = serializer.deserializeList(rawDeltas);
+      for (int j = 0; j < epsilons.size(); j++) {
+        openEpsilons.set(j, openEpsilons.get(j).add(innerEpsilons.get(j)));
+        openDeltas.set(j, openDeltas.get(j).add(innerDeltas.get(j)));
+      }
+    }
+
+    for (int j = 0; j < epsilons.size(); j++) {
+      openEpsilons.set(j, openEpsilons.get(j).mod(modulus));
+      openDeltas.set(j, openDeltas.get(j).mod(modulus));
+    }
+  }
+
   @Override
   public List<DRes<SInt>> out() {
     return disjunctions;
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
index ac1f7562f..06c422d26 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/Spdz2kLogicalBooleanMode.java
@@ -16,6 +16,7 @@
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kAndProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrBatchedProtocol;
+import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrOfListProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOrProtocol;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kOutputToAll;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.Spdz2kXorKnownBatchedProtocol;
@@ -102,6 +103,11 @@ public DRes<List<DRes<SInt>>> pairWiseOr(DRes<List<DRes<SInt>>> bitsA,
     return builder.append(new Spdz2kOrBatchedProtocol<>(bitsA, bitsB));
   }
 
+  @Override
+  public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
+    return builder.append(new Spdz2kOrOfListProtocol<>(bits));
+  }
+
   @Override
   public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
     return builder.seq(new OrNeighborsComputationSpdz2k(bits));
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
index 425d58219..91919b738 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kBooleanToArithmeticProtocol.java
@@ -45,7 +45,7 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
       boolean isPartyOne = resourcePool.getMyId() == 1;
       arithmetic = arithmeticR.addConstant(openCBit, macKeyShare, factory.zero(),
-          isPartyOne).subtract(arithmeticR.multiply(factory.two().multiply(openCBit)));
+          isPartyOne).subtract(arithmeticR.multiply(factory.two().multiplyByBit(openC.bitValue())));
       return EvaluationStatus.IS_DONE;
     }
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java
new file mode 100644
index 000000000..3af3e74a5
--- /dev/null
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java
@@ -0,0 +1,205 @@
+package dk.alexandra.fresco.suite.spdz2k.protocols.natives;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntBoolean;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kTriple;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spdz2kOrOfListProtocol<PlainT extends CompUInt<?, ?, PlainT>> extends
+    Spdz2kNativeProtocol<SInt, PlainT> {
+
+  private final DRes<List<DRes<SInt>>> bitsDef;
+  private SInt res;
+  private List<DRes<SInt>> nextRound;
+  private List<DRes<SInt>> bitsA;
+  private List<DRes<SInt>> bitsB;
+  private List<Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>>> triples;
+  private List<Spdz2kSIntBoolean<PlainT>> epsilons;
+  private List<Spdz2kSIntBoolean<PlainT>> deltas;
+  private List<PlainT> openEpsilons;
+  private List<PlainT> openDeltas;
+  private SInt extraBit;
+
+  public Spdz2kOrOfListProtocol(DRes<List<DRes<SInt>>> bits) {
+    this.bitsDef = bits;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourcePool,
+      Network network) {
+    PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
+    CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+    if (round % 2 == 0) {
+      if (nextRound == null) {
+        nextRound = bitsDef.out();
+      }
+      final int nextRoundSize = nextRound.size();
+      if (nextRoundSize == 1) {
+        res = nextRound.get(0).out();
+        return EvaluationStatus.IS_DONE;
+      }
+
+      bitsA = new ArrayList<>(nextRoundSize / 2);
+      bitsB = new ArrayList<>(nextRoundSize / 2);
+      for (int i = 0; i < nextRoundSize - 1; i += 2) {
+        bitsA.add(nextRound.get(i));
+        bitsB.add(nextRound.get(i + 1));
+      }
+      triples = new ArrayList<>(nextRoundSize / 2);
+      epsilons = new ArrayList<>(nextRoundSize / 2);
+      deltas = new ArrayList<>(nextRoundSize / 2);
+      openEpsilons = new ArrayList<>(nextRoundSize / 2);
+      openDeltas = new ArrayList<>(nextRoundSize / 2);
+      // reset next round
+      final boolean isOdd = nextRoundSize % 2 != 0;
+      if (isOdd) {
+        extraBit = nextRound.get(nextRoundSize - 1).out();
+      } else {
+        extraBit = null;
+      }
+      nextRound = new ArrayList<>(nextRoundSize / 2);
+      for (int i = 0; i < bitsA.size(); i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = resourcePool
+            .getDataSupplier()
+            .getNextBitTripleShares();
+        triples.add(triple);
+
+        Spdz2kSIntBoolean<PlainT> left = factory.toSpdz2kSIntBoolean(bitsA.get(i));
+        Spdz2kSIntBoolean<PlainT> right = factory.toSpdz2kSIntBoolean(bitsB.get(i));
+
+        epsilons.add(factory.toSpdz2kSIntBoolean(left).xor(triple.getLeft()));
+        deltas.add(factory.toSpdz2kSIntBoolean(right).xor(triple.getRight()));
+      }
+      serializeAndSend(network, epsilons, deltas);
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      receiveAndReconstruct(network, factory, resourcePool.getNoOfParties());
+
+      OpenedValueStore<Spdz2kSIntArithmetic<PlainT>, PlainT> openedValueStore = resourcePool
+          .getOpenedValueStore();
+
+      for (int i = 0; i < bitsA.size(); i++) {
+        Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple = triples.get(i);
+
+        PlainT e = openEpsilons.get(i);
+        openedValueStore.pushOpenedValue(epsilons.get(i).asArithmetic(), e.toArithmeticRep());
+        PlainT d = openDeltas.get(i);
+        openedValueStore.pushOpenedValue(deltas.get(i).asArithmetic(), d.toArithmeticRep());
+
+        Spdz2kSIntBoolean<PlainT> prod = andAfterReceive(e, d, triple, macKeyShare, factory,
+            resourcePool.getMyId());
+        Spdz2kSIntBoolean<PlainT> xored = factory.toSpdz2kSIntBoolean(bitsA.get(i))
+            .xor(factory.toSpdz2kSIntBoolean(bitsB.get(i)));
+
+        nextRound.add(prod.xor(xored));
+      }
+      if (extraBit != null) {
+        nextRound.add(extraBit);
+      }
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    }
+  }
+
+  private Spdz2kSIntBoolean<PlainT> andAfterReceive(
+      PlainT e,
+      PlainT d,
+      Spdz2kTriple<PlainT, Spdz2kSIntBoolean<PlainT>> triple,
+      PlainT macKeyShare,
+      CompUIntFactory<PlainT> factory,
+      int myId) {
+    int eBit = e.bitValue();
+    int dBit = d.bitValue();
+    PlainT ed = e.multiply(d);
+    // compute [prod] = [c] XOR epsilon AND [b] XOR delta AND [a] XOR epsilon AND delta
+    Spdz2kSIntBoolean<PlainT> tripleLeft = triple.getLeft();
+    Spdz2kSIntBoolean<PlainT> tripleRight = triple.getRight();
+    Spdz2kSIntBoolean<PlainT> tripleProduct = triple.getProduct();
+    return tripleProduct
+        .xor(tripleRight.and(eBit))
+        .xor(tripleLeft.and(dBit))
+        .xorOpen(ed,
+            macKeyShare,
+            factory.zero().toBitRep(),
+            myId == 1);
+  }
+
+  /**
+   * Retrieves shares for epsilons and deltas and reconstructs each.
+   */
+  private void receiveAndReconstruct(Network network, CompUIntFactory<PlainT> factory,
+      int noOfParties) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+
+    for (int i = 0; i < epsilons.size(); i++) {
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+      PlainT e = factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte));
+      openEpsilons.add(e);
+      PlainT d = factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte));
+      openDeltas.add(d);
+    }
+
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      for (int j = 0; j < epsilons.size(); j++) {
+        int currentByteIdx = j / Byte.SIZE;
+        int bitIndexWithinByte = j % Byte.SIZE;
+        openEpsilons.set(j, openEpsilons.get(j).add(
+            factory.fromBit((rawEpsilons[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+        openDeltas.set(j, openDeltas.get(j).add(
+            factory.fromBit((rawDeltas[currentByteIdx] >>> bitIndexWithinByte))
+        ));
+      }
+    }
+  }
+
+  /**
+   * Serializes and sends epsilon and delta values.
+   */
+  private void serializeAndSend(Network network,
+      List<Spdz2kSIntBoolean<PlainT>> epsilons,
+      List<Spdz2kSIntBoolean<PlainT>> deltas) {
+    int numBytes = epsilons.size() / Byte.SIZE;
+    if (epsilons.size() % 8 != 0) {
+      numBytes++;
+    }
+    byte[] epsilonBytes = new byte[numBytes];
+    byte[] deltaBytes = new byte[numBytes];
+
+    for (int i = 0; i < epsilons.size(); i++) {
+      int currentByteIdx = i / Byte.SIZE;
+      int bitIndexWithinByte = i % Byte.SIZE;
+
+      int serializedEpsilon = epsilons.get(i).getShare().bitValue();
+      epsilonBytes[currentByteIdx] |= ((serializedEpsilon << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+
+      int serializedDelta = deltas
+          .get(i)
+          .getShare()
+          .bitValue();
+      deltaBytes[currentByteIdx] |= ((serializedDelta << bitIndexWithinByte)
+          & (1 << bitIndexWithinByte));
+    }
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  @Override
+  public SInt out() {
+    return res;
+  }
+
+}
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
index 511045dfa..f270c051a 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/TestLogicalOperationsSpdz2k.java
@@ -661,7 +661,6 @@ public void test() {
     }
   }
 
-
   private static List<BigInteger> randomBits(int num, int seed) {
     Random random = new Random(seed);
     List<BigInteger> bits = new ArrayList<>(num);

From 216450251bd6ae637b39a4ae6b847c74df502561 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Fri, 25 Jan 2019 15:22:09 +0100
Subject: [PATCH 229/231] Temp

---
 .../sce/evaluator/NetworkBatchDecorator.java  |   1 +
 .../fresco/suite/spdz/SpdzBuilder.java        |   6 +
 .../suite/spdz/SpdzRoundSynchronization.java  |   5 +
 .../spdz/gates/SpdzMacCheckProtocol.java      |   2 +-
 .../spdz/gates/SpdzOrOfListProtocol.java      | 150 ++++++++++++++++++
 .../spdz/storage/SpdzDummyDataSupplier.java   |  11 +-
 .../Spdz2kMacCheckComputation.java            |   1 +
 .../computations/eq/ZeroTestSpdz2k.java       |   1 +
 .../natives/Spdz2kOrOfListProtocol.java       |   2 +
 .../storage/Spdz2kDummyDataSupplier.java      |  11 +-
 .../Spdz2kRoundSynchronization.java           |   7 +
 .../fresco/suite/spdz2k/TestSpdz2k128.java    |   3 +-
 12 files changed, 190 insertions(+), 10 deletions(-)
 create mode 100644 suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrOfListProtocol.java

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java b/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
index 51328f2ba..bcaa6e96f 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/sce/evaluator/NetworkBatchDecorator.java
@@ -4,6 +4,7 @@
 import dk.alexandra.fresco.framework.util.ByteAndBitConverter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
index 42ee59a6c..9349eb338 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzBuilder.java
@@ -34,6 +34,7 @@
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMultProtocolKnownLeft;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzNotBatchedProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOrBatchedProtocol;
+import dk.alexandra.fresco.suite.spdz.gates.SpdzOrOfListProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOutputSingleProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOutputToAllProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzRandomProtocol;
@@ -299,6 +300,11 @@ public DRes<List<DRes<SInt>>> pairWiseAndKnown(DRes<List<OInt>> knownBits,
       return builder.append(new SpdzAndKnownBatchedProtocol(knownBits, secretBits));
     }
 
+    @Override
+    public DRes<SInt> orOfList(DRes<List<DRes<SInt>>> bits) {
+      return builder.append(new SpdzOrOfListProtocol(bits));
+    }
+
     @Override
     public DRes<List<DRes<SInt>>> orNeighbors(List<DRes<SInt>> bits) {
       // TODO same as SPDZ2k version
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
index 10bb6a5d1..5cf6e78c6 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/SpdzRoundSynchronization.java
@@ -7,12 +7,14 @@
 import dk.alexandra.fresco.framework.sce.evaluator.BatchedProtocolEvaluator;
 import dk.alexandra.fresco.framework.sce.evaluator.BatchedStrategy;
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.suite.ProtocolSuite.RoundSynchronization;
 import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzMacCheckProtocol;
 import dk.alexandra.fresco.suite.spdz.gates.SpdzOutputProtocol;
 import java.math.BigInteger;
 import java.security.SecureRandom;
+import java.util.List;
 import java.util.stream.StreamSupport;
 
 /**
@@ -53,6 +55,9 @@ public SpdzRoundSynchronization(SpdzProtocolSuite spdzProtocolSuite) {
   }
 
   protected void doMacCheck(SpdzResourcePool resourcePool, Network network) {
+//    Pair<List<SpdzSInt>, List<BigInteger>> bar = resourcePool.getOpenedValueStore().popValues();
+//    bar.getFirst().clear();
+//    bar.getSecond().clear();
     SpdzBuilder spdzBuilder = new SpdzBuilder(
         spdzProtocolSuite.createNumericContext(resourcePool),
         spdzProtocolSuite.createRealNumericContext());
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java
index 8ffeb0be1..2485fc436 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzMacCheckProtocol.java
@@ -55,7 +55,7 @@ public SpdzMacCheckProtocol(
   @Override
   public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
 //    System.out.println("SPDZ Mac Check: " + COUNT++ + " " + openedValues.size());
-
+//    System.out.println("SPDZ Mac Check " + COUNT++ + " " + openedValues.size());
     return builder
         .seq(seq -> {
           BigInteger[] rs = sampleRandomCoefficients(openedValues.size(), jointDrbg, modulus);
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrOfListProtocol.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrOfListProtocol.java
new file mode 100644
index 000000000..b6270c809
--- /dev/null
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/gates/SpdzOrOfListProtocol.java
@@ -0,0 +1,150 @@
+package dk.alexandra.fresco.suite.spdz.gates;
+
+import dk.alexandra.fresco.framework.DRes;
+import dk.alexandra.fresco.framework.network.Network;
+import dk.alexandra.fresco.framework.network.serializers.ByteSerializer;
+import dk.alexandra.fresco.framework.value.SInt;
+import dk.alexandra.fresco.suite.spdz.SpdzResourcePool;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzSInt;
+import dk.alexandra.fresco.suite.spdz.datatypes.SpdzTriple;
+import dk.alexandra.fresco.suite.spdz.storage.SpdzDataSupplier;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class SpdzOrOfListProtocol extends SpdzNativeProtocol<SInt> {
+
+  private final DRes<List<DRes<SInt>>> bitsDef;
+  private SInt res;
+  private List<DRes<SInt>> nextRound;
+  private List<DRes<SInt>> bitsA;
+  private List<DRes<SInt>> bitsB;
+  private List<SpdzTriple> triples;
+  private List<SpdzSInt> epsilons;
+  private List<SpdzSInt> deltas;
+  private List<BigInteger> openEpsilons;
+  private List<BigInteger> openDeltas;
+  private SInt extraBit;
+
+  public SpdzOrOfListProtocol(DRes<List<DRes<SInt>>> left) {
+    this.bitsDef = left;
+  }
+
+  @Override
+  public EvaluationStatus evaluate(int round, SpdzResourcePool spdzResourcePool,
+      Network network) {
+    SpdzDataSupplier dataSupplier = spdzResourcePool.getDataSupplier();
+    int noOfPlayers = spdzResourcePool.getNoOfParties();
+    ByteSerializer<BigInteger> serializer = spdzResourcePool.getSerializer();
+
+//    System.out.println("Running round " + round);
+    if (round % 2 == 0) {
+      if (nextRound == null) {
+        nextRound = bitsDef.out();
+      }
+      final int nextRoundSize = nextRound.size();
+      if (nextRoundSize == 1) {
+        res = nextRound.get(0).out();
+        return EvaluationStatus.IS_DONE;
+      }
+
+      bitsA = new ArrayList<>(nextRoundSize / 2);
+      bitsB = new ArrayList<>(nextRoundSize / 2);
+      for (int i = 0; i < nextRoundSize - 1; i += 2) {
+        bitsA.add(nextRound.get(i));
+        bitsB.add(nextRound.get(i + 1));
+      }
+      triples = new ArrayList<>(nextRoundSize / 2);
+      epsilons = new ArrayList<>(nextRoundSize / 2);
+      deltas = new ArrayList<>(nextRoundSize / 2);
+      openEpsilons = new ArrayList<>(nextRoundSize / 2);
+      openDeltas = new ArrayList<>(nextRoundSize / 2);
+      // reset next round
+      final boolean isOdd = nextRoundSize % 2 != 0;
+      if (isOdd) {
+        extraBit = nextRound.get(nextRoundSize - 1).out();
+      } else {
+        extraBit = null;
+      }
+      nextRound = new ArrayList<>(nextRoundSize / 2);
+      for (int i = 0; i < bitsA.size(); i++) {
+        SpdzTriple triple = dataSupplier.getNextTriple();
+        triples.add(triple);
+
+        SpdzSInt left = (SpdzSInt) bitsA.get(i).out();
+        SpdzSInt right = (SpdzSInt) bitsB.get(i).out();
+
+        SpdzSInt epsilon = left.subtract(triple.getA());
+        SpdzSInt delta = right.subtract(triple.getB());
+        epsilons.add(epsilon);
+        deltas.add(delta);
+      }
+      serializeAndSend(network, serializer);
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    } else {
+      BigInteger modulus = spdzResourcePool.getModulus();
+      receiveAndReconstruct(network, serializer, noOfPlayers, modulus);
+      for (int i = 0; i < bitsA.size(); i++) {
+        BigInteger e = openEpsilons.get(i);
+        BigInteger d = openDeltas.get(i);
+
+        SpdzSInt product = SpdzAndBatchedProtocol.computeProduct(spdzResourcePool.getMyId(),
+            e, d, modulus, triples.get(i), dataSupplier.getSecretSharedKey());
+
+        SpdzSInt left = (SpdzSInt) bitsA.get(i).out();
+        SpdzSInt right = (SpdzSInt) bitsB.get(i).out();
+        // bitA + bitB - bitA * bitB
+        SpdzSInt disjunction = left.add(right).subtract(product);
+        nextRound.add(disjunction);
+        // Set the opened and closed value.
+        spdzResourcePool.getOpenedValueStore().pushOpenedValue(epsilons.get(i), e);
+        spdzResourcePool.getOpenedValueStore().pushOpenedValue(deltas.get(i), d);
+      }
+      if (extraBit != null) {
+        nextRound.add(extraBit);
+      }
+      return EvaluationStatus.HAS_MORE_ROUNDS;
+    }
+  }
+
+  private void serializeAndSend(Network network, ByteSerializer<BigInteger> serializer) {
+    byte[] epsilonBytes = serializer.serialize(
+        epsilons.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    byte[] deltaBytes = serializer.serialize(
+        deltas.stream().map(SpdzSInt::getShare).collect(Collectors.toList()));
+    network.sendToAll(epsilonBytes);
+    network.sendToAll(deltaBytes);
+  }
+
+  private void receiveAndReconstruct(Network network, ByteSerializer<BigInteger> serializer,
+      int noOfParties, BigInteger modulus) {
+    byte[] rawEpsilons = network.receive(1);
+    byte[] rawDeltas = network.receive(1);
+    openEpsilons = serializer.deserializeList(rawEpsilons);
+    openDeltas = serializer.deserializeList(rawDeltas);
+
+    for (int i = 2; i <= noOfParties; i++) {
+      rawEpsilons = network.receive(i);
+      rawDeltas = network.receive(i);
+
+      List<BigInteger> innerEpsilons = serializer.deserializeList(rawEpsilons);
+      List<BigInteger> innerDeltas = serializer.deserializeList(rawDeltas);
+      for (int j = 0; j < epsilons.size(); j++) {
+        openEpsilons.set(j, openEpsilons.get(j).add(innerEpsilons.get(j)));
+        openDeltas.set(j, openDeltas.get(j).add(innerDeltas.get(j)));
+      }
+    }
+
+    for (int j = 0; j < epsilons.size(); j++) {
+      openEpsilons.set(j, openEpsilons.get(j).mod(modulus));
+      openDeltas.set(j, openDeltas.get(j).mod(modulus));
+    }
+  }
+
+  @Override
+  public SInt out() {
+    return res;
+  }
+
+}
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
index 30072884c..4cca664f3 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
@@ -20,7 +20,8 @@ public class SpdzDummyDataSupplier implements SpdzDataSupplier {
   private final int myId;
   private final ArithmeticDummyDataSupplier supplier;
   private final BigInteger modulus;
-  private final BigInteger secretSharedKey;
+  private final BigInteger wholeKey;
+  private final BigInteger myKeyShare;
   private final int expPipeLength;
   private final int maxBitLength;
 
@@ -49,11 +50,13 @@ public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
       BigInteger secretSharedKey, int expPipeLength, int maxBitLength) {
     this.myId = myId;
     this.modulus = modulus;
-    this.secretSharedKey = secretSharedKey;
     this.expPipeLength = expPipeLength;
     this.maxBitLength = maxBitLength;
     this.supplier = new ArithmeticDummyDataSupplier(myId, noOfPlayers, modulus,
         BigInteger.ONE.shiftLeft(maxBitLength - 1));
+    final Pair<BigInteger, BigInteger> keyPair = supplier.getRandomElementShare();
+    this.wholeKey = keyPair.getFirst();
+    this.myKeyShare = keyPair.getSecond();
   }
 
   @Override
@@ -95,7 +98,7 @@ public BigInteger getModulus() {
 
   @Override
   public BigInteger getSecretSharedKey() {
-    return secretSharedKey;
+    return myKeyShare;
   }
 
   @Override
@@ -112,7 +115,7 @@ public TruncationPair getNextTruncationPair(int d) {
   private SpdzSInt toSpdzSInt(Pair<BigInteger, BigInteger> raw) {
     return new SpdzSInt(
         raw.getSecond(),
-        raw.getFirst().multiply(secretSharedKey).mod(modulus),
+        raw.getSecond().multiply(wholeKey).mod(modulus),
         modulus
     );
   }
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
index 61c7e120c..717110bfe 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/Spdz2kMacCheckComputation.java
@@ -70,6 +70,7 @@ public DRes<Void> buildComputation(ProtocolBuilderNumeric builder) {
     PlainT macKeyShare = supplier.getSecretSharedKey();
     PlainT y = UInt.innerProduct(openValues, randomCoefficients);
     Spdz2kSIntArithmetic<PlainT> r = supplier.getNextRandomElementShare();
+//    System.out.println("SPDZ2k Mac Check " + COUNT++ + " "+ openValues.size());
     return builder
         .seq(seq -> {
           if (noOfParties > 2) {
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
index a76f0384c..ffa3c368e 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/computations/eq/ZeroTestSpdz2k.java
@@ -57,6 +57,7 @@ public DRes<SInt> buildComputation(ProtocolBuilderNumeric builder) {
           List<OInt> cBits = arithmetic.toBits(pair.getSecond().out(), k);
           DRes<List<DRes<SInt>>> rBitsBoolean = conversion.toBooleanBatch(() -> rBits);
           DRes<List<DRes<SInt>>> xored = logical.pairWiseXorKnown(() -> cBits, rBitsBoolean);
+          final long then = System.currentTimeMillis();
           DRes<SInt> or = logical.orOfList(xored);
           return conversion.toArithmetic(logical.not(or));
         });
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java
index 3af3e74a5..59be6d4b6 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/protocols/natives/Spdz2kOrOfListProtocol.java
@@ -37,6 +37,8 @@ public EvaluationStatus evaluate(int round, Spdz2kResourcePool<PlainT> resourceP
       Network network) {
     PlainT macKeyShare = resourcePool.getDataSupplier().getSecretSharedKey();
     CompUIntFactory<PlainT> factory = resourcePool.getFactory();
+//    System.out.println("Running round " + round);
+
     if (round % 2 == 0) {
       if (nextRound == null) {
         nextRound = bitsDef.out();
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
index 427977aeb..b4f468ba0 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/resource/storage/Spdz2kDummyDataSupplier.java
@@ -24,18 +24,21 @@ public class Spdz2kDummyDataSupplier<
   private final int myId;
   private final ArithmeticDummyDataSupplier supplier;
   private final PlainT secretSharedKey;
+  private final PlainT myKeyShare;
   private final CompUIntFactory<PlainT> factory;
 
   public Spdz2kDummyDataSupplier(int myId, int noOfParties, PlainT secretSharedKey,
       CompUIntFactory<PlainT> factory) {
     this.myId = myId;
-    this.secretSharedKey = secretSharedKey;
     this.factory = factory;
     this.supplier = new ArithmeticDummyDataSupplier(
         myId,
         noOfParties,
         BigInteger.ONE.shiftLeft(factory.getCompositeBitLength()),
         BigInteger.ONE.shiftLeft(factory.getLowBitLength() - 1));
+    final Pair<BigInteger, BigInteger> keyPair = supplier.getRandomElementShare();
+    this.secretSharedKey = factory.createFromBigInteger(keyPair.getFirst());
+    this.myKeyShare = factory.createFromBigInteger(keyPair.getSecond());
   }
 
   @Override
@@ -74,7 +77,7 @@ public Spdz2kSIntArithmetic<PlainT> getNextBitShare() {
 
   @Override
   public PlainT getSecretSharedKey() {
-    return secretSharedKey;
+    return myKeyShare;
   }
 
   @Override
@@ -91,14 +94,14 @@ public TruncationPair getNextTruncationPair(int d) {
   private Spdz2kSIntArithmetic<PlainT> toSpdz2kSInt(Pair<BigInteger, BigInteger> raw) {
     PlainT openValue = factory.createFromBigInteger(raw.getFirst());
     PlainT share = factory.createFromBigInteger(raw.getSecond());
-    PlainT macShare = openValue.multiply(secretSharedKey);
+    PlainT macShare = share.multiply(secretSharedKey);
     return new Spdz2kSIntArithmetic<>(share, macShare);
   }
 
   private Spdz2kSIntBoolean<PlainT> toSpdz2kSIntBool(Pair<BigInteger, BigInteger> raw) {
     PlainT openValue = factory.createFromBigInteger(raw.getFirst()).toBitRep();
     PlainT share = factory.createFromBigInteger(raw.getSecond()).toBitRep();
-    PlainT macShare = openValue.toArithmeticRep().multiply(secretSharedKey);
+    PlainT macShare = share.toArithmeticRep().multiply(secretSharedKey);
     return new Spdz2kSIntBoolean<>(share, macShare);
   }
 
diff --git a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
index 5ba14e8a3..3b97c5afc 100644
--- a/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
+++ b/suite/spdz2k/src/main/java/dk/alexandra/fresco/suite/spdz2k/synchronization/Spdz2kRoundSynchronization.java
@@ -7,16 +7,20 @@
 import dk.alexandra.fresco.framework.sce.evaluator.BatchedProtocolEvaluator;
 import dk.alexandra.fresco.framework.sce.evaluator.BatchedStrategy;
 import dk.alexandra.fresco.framework.util.OpenedValueStore;
+import dk.alexandra.fresco.framework.util.Pair;
 import dk.alexandra.fresco.suite.ProtocolSuite.RoundSynchronization;
 import dk.alexandra.fresco.suite.spdz2k.Spdz2kBuilder;
 import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntConverter;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSInt;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.Spdz2kSIntArithmetic;
 import dk.alexandra.fresco.suite.spdz2k.datatypes.UInt;
 import dk.alexandra.fresco.suite.spdz2k.protocols.computations.Spdz2kMacCheckComputation;
 import dk.alexandra.fresco.suite.spdz2k.protocols.natives.RequiresMacCheck;
 import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import java.math.BigInteger;
+import java.util.List;
 import java.util.stream.StreamSupport;
 
 /**
@@ -53,6 +57,9 @@ public Spdz2kRoundSynchronization(Spdz2kProtocolSuite<HighT, LowT, PlainT> proto
   }
 
   private void doMacCheck(Spdz2kResourcePool<PlainT> resourcePool, Network network) {
+//    Pair<List<Spdz2kSIntArithmetic<PlainT>>, List<PlainT>> bar = resourcePool.getOpenedValueStore().popValues();
+//    bar.getFirst().clear();
+//    bar.getSecond().clear();
     Spdz2kBuilder<PlainT> builder = new Spdz2kBuilder<>(resourcePool.getFactory(),
         protocolSuite.createBasicNumericContext(resourcePool),
         protocolSuite.createRealNumericContext(),
diff --git a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k128.java b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k128.java
index 5040dd456..0b1d8a300 100644
--- a/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k128.java
+++ b/suite/spdz2k/src/test/java/dk/alexandra/fresco/suite/spdz2k/TestSpdz2k128.java
@@ -18,12 +18,13 @@ public class TestSpdz2k128 extends Spdz2kTestSuite<Spdz2kResourcePool<CompUInt12
   protected Spdz2kResourcePool<CompUInt128> createResourcePool(int playerId, int noOfParties,
       Supplier<Network> networkSupplier) {
     CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+    final CompUInt128 key = factory.createRandom();
     Spdz2kResourcePool<CompUInt128> resourcePool =
         new Spdz2kResourcePoolImpl<>(
             playerId,
             noOfParties, null,
             new Spdz2kOpenedValueStoreImpl<>(),
-            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, factory.createRandom(), factory),
+            new Spdz2kDummyDataSupplier<>(playerId, noOfParties, key, factory),
             factory);
     resourcePool.initializeJointRandomness(networkSupplier, AesCtrDrbg::new, 32);
     return resourcePool;

From dec95c70817abbe472adcc9e34620fdd2b593545 Mon Sep 17 00:00:00 2001
From: n1v0lg <n1v0lg@users.noreply.github.com>
Date: Mon, 11 Mar 2019 13:51:49 +0100
Subject: [PATCH 230/231] Fix dummy supplier test

---
 .../util/ArithmeticDummyDataSupplier.java         | 10 ++++++++++
 .../suite/spdz/storage/SpdzDummyDataSupplier.java | 15 ++++++---------
 .../spdz/storage/TestSpdzDummyDataSupplier.java   | 14 +++++++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
index 8bab3ae24..fd7f32dbb 100644
--- a/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
+++ b/core/src/main/java/dk/alexandra/fresco/framework/util/ArithmeticDummyDataSupplier.java
@@ -107,6 +107,16 @@ public List<Pair<BigInteger, BigInteger>> getExpPipe(int expPipeLength) {
         .collect(Collectors.toList());
   }
 
+  /**
+   * Returns this party's share of given secret.
+   *
+   * @param value secret to share
+   * @return this party's secret share
+   */
+  public BigInteger secretShare(BigInteger value) {
+    return sharer.share(value, noOfParties).get(myId - 1);
+  }
+
   private BigInteger sampleRandomBigInteger() {
     return sampleRandomBigInteger(modulus);
   }
diff --git a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
index 4cca664f3..f05736778 100644
--- a/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
+++ b/suite/spdz/src/main/java/dk/alexandra/fresco/suite/spdz/storage/SpdzDummyDataSupplier.java
@@ -23,7 +23,6 @@ public class SpdzDummyDataSupplier implements SpdzDataSupplier {
   private final BigInteger wholeKey;
   private final BigInteger myKeyShare;
   private final int expPipeLength;
-  private final int maxBitLength;
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers) {
     // TODO kill this
@@ -37,8 +36,8 @@ public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus) {
   }
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
-      BigInteger secretSharedKey) {
-    this(myId, noOfPlayers, modulus, secretSharedKey, 200);
+      BigInteger macKey) {
+    this(myId, noOfPlayers, modulus, macKey, 200);
   }
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
@@ -47,16 +46,14 @@ public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
   }
 
   public SpdzDummyDataSupplier(int myId, int noOfPlayers, BigInteger modulus,
-      BigInteger secretSharedKey, int expPipeLength, int maxBitLength) {
+      BigInteger macKey, int expPipeLength, int maxBitLength) {
     this.myId = myId;
     this.modulus = modulus;
     this.expPipeLength = expPipeLength;
-    this.maxBitLength = maxBitLength;
     this.supplier = new ArithmeticDummyDataSupplier(myId, noOfPlayers, modulus,
         BigInteger.ONE.shiftLeft(maxBitLength - 1));
-    final Pair<BigInteger, BigInteger> keyPair = supplier.getRandomElementShare();
-    this.wholeKey = keyPair.getFirst();
-    this.myKeyShare = keyPair.getSecond();
+    this.wholeKey = macKey;
+    this.myKeyShare = supplier.secretShare(wholeKey);
   }
 
   @Override
@@ -121,7 +118,7 @@ private SpdzSInt toSpdzSInt(Pair<BigInteger, BigInteger> raw) {
   }
 
   static private BigInteger getSsk(BigInteger modulus) {
-    return new BigInteger(modulus.bitLength(), new Random()).mod(modulus);
+    return new BigInteger(modulus.bitLength(), new Random(1)).mod(modulus);
   }
 
 }
diff --git a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/storage/TestSpdzDummyDataSupplier.java b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/storage/TestSpdzDummyDataSupplier.java
index 3bfe7000e..18233061d 100644
--- a/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/storage/TestSpdzDummyDataSupplier.java
+++ b/suite/spdz/src/test/java/dk/alexandra/fresco/suite/spdz/storage/TestSpdzDummyDataSupplier.java
@@ -34,9 +34,9 @@ private List<SpdzDummyDataSupplier> setupSuppliers(int noOfParties,
       BigInteger modulus, int expPipeLength) {
     List<SpdzDummyDataSupplier> suppliers = new ArrayList<>(noOfParties);
     Random random = new Random();
+    BigInteger macKey = new BigInteger(modulus.bitLength(), random).mod(modulus);
     for (int i = 0; i < noOfParties; i++) {
-      BigInteger macKeyShare = new BigInteger(modulus.bitLength(), random).mod(modulus);
-      suppliers.add(new SpdzDummyDataSupplier(i + 1, noOfParties, modulus, macKeyShare,
+      suppliers.add(new SpdzDummyDataSupplier(i + 1, noOfParties, modulus, macKey,
           expPipeLength));
     }
     return suppliers;
@@ -202,10 +202,14 @@ public void testGetNextRandomFieldElement() {
 
   @Test
   public void testGetters() {
-    SpdzDummyDataSupplier supplier = new SpdzDummyDataSupplier(1, 2, moduli.get(0),
+    final BigInteger mod = moduli.get(0);
+    SpdzDummyDataSupplier supplier = new SpdzDummyDataSupplier(1, 2, mod,
         BigInteger.ONE);
-    assertEquals(moduli.get(0), supplier.getModulus());
-    assertEquals(BigInteger.ONE, supplier.getSecretSharedKey());
+    SpdzDummyDataSupplier supplierTwo = new SpdzDummyDataSupplier(2, 2, mod,
+        BigInteger.ONE);
+    assertEquals(mod, supplier.getModulus());
+    assertEquals(BigInteger.ONE,
+        supplier.getSecretSharedKey().add(supplierTwo.getSecretSharedKey()).mod(mod));
   }
 
   private SpdzSInt recombine(List<SpdzSInt> shares) {

From 21864ed87560c8c3291cdc9ce2ad34841244c4b8 Mon Sep 17 00:00:00 2001
From: Tore Frederiksen <tore.frederiksen@alexandra.dk>
Date: Thu, 17 Sep 2020 17:32:43 +0200
Subject: [PATCH 231/231] Added support for spdz2k in commandline utility for
 demos

---
 demos/common/pom.xml                          |  6 ++
 .../fresco/demo/cli/CmdLineProtocolSuite.java | 73 +++++++++++++++++--
 .../fresco/demo/cli/CmdLineUtil.java          |  3 +-
 demos/pom.xml                                 |  5 ++
 4 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/demos/common/pom.xml b/demos/common/pom.xml
index 26595bff6..d751b7182 100644
--- a/demos/common/pom.xml
+++ b/demos/common/pom.xml
@@ -24,5 +24,11 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>dk.alexandra.fresco</groupId>
+      <artifactId>spdz2k</artifactId>
+      <version>1.1.4-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineProtocolSuite.java b/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineProtocolSuite.java
index 3fa82590e..31e87838f 100644
--- a/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineProtocolSuite.java
+++ b/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineProtocolSuite.java
@@ -1,5 +1,7 @@
 package dk.alexandra.fresco.demo.cli;
 
+import dk.alexandra.fresco.framework.configuration.NetworkConfiguration;
+import dk.alexandra.fresco.framework.network.AsyncNetwork;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePool;
 import dk.alexandra.fresco.framework.sce.resources.ResourcePoolImpl;
 import dk.alexandra.fresco.framework.sce.resources.storage.FilebasedStreamedStorageImpl;
@@ -18,6 +20,18 @@
 import dk.alexandra.fresco.suite.spdz.storage.SpdzDummyDataSupplier;
 import dk.alexandra.fresco.suite.spdz.storage.SpdzOpenedValueStoreImpl;
 import dk.alexandra.fresco.suite.spdz.storage.SpdzStorageDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite128;
+import dk.alexandra.fresco.suite.spdz2k.Spdz2kProtocolSuite64;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt128Factory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt64;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUInt64Factory;
+import dk.alexandra.fresco.suite.spdz2k.datatypes.CompUIntFactory;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePool;
+import dk.alexandra.fresco.suite.spdz2k.resource.Spdz2kResourcePoolImpl;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kDummyDataSupplier;
+import dk.alexandra.fresco.suite.spdz2k.resource.storage.Spdz2kOpenedValueStoreImpl;
 import dk.alexandra.fresco.suite.tinytables.online.TinyTablesProtocolSuite;
 import dk.alexandra.fresco.suite.tinytables.ot.TinyTablesNaorPinkasOt;
 import dk.alexandra.fresco.suite.tinytables.ot.TinyTablesOt;
@@ -44,14 +58,13 @@ public class CmdLineProtocolSuite {
   private final ResourcePool resourcePool;
 
   static String getSupportedProtocolSuites() {
-    String[] strings = {"dummybool", "dummyarithmetic", "spdz", "tinytables", "tinytablesprepro"};
+    String[] strings = {"dummybool", "dummyarithmetic", "spdz", "spdz2k32",  "spdz2k64", "tinytables", "tinytablesprepro"};
     return Arrays.toString(strings);
   }
 
-  CmdLineProtocolSuite(String protocolSuiteName, Properties properties, int myId,
-      int noOfPlayers) throws ParseException, NoSuchAlgorithmException {
-    this.myId = myId;
-    this.noOfPlayers = noOfPlayers;
+  CmdLineProtocolSuite(String protocolSuiteName, Properties properties, NetworkConfiguration conf) throws ParseException, NoSuchAlgorithmException {
+    this.myId = conf.getMyId();
+    this.noOfPlayers = conf.noOfParties();
     if (protocolSuiteName.equals("dummybool")) {
       this.protocolSuite = new DummyBooleanProtocolSuite();
       this.resourcePool =
@@ -67,6 +80,14 @@ static String getSupportedProtocolSuites() {
       this.protocolSuite = getSpdzProtocolSuite(properties);
       this.resourcePool =
           createSpdzResourcePool(properties);
+    } else if (protocolSuiteName.equals("spdz2k32")) {
+      this.protocolSuite = getSpdz2kProtocolSuite(properties, false);
+      this.resourcePool =
+          createSpdz2kResourcePool(properties, false, conf);
+    } else if (protocolSuiteName.equals("spdz2k64")) {
+      this.protocolSuite = getSpdz2kProtocolSuite(properties, true);
+      this.resourcePool =
+          createSpdz2kResourcePool(properties, true, conf);
     } else if (protocolSuiteName.equals("tinytablesprepro")) {
       String tinytablesFileOption = "tinytables.file";
       String tinyTablesFilePath = properties.getProperty(tinytablesFileOption, "tinytables");
@@ -113,6 +134,11 @@ public ResourcePool getResourcePool() {
     return new SpdzProtocolSuite(maxBitLength);
   }
 
+  private ProtocolSuite<?, ?> getSpdz2kProtocolSuite(Properties properties, boolean large) {
+    Properties p = getProperties(properties);
+    return large ? new Spdz2kProtocolSuite128(true) : new Spdz2kProtocolSuite64(true);
+  }
+
   private Properties getProperties(Properties properties) {
     return properties;
   }
@@ -137,6 +163,43 @@ private SpdzResourcePool createSpdzResourcePool(Properties properties) {
         new AesCtrDrbg(new byte[32]));
   }
 
+  private Spdz2kResourcePool createSpdz2kResourcePool(Properties properties, boolean large, NetworkConfiguration conf) {
+    String strat = properties.getProperty("spdz2k.preprocessingStrategy");
+    final PreprocessingStrategy strategy = PreprocessingStrategy.valueOf(strat);
+    Spdz2kDataSupplier supplier = null;
+    if (strategy == PreprocessingStrategy.DUMMY) {
+      if (large) {
+        CompUIntFactory<CompUInt128> factory = new CompUInt128Factory();
+        CompUInt128 keyShare = factory.createRandom();
+        Spdz2kResourcePool<CompUInt128> resourcePool =
+            new Spdz2kResourcePoolImpl<>(
+                myId,
+                noOfPlayers, new AesCtrDrbg(new byte[32]),
+                new Spdz2kOpenedValueStoreImpl<>(),
+                new Spdz2kDummyDataSupplier<>(myId, noOfPlayers, keyShare, factory),
+                factory);
+        resourcePool.initializeJointRandomness(() -> new AsyncNetwork(conf), AesCtrDrbg::new, 32);
+        return resourcePool;
+      } else {
+        CompUIntFactory<CompUInt64> factory = new CompUInt64Factory();
+        CompUInt64 keyShare = factory.createRandom();
+        Spdz2kResourcePool<CompUInt64> resourcePool =
+            new Spdz2kResourcePoolImpl<>(
+                myId,
+                noOfPlayers, new AesCtrDrbg(new byte[32]),
+                new Spdz2kOpenedValueStoreImpl<>(),
+                new Spdz2kDummyDataSupplier<>(myId, noOfPlayers, keyShare, factory),
+                factory);
+        resourcePool.initializeJointRandomness(() -> new AsyncNetwork(conf), AesCtrDrbg::new, 32);
+        return resourcePool;
+      }
+    }
+    if (strategy == PreprocessingStrategy.STATIC) {
+      throw new UnsupportedOperationException("Real SPDZ2k supplier from commandline not implemented yet");
+    }
+    throw new UnsupportedOperationException("Unknown SPDZ2k supplier");
+  }
+
   private ProtocolSuite<?, ?> tinyTablesPreProFromCmdLine(Properties properties) {
     return new TinyTablesPreproProtocolSuite();
   }
diff --git a/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineUtil.java b/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineUtil.java
index 072dc428e..ba9e9186d 100644
--- a/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineUtil.java
+++ b/demos/common/src/main/java/dk/alexandra/fresco/demo/cli/CmdLineUtil.java
@@ -245,8 +245,7 @@ public CommandLine parse(String[] args) {
       parseAndSetupNetwork();
 
       CmdLineProtocolSuite protocolSuiteParser = new CmdLineProtocolSuite(protocolSuiteName,
-          cmd.getOptionProperties("D"), this.networkConfiguration.getMyId(),
-          this.networkConfiguration.noOfParties());
+          cmd.getOptionProperties("D"), this.networkConfiguration);
       protocolSuite = (ProtocolSuite<ResourcePoolT, BuilderT>)
           protocolSuiteParser.getProtocolSuite();
       resourcePool = (ResourcePoolT) protocolSuiteParser.getResourcePool();
diff --git a/demos/pom.xml b/demos/pom.xml
index 13cafe259..9c0a50407 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -16,6 +16,11 @@
       <artifactId>spdz</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>dk.alexandra.fresco</groupId>
+      <artifactId>spdz2k</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>dk.alexandra.fresco</groupId>
       <artifactId>tinytables</artifactId>