job-shop-lib 1.6.0__tar.gz → 1.6.1__tar.gz

{job_shop_lib-1.6.0 → job_shop_lib-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: job-shop-lib
-Version: 1.6.0
+Version: 1.6.1
 Summary: An easy-to-use and modular Python library for the Job Shop Scheduling Problem (JSSP)
 License: MIT
 Author: Pabloo22
@@ -17,8 +17,7 @@ Requires-Dist: imageio[ffmpeg] (>=2.34.1,<3.0.0)
 Requires-Dist: matplotlib (>=3,<4)
 Requires-Dist: networkx (>=3,<4)
 Requires-Dist: numpy (>=1.26.4,<3.0.0)
-Requires-Dist: ortools (>=9.9,<10.0) ; sys_platform != "darwin"
-Requires-Dist: ortools (>=9.9,<9.13) ; sys_platform == "darwin"
+Requires-Dist: ortools (>=9.9,<9.13)
 Requires-Dist: pyarrow (>=15,<21)
 Requires-Dist: pygraphviz (>=1.12,<2.0) ; extra == "pygraphviz"
 Requires-Dist: simanneal (>=0.5.0,<0.6.0)

{job_shop_lib-1.6.0 → job_shop_lib-1.6.1}/job_shop_lib/__init__.py

@@ -19,7 +19,7 @@ from job_shop_lib._schedule import Schedule
 from job_shop_lib._base_solver import BaseSolver, Solver
 
 
-__version__ = "1.6.0"
+__version__ = "1.6.1"
 
 __all__ = [
     "Operation",

{job_shop_lib-1.6.0 → job_shop_lib-1.6.1}/job_shop_lib/_schedule.py

@@ -405,10 +405,15 @@ class Schedule:
         critical_path = deque([last_scheduled_op])
         current_scheduled_op = last_scheduled_op
 
+        machine_op_index = {}
+        for machine_id, schedule_list in enumerate(self.schedule):
+            machine_op_index[machine_id] = {op: idx for idx, op in
+                                            enumerate(schedule_list)}
+
         # 2. Trace backwards from the last operation
         while True:
-            job_pred = None
-            machine_pred = None
+            job_pred: ScheduledOperation | None = None
+            machine_pred: ScheduledOperation | None = None
 
             # Find job predecessor (the previous operation in the same job)
             op_idx_in_job = current_scheduled_op.operation.position_in_job
@@ -423,9 +428,13 @@ class Schedule:
             # Find machine predecessor (the previous operation on the same
             # machine)
             machine_schedule = self.schedule[current_scheduled_op.machine_id]
-            op_idx_on_machine = machine_schedule.index(current_scheduled_op)
+            op_idx_on_machine = (
+                machine_op_index
+                [current_scheduled_op.machine_id][current_scheduled_op])
             if op_idx_on_machine > 0:
-                machine_pred = machine_schedule[op_idx_on_machine - 1]
+                machine_pred = machine_schedule[
+                    op_idx_on_machine - 1
+                ]
 
             # 3. Determine the critical predecessor
             # The critical predecessor is the one that finished latest, as it

{job_shop_lib-1.6.0 → job_shop_lib-1.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "job-shop-lib"
-version = "1.6.0"
+version = "1.6.1"
 description = "An easy-to-use and modular Python library for the Job Shop Scheduling Problem (JSSP)"
 authors = ["Pabloo22 <pablete.arino@gmail.com>"]
 license = "MIT"
@@ -10,10 +10,7 @@ include = ["job_shop_lib/benchmarking/benchmark_instances.json", "job_shop_lib/p
 
 [tool.poetry.dependencies]
 python = "^3.10"
-ortools = [
-    { version = "^9.9", markers = "sys_platform != 'darwin'" },
-    { version = ">=9.9,<9.13", markers = "sys_platform == 'darwin'" }
-]
+ortools = ">=9.9,<9.13"
 matplotlib = "^3"
 pyarrow = ">=15,<21"  # An optional pandas' dependency that will be required in the future
 networkx = "^3"