job-shop-lib 1.1.3__tar.gz → 1.2.0__tar.gz

{job_shop_lib-1.1.3 → job_shop_lib-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: job-shop-lib
-Version: 1.1.3
+Version: 1.2.0
 Summary: An easy-to-use and modular Python library for the Job Shop Scheduling Problem (JSSP)
 License: MIT
 Author: Pabloo22

{job_shop_lib-1.1.3 → job_shop_lib-1.2.0}/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.1.3"
+__version__ = "1.2.0"
 
 __all__ = [
     "Operation",

{job_shop_lib-1.1.3 → job_shop_lib-1.2.0}/job_shop_lib/dispatching/__init__.py

@@ -24,6 +24,7 @@ Problem step-by-step.
     get_matrix_setup_time_calculator
     get_breakdown_calculator
     get_job_dependent_setup_calculator
+    get_arrival_calculator
 
 Dispatching refers to the decision-making process of selecting which job
 should be processed next on a particular machine when that machine becomes
@@ -53,6 +54,7 @@ from ._start_time_calculators import (
     get_breakdown_calculator,
     get_job_dependent_setup_calculator,
     get_matrix_setup_time_calculator,
+    get_arrival_calculator,
 )
 from ._dispatcher_observer_config import DispatcherObserverConfig
 from ._factories import (
@@ -84,4 +86,5 @@ __all__ = [
     "get_matrix_setup_time_calculator",
     "get_breakdown_calculator",
     "get_job_dependent_setup_calculator",
+    "get_arrival_calculator",
 ]

{job_shop_lib-1.1.3 → job_shop_lib-1.2.0}/job_shop_lib/dispatching/_start_time_calculators.py

@@ -193,3 +193,52 @@ def get_job_dependent_setup_calculator(
         return default_start + setup_time
 
     return calculator
+
+
+def get_arrival_calculator(
+    arrival_times: Sequence[Sequence[int]] | NDArray[np.integer] | None = None,
+) -> StartTimeCalculator:
+    """Returns a start time calculator that respects operation arrival times.
+
+    This calculator uses a predefined matrix of arrival times to
+    ensure that no operation begins before its specified arrival
+    time. If the ``arrival_times`` matrix isn't provided directly,
+    the calculator attempts to retrieve it from the dispatcher's
+    instance metadata using the key ``"arrival_times_matrix"``.
+
+    Args:
+        arrival_times:
+            A 2D matrix where ``arrival_times[i][j]`` is the
+            arrival time for the operation at index ``j`` of
+            job ``i``. If ``None``, the calculator will
+            attempt to retrieve it from the dispatcher metadata.
+
+    Returns:
+        A start time calculator function that uses the arrival times.
+
+    Example:
+        >>> arrival_calc = get_arrival_calculator([[0, 2], [1, 0]])
+        >>> dispatcher = Dispatcher(
+        ...     instance, start_time_calculator=arrival_calc
+        ... )
+    """
+
+    def calculator(
+        dispatcher: Dispatcher, operation: Operation, machine_id: int
+    ) -> int:
+        default_start_time = no_setup_time_calculator(
+            dispatcher, operation, machine_id
+        )
+        arrival_matrix = arrival_times
+        if arrival_matrix is None:
+            arrival_matrix = dispatcher.instance.metadata.get(
+                "arrival_times_matrix"
+            )
+        if arrival_matrix is None:
+            return default_start_time
+        operation_arrival_time = arrival_matrix[operation.job_id][
+            operation.position_in_job
+        ]
+        return max(default_start_time, operation_arrival_time)
+
+    return calculator

{job_shop_lib-1.1.3 → job_shop_lib-1.2.0}/job_shop_lib/generation/_instance_generator.py

@@ -1,6 +1,6 @@
 """Home of the `InstanceGenerator` class."""
 
-import abc
+from abc import ABC, abstractmethod
 
 import random
 from typing import Iterator
@@ -9,7 +9,7 @@ from job_shop_lib import JobShopInstance
 from job_shop_lib.exceptions import UninitializedAttributeError
 
 
-class InstanceGenerator(abc.ABC):
+class InstanceGenerator(ABC):
     """Common interface for all generators.
 
     The class supports both single instance generation and iteration over
@@ -75,7 +75,7 @@ class InstanceGenerator(abc.ABC):
         self._current_iteration = 0
         self._iteration_limit = iteration_limit
 
-    @abc.abstractmethod
+    @abstractmethod
     def generate(
         self,
         num_jobs: int | None = None,

{job_shop_lib-1.1.3 → job_shop_lib-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "job-shop-lib"
-version = "1.1.3"
+version = "1.2.0"
 description = "An easy-to-use and modular Python library for the Job Shop Scheduling Problem (JSSP)"
 authors = ["Pabloo22 <pablete.arino@gmail.com>"]
 license = "MIT"
@@ -64,7 +64,7 @@ ipython = "^8.31.0"
 pygraphviz = ["pygraphviz"]
 
 [build-system]
-requires = ["poetry-core"]
+requires = ["poetry-core==1.8.2"]  # Enforces specific Poetry version
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]