optional import linear programming

gcr-solutions · Feb 24, 2018 · b881a59 · b881a59
1 parent d9b4154
commit b881a59
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/algorithms/linear_programming.py b/algorithms/linear_programming.py
@@ -1,7 +1,11 @@
 from .base_algorithm import *
-from cvxopt import matrix, glpk, solvers
 from itertools import chain, combinations
-from numpy import concatenate, eye, float, full, ones, vstack, zeros
+try:
+    from cvxopt import matrix, glpk, solvers
+    from numpy import concatenate, eye, float, full, ones, vstack, zeros
+except ImportError:
+    import warnings
+    warnings.warn('cvxopt/numpy import failed: linear programming will not work')
 
 
 class LinearProgramming(BaseAlgorithm):

diff --git a/algorithms/local_optimization.py b/algorithms/local_optimization.py
@@ -25,7 +25,7 @@ def pairwise_exchange(self, ga_solution=None):
                         tours.append(solution)
                         lengths.append(best)
                         stable = False
-        if ga_solution:  
+        if ga_solution:
             return tours[-1]
         return [self.format_solution(step) for step in tours], lengths
 

diff --git a/flask_app.py b/flask_app.py
@@ -118,5 +118,6 @@ def genetic_algorithm(data):
         session['best'] = length
         emit('draw', ([best], [length]))
 
+
 if __name__ == '__main__':
     socketio.run(app)