Made project more friendly to non-linux peeps

TedBrookings · Feb 13, 2017 · 1a24b3c · 1a24b3c
1 parent 33fbc76
commit 1a24b3c
Show file tree

Hide file tree

Showing 46 changed files with 15 additions and 17 deletions.
diff --git a/ToDo.txt b/ToDo.txt
@@ -7,9 +7,5 @@ Do more problems
 
 Make all euler functions return answer so that verified answers can be used in
   unit tests
-  -Need to rename problem files to start with a letter, since python has
-   trouble importing files whose name starts with a number
 
-Make all problem files use argparse to pass arguments
-
-In the future, always unit tests first
+Make all problem files use argparse to pass arguments
diff --git a/__init__.py b/__init__.py
diff --git a/001.py → euler001.py b/001.py → euler001.py
diff --git a/002.py → euler002.py b/002.py → euler002.py
diff --git a/003.py → euler003.py b/003.py → euler003.py
diff --git a/004.py → euler004.py b/004.py → euler004.py
diff --git a/005.py → euler005.py b/005.py → euler005.py
diff --git a/006.py → euler006.py b/006.py → euler006.py
diff --git a/007.py → euler007.py b/007.py → euler007.py
diff --git a/008.py → euler008.py b/008.py → euler008.py
diff --git a/009.py → euler009.py b/009.py → euler009.py
diff --git a/010.py → euler010.py b/010.py → euler010.py
diff --git a/011.py → euler011.py b/011.py → euler011.py
diff --git a/012.py → euler012.py b/012.py → euler012.py
diff --git a/013.py → euler013.py b/013.py → euler013.py
diff --git a/014.py → euler014.py b/014.py → euler014.py
diff --git a/015.py → euler015.py b/015.py → euler015.py
diff --git a/016.py → euler016.py b/016.py → euler016.py
diff --git a/017.py → euler017.py b/017.py → euler017.py
diff --git a/018.py → euler018.py b/018.py → euler018.py
diff --git a/019.py → euler019.py b/019.py → euler019.py
diff --git a/020.py → euler020.py b/020.py → euler020.py
diff --git a/021.py → euler021.py b/021.py → euler021.py
diff --git a/022.py → euler022.py b/022.py → euler022.py
diff --git a/023.py → euler023.py b/023.py → euler023.py
diff --git a/024.py → euler024.py b/024.py → euler024.py
diff --git a/025.py → euler025.py b/025.py → euler025.py
diff --git a/026.py → euler026.py b/026.py → euler026.py
diff --git a/027.py → euler027.py b/027.py → euler027.py
diff --git a/028.py → euler028.py b/028.py → euler028.py
diff --git a/029.py → euler029.py b/029.py → euler029.py
diff --git a/030.py → euler030.py b/030.py → euler030.py
diff --git a/031.py → euler031.py b/031.py → euler031.py
diff --git a/032.py → euler032.py b/032.py → euler032.py
diff --git a/033.py → euler033.py b/033.py → euler033.py
diff --git a/034.py → euler034.py b/034.py → euler034.py
diff --git a/035.py → euler035.py b/035.py → euler035.py
diff --git a/036.py → euler036.py b/036.py → euler036.py
diff --git a/037.py → euler037.py b/037.py → euler037.py
diff --git a/038.py → euler038.py b/038.py → euler038.py
diff --git a/039.py → euler039.py b/039.py → euler039.py
diff --git a/040.py → euler040.py b/040.py → euler040.py
diff --git a/041.py → euler041.py b/041.py → euler041.py
diff --git a/042.py → euler042.py b/042.py → euler042.py
diff --git a/067.py → euler067.py b/067.py → euler067.py
diff --git a/euler.py → run_euler.py b/euler.py → run_euler.py
@@ -3,6 +3,8 @@
 
 import os
 import time
+import euler
+import pkgutil
 
 
 _colors = {
@@ -40,18 +42,18 @@ def isEulerFile(f):
 
 
 def runAllEuler(eulerDir, exeColor='boldYellow', scriptColor='white'):
-  dirList = os.listdir(eulerDir)
-  dirList.sort()
-  timeCmd = '/usr/bin/time -f "\tElapsedTime: %U"'
-  for f in dirList:
-    if isEulerFile(f):
-      # execute the script
-      print(_colors[exeColor] + 'executing %s' % f + _colors[scriptColor])
-      os.system(timeCmd + ' ' + os.path.join(eulerDir, f))
-      print(_colors['endColor'])
-      
-
-
+  for importer, moduleName, ispackage in pkgutil.iter_modules(euler.__path__):
+    if not moduleName.startswith('euler'):
+      continue
+    print(_colors[exeColor] + 'executing %s' % moduleName + _colors[scriptColor])
+    funcName = 'euler' + str( int( moduleName[-3:]))
+    module = importer.find_module(moduleName).load_module(moduleName)
+    func = getattr( module, funcName )
+    startTime = time.time()
+    func()
+    endTime = time.time()
+    print( 'Completed in %.1f seconds' % (endTime - startTime) )
+    print(_colors['endColor'])
 
 
 if __name__ == "__main__":