diff --git a/test.py b/test.py index 79b48cd..a84eea3 100644 --- a/test.py +++ b/test.py @@ -17,12 +17,12 @@ import datetime import itertools import operator -use_neos = False +use_neos = True weeks_to_rota = 26 -time_to_run = 152000 -allow = 8000 +time_to_run = 28500 +#allow = 1000 sites = ("truro", "exeter", "torquay", "barnstaple", "plymouth") @@ -301,21 +301,22 @@ Rota.build_model() #print(Rota.get_worker_details()) print("Setting up solver") -opt = SolverFactory('cbc') # choose a solver +opt = SolverFactory('cplex') # choose a solver #opt = SolverFactory('ipopt') # choose a solver print("Solving") if use_neos: solver_manager = SolverManagerFactory('neos') # Solve in neos server - results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log") + #results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log") + results = solver_manager.solve(Rota.model, keepfiles=True, tee=True, opt=opt, logfile="test.log") else: results = opt.solve( Rota.model, tee=True, options={ "seconds": time_to_run, - "allow": allow, - "threads": 4, + #"allow": allow, + "threads": 2, }, logfile="test.log" ) # solve the model with the, options="seconds=60" selected solver