.

gen.py

@@ -27,20 +27,20 @@ from rota.workers import (
 
 suspend_on_finish = True
 solve = True
-time_to_run = 508500
+#time_to_run = 508500
 #time_to_run = 2660000
-time_to_run = 400
-# allow = 5000
+time_to_run = 5000
+#allow = 5000
 ratio = 0.01
 #ratio = 0.9
 
 
-start_date = datetime.date(2023, 3, 6)
+start_date = datetime.date(2023, 9, 4)
 #start_date = datetime.date(2023, 5, 1)
 #start_date = start_date + datetime.timedelta(weeks=13)
 # start_date = datetime.date(2022, 10, 10)
 
-Rota = RotaBuilder(start_date, weeks_to_rota=26, balance_offset_modifier=1)
+Rota = RotaBuilder(start_date, weeks_to_rota=14, balance_offset_modifier=1)
 #Rota = RotaBuilder(start_date, weeks_to_rota=20, balance_offset_modifier=1)
 Rota.constraint_options["balance_weekends"] = True
 Rota.constraint_options["max_night_frequency"] = 3 # 3
@@ -104,8 +104,8 @@ Rota.add_shifts(
         length=12.5,
         days=days[4:],
         balance_offset=3,
-        rota_on_nwds=True,
-        force_as_block=True,
+        rota_on_nwds=False,
+        assign_as_block=True,
         constraint=[{"name": "pre", "options": 2}, {"name": "post", "options": 2}],
         # force_as_block_unless_nwd=True
     ),
@@ -260,7 +260,7 @@ if load_leave:
             for dates in oop.split(","):
                 s, e = dates.split("-")
                 formatted_oops.append(
-                    {"start_date": datetime.datetime.strptime(s, "%d/%m/%y").date(), "end_date": datetime.datetime.strptime(e, "%d/%m/%y").date()}
+                    {"start_date": datetime.datetime.strptime(s.strip(), "%d/%m/%y").date(), "end_date": datetime.datetime.strptime(e.strip(), "%d/%m/%y").date()}
                 )
 
             oop = formatted_oops
@@ -330,7 +330,7 @@ solver_options = {"ratio": ratio, "seconds": time_to_run, "threads": 10}
 
 start_time = time.time()
 Rota.build_and_solve(solver_options)
-#Rota.solve_shifts_by_block(solver_options, block_length=10)
+#Rota.solve_shifts_by_block(solver_options, block_length=13)
 #Rota.solve_shifts_individually(solver_options)
 # Rota.solve_model(options=solver_options)
 end_time = time.time()

leave.py

@@ -21,7 +21,7 @@ def load_leave(Rota):
             "Pragma": "no-cache"
         }
 
-        download = s.get("https://docs.google.com/spreadsheets/d/e/2PACX-1vR18crGluN4wrL9n1sBdZ2u-JsvaLtQ6hr-R5CPUBOaKpL7_hBbhemyPSrFOhDuWxKlrjh-QUM0HrcD/pub?gid=0&single=true&output=csv", headers=headers)
+        download = s.get("https://docs.google.com/spreadsheets/d/e/2PACX-1vTQBxt0mHoVS1D5EkQcrekqGveWyTG2MCMyV1NnrSWkptqWbdI6_myaeLT1vpbkbujXJqU6Z5nrzTh9/pub?gid=0&single=true&output=csv", headers=headers)
         decoded_content = download.content.decode('utf-8')
 
         reader = csv.reader(decoded_content.splitlines(), delimiter=',')
@@ -125,17 +125,26 @@ def load_leave(Rota):
                 elif re.match(date_re, row_title) is not None:
 
                     if lower_item != "":
-                        date = datetime.strptime(row[0], "%d/%m/%y").date()
-                        # This may be easier to do as a dict
-                        if lower_item in shifts:
-                            worker["requests"].append(WorkRequests(date=date, shift=lower_item))
+                        try:
+                            try:
+                                date = datetime.strptime(row[0], "%d/%m/%y").date()
+                            except ValueError:
+                                date = datetime.strptime(row[0], "%d/%m/%Y").date()
+                            # This may be easier to do as a dict
+                            if lower_item in shifts:
+                                worker["requests"].append(WorkRequests(date=date, shift=lower_item))
 
-                        elif lower_item in ("work_request", "happy to work"):
-                            worker["requests"].append(WorkRequests(date=date, shift="*"))
+                            elif lower_item in ("work_request", "happy to work"):
+                                worker["requests"].append(WorkRequests(date=date, shift="*"))
 
 
-                        else:
-                            worker["leave"].append(NotAvailableToWork(date=date, reason=lower_item))
+                            else:
+                                worker["leave"].append(NotAvailableToWork(date=date, reason=lower_item))
+                        except ValueError as e:
+                            print(f"Error with: {lower_item}")
+                            print(f"{row=}")
+                            raise e
+
 
             n = n + 1
 

rota/shifts.py

@@ -73,6 +73,7 @@ VALID_SHIFT_CONSTRAINTS = Literal[
     "limit_grade_number",
     "minimum_grade_number",
     "max_shifts_per_week",
+    "max_shifts_per_week_block",
     "require_remote_site_presence",
     "require_remote_site_presence_week",
 ]
@@ -306,7 +307,7 @@ class RotaBuilder(object):
     ):
         console.print("Setting up solver")
 
-        solver = "scip"
+        #solver = "scip"
 
         if solver == "scip":
             self.opt = SolverFactory(solver, executable="scip")