viff

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 diff
     1.1 --- a/viff/active.py	Thu Oct 08 15:25:15 2009 +0200
     1.2 +++ b/viff/active.py	Fri Oct 09 11:00:12 2009 +0200
     1.3 @@ -382,7 +382,7 @@
     1.4          result.addCallback(lambda triples: triples[0])
     1.5          return result
     1.6  
     1.7 -    def generate_triples(self, field, quantity):
     1.8 +    def generate_triples(self, field, quantity=None):
     1.9          """Generate multiplication triples.
    1.10  
    1.11          These are random numbers *a*, *b*, and *c* such that ``c =
     2.1 --- a/viff/runtime.py	Thu Oct 08 15:25:15 2009 +0200
     2.2 +++ b/viff/runtime.py	Fri Oct 09 11:00:12 2009 +0200
     2.3 @@ -831,8 +831,7 @@
     2.4              while items < len(program_counters):
     2.5                  self.increment_pc()
     2.6                  self.fork_pc()
     2.7 -                item_count, result = func(*args,
     2.8 -                                          **{"quantity": len(program_counters) - items})
     2.9 +                item_count, result = func(quantity=len(program_counters) - items, *args)
    2.10                  items += item_count
    2.11                  results.append(result)
    2.12                  self.unfork_pc()