ross/proc-rota
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update a few things

Browse Source
This commit is contained in:
Ross
2023-05-23 14:48:12 +01:00
parent a444024eaa
commit 3f78ecc671
10 changed files with 290 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rota/shifts.py
+25 -20
View File
@@ -286,7 +286,7 @@ class RotaBuilder(object):
):
console.print("Setting up solver")
solver = "scip"
#solver = "scip"
if solver == "scip":
self.opt = SolverFactory(solver, executable="scip")
@@ -295,23 +295,28 @@ class RotaBuilder(object):
console.print("Solving")
if use_neos:
solver_manager = SolverManagerFactory("neos") # Solve using neos server
# results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log")
results = solver_manager.solve(
self.model, keepfiles=True, tee=True, opt=self.opt, logfile="test.log"
)
else:
results = self.opt.solve(
self.model,
tee=True,
options=options,
# options={
# "threads": 10,
# },
logfile="test.log",
)
try:
console.print("Solving")
if use_neos:
solver_manager = SolverManagerFactory("neos") # Solve using neos server
# results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log")
results = solver_manager.solve(
self.model, keepfiles=True, tee=True, opt=self.opt, logfile="test.log"
)
else:
results = self.opt.solve(
self.model,
tee=True,
options=options,
# options={
# "threads": 10,
# },
logfile="test.log",
keepfiles=True,
)
except KeyboardInterrupt:
return
pass
self.results = results
@@ -321,8 +326,8 @@ class RotaBuilder(object):
console.print(f"Attempting each shift individually")
self.solve_shifts_individually(options)
if not results.solver.status:
sys.exit(0)
#if not results.solver.status:
# sys.exit(0)
def solve_shifts_by_block(self, options, block_length: int, folder="block_shifts"):
shifts = self.shifts