config: Use gurobi instead of gurobi_persistent

The memory requirements of gurobi_persistent are significantly higher! Trade cpu
speed with memory.
This commit is contained in:
Jonas Hörsch 2018-03-09 15:43:55 +01:00
parent e27db0f462
commit 254ef948e5
2 changed files with 4 additions and 3 deletions

View File

@ -142,9 +142,10 @@ def partition(w):
def memory(w):
if w.clusters.endswith('m'):
return 61000
return 18000 + 180 * int(w.clusters[:-1])
else:
return 4890+310 * int(w.clusters)
return 8000 + 190 * int(w.clusters)
# return 4890+310 * int(w.clusters)
rule solve_network:
input: "networks/{network}_s{simpl}_{clusters}_lv{lv}_{opts}.nc"

View File

@ -129,7 +129,7 @@ solving:
# max_iterations: 1
# nhours: 10
solver:
name: gurobi_persistent
name: gurobi
threads: 4
method: 2
crossover: 0 # -1 (Choose freely)