diff --git a/ilp_measurement.py b/ilp_measurement.py index beebcd95f0e8384a2c53aee8f428a3d744895b50..d806ec51e90373e1e53179d8c2409cf0e1b3cad6 100644 --- a/ilp_measurement.py +++ b/ilp_measurement.py @@ -88,7 +88,7 @@ def dirname(d): @task(name = 'sol') def sol(number = 1, solver = 'glpsol', pathname = '*', skip_conflate = False): """ Run solver n times (default: once) """ - do_sol(int(number), pathname, skip_conflate) + do_sol(solver, int(number), pathname, skip_conflate) params = { 'glpsol' : ['glpsol --tmlim 40 --lp {lp} -w {sol}', 'INTEGER OPTIMAL SOLUTION FOUND', 'Time used:[\s]*(.*?) secs', '(\d+) rows, (\d+) columns, (\d+) non-zeros'], 'gurobi' : ['gurobi_cl ResultFile={sol} {lp}', 'Optimal solution found', 'in (.*?) seconds', 'Optimize a model with (\d+) rows, (\d+) columns and (\d+) nonzeros']}