use GLPK to solve the FES problem

faustedition · Mar 4, 2019 · e197df3 · e197df3
1 parent 95d0853
commit e197df3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/setup.py b/setup.py
@@ -27,7 +27,8 @@
                 'colorlog',
                 'tqdm',
                 'dataclasses',
-                'cvxpy'
+                'cvxpy',
+                'cvxopt'   # just used to pull in GLPK
         ],
         entry_points={
             'console_scripts': ['macrogen=macrogen.main:main']

diff --git a/src/macrogen/etc/default.yaml b/src/macrogen/etc/default.yaml
@@ -21,13 +21,10 @@ render_node_limit: 1000
 fes_method: baharev   # ip, baharev: exact methods; eades: inexact, list of two: select by fes_threshold
 fes_threshold: 64     # if two fes_methods, number of edges above which to select the second one
 solvers:              # the first installed solver is chosen. see log message for values.
-  - GUROBI
-  - auto              # auto = let CVXPY choose
+  - GLPK_MI
 solver_options:
   all:
-    max_iters: 10000
-
-
+    verbose: false
 ## Other data
 namespaces:
   f: http://www.faustedition.net/ns

diff --git a/src/macrogen/etc/logging.yaml b/src/macrogen/etc/logging.yaml
@@ -16,15 +16,15 @@ root:
   level: WARNING
 
 loggers:
-  macrogen.visualize:
-    level: INFO
+#  macrogen.visualize:
+#    level: INFO
   macrogen.fes:
     level: DEBUG
-  macrogen.graph:
-    level: DEBUG
+#  macrogen.graph:
+#    level: DEBUG
 #  macrogen.uris:
 #    level: INFO
 #  macrogen.datings:
 #    level: INFO
-  macrogen.config:
-    level: INFO
+#  macrogen.config:
+#    level: INFO
diff --git a/src/macrogen/fes.py b/src/macrogen/fes.py
@@ -243,8 +243,8 @@ def solve(self):
                                problem.solver_stats.solver_name)
             logger.debug("Solved optimization problem with %d constraints: %s -> %s (%g + %g seconds, %d iterations, solver %s)",
                          len(constraints), resolution, problem.solution.status,
-                         problem.solver_stats.solve_time, problem.solver_stats.setup_time or 0,
-                         problem.solver_stats.num_iters, problem.solver_stats.solver_name)
+                         problem.solver_stats.solve_time or 0, problem.solver_stats.setup_time or 0,
+                         problem.solver_stats.num_iters or 0, problem.solver_stats.solver_name)
             current_solution = np.abs(y.value) >= 0.5
             S = self.edges_for_vector(current_solution)
             logger.debug('Iteration %d, resolution: %s, %d feedback edges', iteration, resolution, len(S))