.
This commit is contained in:
@@ -29,7 +29,7 @@ suspend_on_finish = False
|
|||||||
solve = True
|
solve = True
|
||||||
# time_to_run = 508500
|
# time_to_run = 508500
|
||||||
# time_to_run = 2660000
|
# time_to_run = 2660000
|
||||||
time_to_run = 60 * 10
|
time_to_run = 60 * 1
|
||||||
# allow = 5000
|
# allow = 5000
|
||||||
ratio = 0.01
|
ratio = 0.01
|
||||||
# ratio = 0.9
|
# ratio = 0.9
|
||||||
@@ -335,6 +335,7 @@ if load_leave:
|
|||||||
# Rota.build_model()
|
# Rota.build_model()
|
||||||
|
|
||||||
solver_options = {"ratio": ratio, "seconds": time_to_run, "threads": 10}
|
solver_options = {"ratio": ratio, "seconds": time_to_run, "threads": 10}
|
||||||
|
solver_options = {"ratio": ratio, "seconds": time_to_run, }
|
||||||
|
|
||||||
#start_time = time.time()
|
#start_time = time.time()
|
||||||
Rota.build_and_solve(solver_options, export=True)
|
Rota.build_and_solve(solver_options, export=True)
|
||||||
|
|||||||
+6
-2
@@ -325,7 +325,7 @@ class RotaBuilder(object):
|
|||||||
try:
|
try:
|
||||||
console.print("Solving")
|
console.print("Solving")
|
||||||
|
|
||||||
log_file = f"{self.name}_{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}.log"
|
log_file = f"logs/{self.name}_{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}.log"
|
||||||
if use_neos:
|
if use_neos:
|
||||||
solver_manager = SolverManagerFactory("neos") # Solve using neos server
|
solver_manager = SolverManagerFactory("neos") # Solve using neos server
|
||||||
# results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log")
|
# results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log")
|
||||||
@@ -2902,7 +2902,11 @@ class RotaBuilder(object):
|
|||||||
return self.start_date + datetime.timedelta(weeks=week)
|
return self.start_date + datetime.timedelta(weeks=week)
|
||||||
|
|
||||||
# RESULTS
|
# RESULTS
|
||||||
def export_rota_to_html(self, filename: str = "rota", folder=None):
|
def export_rota_to_html(self, filename: str = "rota", folder=None, timestamp_filename=True):
|
||||||
|
if timestamp_filename:
|
||||||
|
filename = f"{filename}_{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}"
|
||||||
|
|
||||||
|
|
||||||
if folder is not None:
|
if folder is not None:
|
||||||
output_file = Path("output", folder, f"{filename}.html")
|
output_file = Path("output", folder, f"{filename}.html")
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user