Support ASLIB (#7)

Author: leonlan

pyproject.toml

@@ -8,7 +8,7 @@ dependencies = [
     "jupyterlab>=4.2.5",
     "numpy>=1.26.4",
     "openpyxl>=3.1.5",
-    "pyjobshop[docplex]",
+    "pyjobshop[docplex]>=0.0.7",
 ]
 
 [tool.uv]

read/Problem.py

@@ -19,3 +19,4 @@ class ProblemVariant(str, Enum):
     RCPSP = "RCPSP"
     MMRCPSP = "MMRCPSP"
     RCMPSP = "RCMPSP"
+    ASLIB = "ASLIB"

read/project.py

@@ -1,16 +1,16 @@
 from pathlib import Path
 from .Problem import ProblemVariant
 from .machine import MachineInstance
-from .project import ProjectInstance
+from functools import partial
 
-from pyjobshop import ProblemData
+from pyjobshop import ProblemData, read as _read
 
 
 def read(loc: Path, problem: ProblemVariant) -> ProblemData:
     """
     Reads a problem instance from file and returns a ProblemData instance.
     """
-    parse_methods = {
+    machine_variants = {
         ProblemVariant.JSP: MachineInstance.parse_jsp,
         ProblemVariant.FJSP: MachineInstance.parse_fjsp,
         ProblemVariant.HFSP: MachineInstance.parse_hfsp,
@@ -23,15 +23,21 @@ def read(loc: Path, problem: ProblemVariant) -> ProblemData:
         ProblemVariant.TCT_PFSP: MachineInstance.parse_tct_pfsp,
         ProblemVariant.TT_PFSP: MachineInstance.parse_tt_pfsp,
         ProblemVariant.DPFSP: MachineInstance.parse_dpfsp,
-        # Project scheduling problems have instance-format specific parsers.
-        ProblemVariant.RCPSP: ProjectInstance.parse_patterson,
-        ProblemVariant.MMRCPSP: ProjectInstance.parse_psplib,
-        ProblemVariant.RCMPSP: ProjectInstance.parse_mplib,
     }
+    project_variants = {
+        # Project scheduling problems have instance-format specific parsers,
+        # which are already supported directly by PyJobShop's read function.
+        ProblemVariant.RCPSP: partial(_read, instance_format="patterson"),
+        ProblemVariant.MMRCPSP: partial(_read, instance_format="psplib"),
+        ProblemVariant.RCMPSP: partial(_read, instance_format="psplib"),
+        ProblemVariant.ASLIB: partial(_read, instance_format="aslib"),
+    }
+
+    if problem in machine_variants:
+        instance = machine_variants[problem](loc)
+        return instance.data()
 
-    parse_method = parse_methods.get(problem)
-    if parse_method is None:
-        raise ValueError(f"Unsupported problem type: {problem}")
+    if problem in project_variants:
+        return project_variants[problem](loc)
 
-    instance = parse_method(loc)
-    return instance.data()
+    raise ValueError(f"Unsupported problem type: {problem}")