Implement add operator between lc and lc

LayerXcom · May 25, 2019 · 27eb38d · 27eb38d
1 parent 2385322
commit 27eb38d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/core/sonic/src/cs/lc.rs b/core/sonic/src/cs/lc.rs
@@ -28,6 +28,18 @@ impl<E: Engine> LinearCombination<E> {
     }
 }
 
+impl<E: Engine> Add<LinearCombination<E>> for LinearCombination<E> {
+    type Output = LinearCombination<E>;
+
+    fn add(mut self, lc: LinearCombination<E>) -> LinearCombination<E> {
+        for (var, coeff) in lc.as_ref() {
+            self.0.push((*var, *coeff));
+        }
+
+        self
+    }
+}
+
 /// Operetor overloading for linear combination
 /// `LinearCombination` + `(Coeff, Variable)` = `LinearCombination`
 impl<E: Engine> Add<(Coeff<E>, Variable)> for LinearCombination<E> {

diff --git a/core/sonic/src/helped/adaptor.rs b/core/sonic/src/helped/adaptor.rs
@@ -134,9 +134,10 @@ impl <'a, E: Engine, CS: SonicCS<E> + 'a> ConstraintSystem<E>
             .unwrap();
 
         // Ensure each linear conbination is equal to evaluated value
-        self.cs.enforce_zero(a_lc - a);
-        self.cs.enforce_zero(b_lc - b);
-        self.cs.enforce_zero(c_lc - c);
+        self.cs.enforce_zero(a_lc + b_lc + c_lc - a - b - c);
+        // self.cs.enforce_zero(a_lc - a);
+        // self.cs.enforce_zero(b_lc - b);
+        // self.cs.enforce_zero(c_lc - c);
     }
 
     fn push_namespace<NR, N>(&mut self, _: N)