.

rota/shifts.py

@@ -191,19 +191,23 @@ class RotaBuilder(object):
         use_shift_balance_extra: bool = False,
         use_bank_holiday_extra: bool = False,
         SHIFT_BOUNDS=SHIFT_BOUNDS,
+        name: str = "",
     ):
 
+        self.name = name
+
         console.print(
             Panel(
                 f"""[white]
 {locals()}
         """,
                 style="green",
-                title="Generating Rota",
+                title=f"Generating Rota: {name}",
             ),
             justify="left",
         )
 
+
         self.SHIFT_BOUNDS = SHIFT_BOUNDS
         self.shifts: List[SingleShift] = []  # type List[SingleShift]
 
@@ -307,13 +311,11 @@ class RotaBuilder(object):
     ):
         console.print("Setting up solver")
 
-        solver = "scip"
-
         if solver == "scip":
             if "seconds" in options:
-                options["limit/time"] = options.pop("seconds")
+                options["limits/time"] = options.pop("seconds")
             if "ratio" in options:
-                options["limit/gap"] = options.pop("ratio")
+                options["limits/gap"] = options.pop("ratio")
             if "threads" in options:
                 options.pop("threads")
             self.opt = SolverFactory(solver, executable="scip")
@@ -322,6 +324,8 @@ class RotaBuilder(object):
 
         try:
             console.print("Solving")
+
+            log_file = f"{self.name}_{datetime.datetime.now().strftime('%Y%m%d-%H%M%S')}.log"
             if use_neos:
                 solver_manager = SolverManagerFactory("neos")  # Solve using neos server
                 # results = solver_manager.solve(Rota.model, opt=opt, logfile="test.log")
@@ -330,7 +334,7 @@ class RotaBuilder(object):
                     keepfiles=True,
                     tee=True,
                     opt=self.opt,
-                    logfile="test.log",
+                    logfile=log_file,
                 )
             else:
                 results = self.opt.solve(
@@ -340,7 +344,7 @@ class RotaBuilder(object):
                     # options={
                     #    "threads": 10,
                     # },
-                    logfile="test.log",
+                    logfile=log_file,
                     keepfiles=True,
                 )
         except KeyboardInterrupt:
@@ -417,6 +421,7 @@ class RotaBuilder(object):
         options={"ratio": 0.1, "seconds": 1000, "threads": 10},
         solve=True,
         debug_if_fail: bool = False,
+        export=False
     ):
 
         self.run_start_time = datetime.datetime.now()
@@ -430,6 +435,9 @@ class RotaBuilder(object):
 
         self.run_end_time = datetime.datetime.now()
 
+        if export:
+            self.export_rota_to_html(self.name)
+
     def build_model(self):
         # Initialize model
         self.model = ConcreteModel()