Started implementing C++ compose.

kryptnostic · Mar 17, 2015 · d92e182 · d92e182
1 parent 196c2f4
commit d92e182
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...odeproj/project.xcworkspace/xcuserdata/mtamayo.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/mtamayo.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/krypto-lib/src/main/cpp/MultivariatePolynomialFunction.h b/krypto-lib/src/main/cpp/MultivariatePolynomialFunction.h
@@ -52,8 +52,8 @@ class MultivariatePolynomialFunction {
 
 		return f;
 	}
-
-	const BitVector<NUM_OUTPUTS> operator()(
+      
+    const BitVector<NUM_OUTPUTS> operator()(
 			const BitVector<NUM_INPUTS> & input) {
 		BitVector<NUM_OUTPUTS> result;
 		for (int i = 0; i < maxMonomialCount; ++i) {
@@ -64,6 +64,19 @@ class MultivariatePolynomialFunction {
 		}
 		return result;
 	}
+
+    template<unsigned INNER_INPUT_LENGTH>
+    const MultivariatePolynomialFunction<INNER_INPUT_LENGTH,NUM_OUTPUTS> operator()(
+                                            const MultivariatePolynomialFunction<INNER_INPUT_LENGTH,NUM_INPUTS> & input) {
+        BitVector<NUM_OUTPUTS> result;
+        for (int i = 0; i < maxMonomialCount; ++i) {
+            BitVector<NUM_INPUTS> inputMask = _monomials[i] & input;
+            if (inputMask == input) {
+                result ^= _contributions[i];
+            }
+        }
+        return result;
+    }
 
 private:
 	vector<BitVector<NUM_INPUTS>> _monomials;