changeset 1273:2fccb0bb9508

Merged with Janus.
author Marcel Keller <mkeller@cs.au.dk>
date Fri, 09 Oct 2009 11:00:12 +0200
parents 2fd999c906ca 727eab7a4e2a
children 31da6944a413
files
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/viff/active.py	Thu Oct 08 15:25:15 2009 +0200
+++ b/viff/active.py	Fri Oct 09 11:00:12 2009 +0200
@@ -382,7 +382,7 @@
         result.addCallback(lambda triples: triples[0])
         return result
 
-    def generate_triples(self, field, quantity):
+    def generate_triples(self, field, quantity=None):
         """Generate multiplication triples.
 
         These are random numbers *a*, *b*, and *c* such that ``c =
--- a/viff/runtime.py	Thu Oct 08 15:25:15 2009 +0200
+++ b/viff/runtime.py	Fri Oct 09 11:00:12 2009 +0200
@@ -831,8 +831,7 @@
             while items < len(program_counters):
                 self.increment_pc()
                 self.fork_pc()
-                item_count, result = func(*args,
-                                          **{"quantity": len(program_counters) - items})
+                item_count, result = func(quantity=len(program_counters) - items, *args)
                 items += item_count
                 results.append(result)
                 self.unfork_pc()