Added data package into the library.

MANIFEST.in

@@ -0,0 +1,2 @@
+include LICENSE
+include README.md

per_jsp/data/__init__.py

@@ -0,0 +1,18 @@
+
+def get_current_directory():
+    from pathlib import Path
+    current_directory = Path(__file__).resolve().parent
+    return current_directory
+
+
+def get_taillard_instance(instance_name):
+    from pathlib import Path
+    current_directory = get_current_directory()
+    instance_path = current_directory / "taillard_instances" / instance_name + ".txt"
+    return instance_path
+
+def get_problem_instance(instance_name):
+    from pathlib import Path
+    current_directory = get_current_directory()
+    instance_path = current_directory / "problem_instances" / instance_name
+    return instance_path

per_jsp/examples/cpp/ppo_action.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 import argparse
 from typing import List, Optional, Callable
-import jobshop
+import per_jspp as jobshop
+from per_jsp import data
 import gymnasium as gym
 from sb3_contrib import MaskablePPO
 from stable_baselines3.common.callbacks import BaseCallback
 from stable_baselines3.common.vec_env import DummyVecEnv
 
-from jsp.jsp_env import DefaultObservationSpace, MakespanRewardFunction, JobShopGymEnv, NormalizedObservationSpace, \
+from per_jsp.cpp.jsp_env import DefaultObservationSpace, MakespanRewardFunction, JobShopGymEnv, NormalizedObservationSpace, \
     ProgressRewardFunction
 
 
@@ -70,7 +71,7 @@ def run_experiment(algorithm_name: str, taillard_instance: str, use_gui: bool, m
                    observation_space: str, reward_function: str) -> None:
     def make_env() -> Callable[[], gym.Env]:
         #instance: jobshop.TaillardInstance = getattr(jobshop.TaillardInstance, taillard_instance)
-        jobs, ta_optimal = jobshop.ManualJobShopGenerator.generateFromFile("/home/per/jsp/jsp/environments/doris.json")
+        jobs, ta_optimal = jobshop.ManualJobShopGenerator.generateFromFile(str(data.get_problem_instance("doris.json")))
         print(jobs, ta_optimal)
         #jobs, ta_optimal = jobshop.TaillardJobShopGenerator.loadProblem(instance, True)
         print(f"Optimal makespan for {taillard_instance}: {ta_optimal}")

per_jsp/examples/cpp/q_learning.py

@@ -1,5 +1,5 @@
 import numpy as np
-import jobshop
+import per_jspp as jobshop
 import wandb
 import argparse
 from dataclasses import dataclass

per_jsp/examples/cpp/random_policy.py

@@ -1,5 +1,5 @@
 import numpy as np
-import jobshop
+import per_jspp as jobshop
 from dataclasses import dataclass
 import wandb
 

per_jsp/examples/cpp/sample_application_simple.py

@@ -1,5 +1,5 @@
 import argparse
-import jobshop
+import per_jspp as jobshop
 from tqdm import tqdm
 
 def run_experiment(algorithm_name: str, taillard_instance: str):

per_jsp/examples/cpp/sample_applicationmp.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from typing import List
 
-import jobshop
+import per_jspp as jobshop
 from tqdm import tqdm
 
 @dataclass

per_jsp/python/per_jsp/cpp/jsp_env.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Tuple, Optional
-import jobshop
+import per_jspp as jobshop
 import numpy as np
 import gymnasium as gym
 from gymnasium import spaces
@@ -141,7 +141,7 @@ def validate_schedule(env: jobshop.JobShopEnvironment) -> Dict[str, Any]:
     # Verify all scheduled operations completed
     for machine_schedule in schedule:
         for entry in machine_schedule:
-            end_time = state.jobProgress(entry.job, entry.operation)
+            end_time = np.asarray(state.jobProgress, copy=False)[entry.job, entry.operation]
             if end_time == 0:
                 raise ValueError(f"Operation not completed: Job {entry.job}, Op {entry.operation}")
 

pyproject.toml

@@ -34,11 +34,17 @@ classifiers = [
 "Documentation" = "https://github.com/cair/jobshop/wiki"
 
 [tool.setuptools]
-packages = ["per_jsp", "per_jsp.algorithms", "per_jsp.cpp", "per_jsp.environment"]
-package-dir = {"" = "per_jsp/python"}
+packages = ["per_jsp", "per_jsp.algorithms", "per_jsp.cpp", "per_jsp.environment", "per_jsp.data"]
+package-dir = { "" = "per_jsp", "per_jsp" = "per_jsp/python/per_jsp", "per_jsp.data" = "per_jsp/data" }
 
 [tool.setuptools.package-data]
-per_jsp = ["*.so", "*.pyd", "*.dylib"]
+"per_jsp" = ["*.so", "*.pyd", "*.dylib"]
+"per_jsp.data" = [
+    "problem_instances/**/*",
+    "taillard_instances/**/*",
+    "install_requirements.sh",
+    "parser.py"
+]
 
 [tool.pytest.ini_options]
 pythonpath = ["."]