fix failing function due to minor inconsistencies between size of cal…

…endar in worker calendar versus the horizon of the problem object.
airbus · Sep 24, 2024 · 11860ec · 11860ec
1 parent bd5fb13
commit 11860ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/discrete_optimization/rcpsp_multiskill/rcpsp_multiskill.py b/discrete_optimization/rcpsp_multiskill/rcpsp_multiskill.py
@@ -3067,7 +3067,9 @@ def create_fake_tasks_multiskills(
 
 def compute_skills_calendar(problem: MS_RCPSPModel):
     skills = problem.skills_set
-    dict_calendar_skills = {s: np.zeros(problem.horizon + 1) for s in skills}
+    some_employee = next(emp for emp in problem.employees)
+    len_calendar = len(problem.employees[some_employee].calendar_employee)
+    dict_calendar_skills = {s: np.zeros(len_calendar) for s in skills}
     for emp in problem.employees:
         emp_object = problem.employees[emp]
         for s in emp_object.get_non_zero_skills():

diff --git a/discrete_optimization/rcpsp_multiskill/solvers/cpsat_msrcpsp_solver.py b/discrete_optimization/rcpsp_multiskill/solvers/cpsat_msrcpsp_solver.py
@@ -589,7 +589,9 @@ def constraint_redundant_cumulative_skills(self):
             )
 
     def constraint_redundant_cumulative_worker(self):
-        merged_calendar = np.zeros(self.problem.horizon + 1)
+        some_employee = next(emp for emp in self.problem.employees)
+        len_calendar = len(self.problem.employees[some_employee].calendar_employee)
+        merged_calendar = np.zeros(len_calendar)
         for emp in self.problem.employees:
             merged_calendar += np.array(self.problem.employees[emp].calendar_employee)
         discr_calendar = discretize_calendar_(merged_calendar)