Added fives searcher

Author: mgold

fibo.py

@@ -2,7 +2,7 @@
 total = 0
 while l[-1] < 4000000:
     l.append(l[-1] + l[-2])
-l.pop();
+l.pop()
 
 for n in l:
     if not n%2:

fives.py

@@ -0,0 +1,31 @@
+def add (a, b):
+    return a + b
+
+def subtract (a, b):
+    return a - b
+
+def multiply (a, b):
+    return a * b
+
+def divide (a, b):
+    if b == 0:
+        return None
+    else:
+        return a/b
+
+def search (depth):
+    """Returns a dictionary whose keys are integers and whose values are the
+    minumum number of 5s needed to make the key using +-*/."""
+    results = {5:1}
+    newresults = {}
+    for i in range(depth):
+        for k1, v1 in results.iteritems():
+            for k2, v2 in results.iteritems():
+                for f in [add, subtract, multiply, divide]:
+                    newkey = f(k1, k2)
+                    newval = v1 + v2
+                    if not newkey in results and newkey != None and (not newkey in newresults or newresults[newkey] > newval) and newval<=depth: 
+                        newresults[newkey] = newval
+
+        results = dict(newresults.items() + results.items())
+    print results.items()

fives.pyc

@@ -1,17 +1,3 @@
-import primes
+import fives
 
-def sumPrimePowers(STOP):
-    A = int(STOP**0.5)+1
-    B = int(STOP**(1.0/3.0))+1
-    C = int(STOP**0.25)+1
-    P = primes.first(A)
-    Results = set([])
-    for a in range(A):
-        for b in range(B):
-            for c in range(C):
-                n = P[a]**2 + P[b]**3 + P[c]**4
-                if n < STOP:
-                    Results.add(n)
-    return len(Results)
-
-print sumPrimePowers(5000000)
+print fives.search(5)