Changeset 286 for trunk

Timestamp:

04/27/09 23:04:26 (3 years ago)

Author:

ocjhb

Message:

wallet is now using the coinsplitting tokenizer

Location:

trunk/sandbox/jhb/oc2

Files:

• coinsplitting.py (modified) (2 diffs)
• wallet.py (modified) (2 diffs)

trunk/sandbox/jhb/oc2/coinsplitting.py

@@ -4 +4 @@
     tokens = []
     i = 0
+    max_i = len(denominations)
     while sum(tokens)<amount:
-        if i>=len(denominations):
-            i = len(denominations) -1
+        if i>=max_i:
+            i = max_i -1
         d = denominations[i]
         rest = amount - sum(tokens)
         if d == 1:
-            #print 'append %s' % d
             tokens.append(1)
             i +=1
         elif d <= rest-d + denominations[i-1]+1:
-            #print 'append %s' % d
             tokens.append(d)
             i +=1
@@ -30 +29 @@
             picked.append(token)
     return picked            
-
-dl = [[1,2,5,10,20,50,100],[1,3,9,27],[1,3,5,7,11,13,17,19,23],[1,17,33]]
-dl = dl[0:1]
-problems = 0
-for denominations in dl:
-    print 'DENOMINATIONS %s' % denominations
+if __name__ == '__main__':
+    dl = [[1,2,5,10,20,50,100],[1,3,9,27],[1,3,5,7,11,13,17,19,23],[1,17,33]]
+    problems = 0
+    for denominations in dl:
+        print 'DENOMINATIONS %s' % denominations
+        print
+        for i in range(1,max(denominations)*10):
+            print 'Tokenize %i, ' % i,
+            tokens = tokenizer(denominations,i)
+            print 'tokens %s (%s)' % (tokens,sum(tokens))
+            if sum(tokens) != i:
+                print 'fuckup'
+                break;
+            for j in range(1,i+1):
+                picked = testspend(tokens,j)
+                if sum(picked) != j:
+                    problems += 1
+                    print 'testing: %s, picked %s, sum %s, worked: %s' % (j,picked,sum(picked),sum(picked)==j)
     print
-    for i in range(1,max(denominations)*2):
-        print 'Tokenize %i, ' % i,
-        tokens = tokenizer(denominations,i)
-        print 'tokens %s (%s)' % (tokens,sum(tokens))
-        if sum(tokens) != i:
-            print 'fuckup'
-            break;
-        for j in range(1,i+1):
-            picked = testspend(tokens,j)
-            if sum(picked) != j:
-                problems += 1
-                print 'testing: %s, picked %s, sum %s, worked: %s' % (j,picked,sum(picked),sum(picked)==j)
-print
-print
-print 'Problems: %s' % problems
-                
-
+    print
+    print 'Problems: %s' % problems
+                    
+    amount = 137
+    print tokenizer(dl[0],amount)

trunk/sandbox/jhb/oc2/wallet.py

@@ -4 +4 @@
 import occrypto
 import messages
+import coinsplitting
 
 class Wallet(Entity):
@@ -166 +167 @@
     def deleteCurrency(self,id):
         del(self.storage[id])
-
-
+    
     def tokenizeForBuying(self,amount,denominations):
-        denominations = [int(d) for d in denominations]
-        denominations.sort()
-        denominations.reverse()
-
-        out = []
-        for d in denominations:
-            while amount and amount >= d:
-                out.append(d)
-                amount -= d
-        return out                
+        return coinsplitting.tokenizer([int(d) for d in denominations],amount)