[ADD] Python 0012, CPP updates

nathanrosspowell · Jan 26, 2012 · f14909c · f14909c
1 parent 7c87cb1
commit f14909c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/source/cpp/0012/0012.cpp b/source/cpp/0012/0012.cpp
@@ -73,15 +73,14 @@ int main()
         factors = 1;
         triangleNumber += counter++;
         std::vector< int > node;
-        bool work = true;
         int triCopy = triangleNumber;
-        while( triCopy != 1 && work )
+        while( triCopy != 1 )
         {
             for ( int i = 0, prime = 0; prime = primes.getPrime( i ); ++i )
             {
                 if ( triCopy % prime == 0 )
                 {
-                    triCopy = triCopy / prime;
+                    triCopy /= prime;
                     node.push_back( prime );
                     break;
                 }

diff --git a/source/python/0012/0012.py b/source/python/0012/0012.py
@@ -43,26 +43,25 @@ def getPrime( self, i ):
     counter += 1
     factorList = []
     primeFactors = []
-    primeCount = 0
+    triCopy = triangleNumber
-    while True:
+    while triCopy is not 1:
-        prime = primes.getPrime( primeCount )
+        primeCount = 0
-        primeCount += 1
-        if prime > triangleNumber:
-            break;
-        elif triangleNumber % prime == 0:
-            primeFactors.append( prime )
-    for factor in primeFactors:
-        multiple = 1
         while True:
-            factor = prime * multiple
+            prime = primes.getPrime( primeCount )
-            multiple += 1 
+            primeCount += 1
-            if factor <= triangleNumber:
+            if triCopy % prime == 0:
-                factorList.append( factor )
+                triCopy /= prime
-            else:
+                primeFactors.append( prime )
                 break
-    num = len( set( factorList ) )
+    counts = {}
-    if num >= 500:
+    for factor in primeFactors:
+        if counts.has_key( factor ):
+            counts[ factor ] += 1
+        else:
+            counts[ factor ] = 1
+    num = 1
+    for key, value in counts.items():
+        num *= ( value + 1 )
+    if num > 500:
         break
-    else:
-        print "Fail %d factors %s" % ( triangleNumber, num )
 print triangleNumber