job-shop-lib 1.0.0b2__tar.gz → 1.0.0b3__tar.gz

{job_shop_lib-1.0.0b2 → job_shop_lib-1.0.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: job-shop-lib
-Version: 1.0.0b2
+Version: 1.0.0b3
 Summary: An easy-to-use and modular Python library for the Job Shop Scheduling Problem (JSSP)
 License: MIT
 Author: Pabloo22
@@ -60,7 +60,7 @@ See [this](https://colab.research.google.com/drive/1XV_Rvq1F2ns6DFG8uNj66q_rcoww
 Version 1.0.0 is currently in beta stage and can be installed with:
 
 ```bash
-pip install job-shop-lib==1.0.0b2
+pip install job-shop-lib==1.0.0b3
 ```
 
 Although this version is not stable and may contain breaking changes in subsequent releases, it is recommended to install it to access the new reinforcement learning environments and familiarize yourself with new changes (see the [latest pull requests](https://github.com/Pabloo22/job_shop_lib/pulls?q=is%3Apr+is%3Aclosed)). There is a [documentation page](https://job-shop-lib.readthedocs.io/en/latest/) for versions 1.0.0a3 and onward.
@@ -89,11 +89,7 @@ Although this version is not stable and may contain breaking changes in subseque
   - **Agent-Task Graphs**: Encode instances as agent-task graphs (introduced in [ScheduleNet paper](https://arxiv.org/abs/2106.03051)). See [Agent-Task Graph](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/07-Agent-Task-Graph.ipynb).
   - Build your own custom graphs with the `JobShopGraph` class.
 
-<<<<<<< HEAD
 - **Gymnasium Environments**: Two environments for solving the problem with graph neural networks (GNNs) or any other method, and reinforcement learning (RL). See [SingleJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/09-SingleJobShopGraphEnv.ipynb) and [MultiJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/10-MultiJobShopGraphEnv.ipynb).
-=======
-- **Gymnasium Environments**: Two environments for solving the problem with Graph Neural Networks (GNNs) or any other method, and Reinforcement Learning (RL). See [SingleJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/09-SingleJobShopGraphEnv.ipynb) and [MultiJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/10-MultiJobShopGraphEnv.ipynb).
->>>>>>> 031bdf3 ([Docs] Update links in README to point to the correct GitHub URLs for tutorials and examples)
 
 <!-- end key features -->
 

{job_shop_lib-1.0.0b2 → job_shop_lib-1.0.0b3}/README.md

@@ -36,7 +36,7 @@ See [this](https://colab.research.google.com/drive/1XV_Rvq1F2ns6DFG8uNj66q_rcoww
 Version 1.0.0 is currently in beta stage and can be installed with:
 
 ```bash
-pip install job-shop-lib==1.0.0b2
+pip install job-shop-lib==1.0.0b3
 ```
 
 Although this version is not stable and may contain breaking changes in subsequent releases, it is recommended to install it to access the new reinforcement learning environments and familiarize yourself with new changes (see the [latest pull requests](https://github.com/Pabloo22/job_shop_lib/pulls?q=is%3Apr+is%3Aclosed)). There is a [documentation page](https://job-shop-lib.readthedocs.io/en/latest/) for versions 1.0.0a3 and onward.
@@ -65,11 +65,7 @@ Although this version is not stable and may contain breaking changes in subseque
   - **Agent-Task Graphs**: Encode instances as agent-task graphs (introduced in [ScheduleNet paper](https://arxiv.org/abs/2106.03051)). See [Agent-Task Graph](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/07-Agent-Task-Graph.ipynb).
   - Build your own custom graphs with the `JobShopGraph` class.
 
-<<<<<<< HEAD
 - **Gymnasium Environments**: Two environments for solving the problem with graph neural networks (GNNs) or any other method, and reinforcement learning (RL). See [SingleJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/09-SingleJobShopGraphEnv.ipynb) and [MultiJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/10-MultiJobShopGraphEnv.ipynb).
-=======
-- **Gymnasium Environments**: Two environments for solving the problem with Graph Neural Networks (GNNs) or any other method, and Reinforcement Learning (RL). See [SingleJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/09-SingleJobShopGraphEnv.ipynb) and [MultiJobShopGraphEnv](https://github.com/Pabloo22/job_shop_lib/blob/main/docs/source/examples/10-MultiJobShopGraphEnv.ipynb).
->>>>>>> 031bdf3 ([Docs] Update links in README to point to the correct GitHub URLs for tutorials and examples)
 
 <!-- end key features -->
 

{job_shop_lib-1.0.0b2 → job_shop_lib-1.0.0b3}/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.0.0-b.2"
+__version__ = "1.0.0-b.3"
 
 __all__ = [
     "Operation",

{job_shop_lib-1.0.0b2 → job_shop_lib-1.0.0b3}/job_shop_lib/graphs/__init__.py

@@ -8,9 +8,9 @@ The main classes and functions available in this package are:
     NodeType
     build_disjunctive_graph
     build_solved_disjunctive_graph
-    build_agent_task_graph
-    build_complete_agent_task_graph
-    build_agent_task_graph_with_jobs
+    build_resource_task_graph
+    build_complete_resource_task_graph
+    build_resource_task_graph_with_jobs
 
 """
 

{job_shop_lib-1.0.0b2 → job_shop_lib-1.0.0b3}/job_shop_lib/reinforcement_learning/__init__.py

@@ -12,6 +12,7 @@
     IdleTimeReward
     RenderConfig
     add_padding
+    create_edge_type_dict
 
 """
 
@@ -27,7 +28,10 @@ from job_shop_lib.reinforcement_learning._reward_observers import (
     IdleTimeReward,
 )
 
-from job_shop_lib.reinforcement_learning._utils import add_padding
+from job_shop_lib.reinforcement_learning._utils import (
+    add_padding,
+    create_edge_type_dict,
+)
 
 from job_shop_lib.reinforcement_learning._single_job_shop_graph_env import (
     SingleJobShopGraphEnv,
@@ -47,4 +51,5 @@ __all__ = [
     "ObservationDict",
     "add_padding",
     "MultiJobShopGraphEnv",
+    "create_edge_type_dict",
 ]

{job_shop_lib-1.0.0b2 → job_shop_lib-1.0.0b3}/job_shop_lib/reinforcement_learning/_utils.py

@@ -1,6 +1,6 @@
 """Utility functions for reinforcement learning."""
 
-from typing import TypeVar, Any, Tuple, Optional, Type
+from typing import TypeVar, Any, Type, Literal
 
 import numpy as np
 from numpy.typing import NDArray
@@ -12,9 +12,9 @@ T = TypeVar("T", bound=np.number)
 
 def add_padding(
     array: NDArray[Any],
-    output_shape: Tuple[int, ...],
+    output_shape: tuple[int, ...],
     padding_value: float = -1,
-    dtype: Optional[Type[T]] = None,
+    dtype: Type[T] | None = None,
 ) -> NDArray[T]:
     """Adds padding to the array.
 
@@ -90,6 +90,42 @@ def add_padding(
     return padded_array
 
 
+def create_edge_type_dict(
+    edge_index: NDArray[T], type_ranges: dict[str, tuple[int, int]]
+) -> dict[tuple[str, Literal["to"], str], NDArray[T]]:
+    """Organizes edges based on node types.
+
+    Args:
+        edge_index:
+            numpy array of shape (2, E) where E is number of edges
+        type_ranges: dict[str, tuple[int, int]]
+            Dictionary mapping type names to their corresponding index ranges
+            [start, end) in the ``edge_index`` array.
+
+    Returns:
+        A dictionary with keys (type_i, "to", type_j) and values as edge
+        indices
+    """
+    edge_index_dict: dict[tuple[str, Literal["to"], str], NDArray] = {}
+    for type_name_i, (start_i, end_i) in type_ranges.items():
+        for type_name_j, (start_j, end_j) in type_ranges.items():
+            key: tuple[str, Literal["to"], str] = (
+                type_name_i,
+                "to",
+                type_name_j,
+            )
+            # Find edges where source is in type_i and target is in type_j
+            mask = (
+                (edge_index[0] >= start_i)
+                & (edge_index[0] < end_i)
+                & (edge_index[1] >= start_j)
+                & (edge_index[1] < end_j)
+            )
+            edge_index_dict[key] = edge_index[:, mask]
+
+    return edge_index_dict
+
+
 if __name__ == "__main__":
     import doctest
 

{job_shop_lib-1.0.0b2 → job_shop_lib-1.0.0b3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "job-shop-lib"
-version = "1.0.0-beta.2"
+version = "1.0.0-beta.3"
 description = "An easy-to-use and modular Python library for the Job Shop Scheduling Problem (JSSP)"
 authors = ["Pabloo22 <pablete.arino@gmail.com>"]
 license = "MIT"