Improvements to JSP

cair · Oct 29, 2024 · a280de8 · a280de8
1 parent a09d416
commit a280de8
Show file tree

Hide file tree

Showing 108 changed files with 9,588 additions and 2,586 deletions.
diff --git a/jsp/CMakeLists.txt b/jsp/CMakeLists.txt
@@ -50,15 +50,15 @@ set(SOURCES
 
 # Add header files
 set(HEADERS
-        include/job_shop_environment.h
-        include/job_shop_qlearning.h
-        include/job_shop_actor_critic.h
-        include/job_shop_algorithms.h
-        include/job_shop_generator.h
-        include/job_shop_plotter.h
-        include/job_shop_taillard_generator.h
-        include/multidimensional_array.hpp
-        include/util.h
+        include/environment/job_shop_environment.h
+        include/algorithms/job_shop_qlearning.h
+        include/algorithms/job_shop_actor_critic.h
+        include/algorithms/job_shop_algorithms.h
+        include/environment/job_shop_environment_generator.h
+        include/gui/job_shop_plotter.h
+        include/environment/job_shop_taillard_generator.h
+        include/utilities/multidimensional_array.hpp
+        include/utilities/util.h
 )
 
 # Create the main executable if not building for pip installation
@@ -82,7 +82,7 @@ if(NOT DEFINED BUILD_EXECUTABLE OR BUILD_EXECUTABLE)
 endif()
 
 # Create the Python module
-nanobind_add_module(jobshop bindings/jobshop_bindings.cpp bindings/multi_dim_array_bind.cpp ${SOURCES} ${HEADERS})
+nanobind_add_module(jobshop bindings/jobshop_bindings.cpp  ${SOURCES} ${HEADERS})
 target_include_directories(jobshop PRIVATE include ${Python_INCLUDE_DIRS})
 target_link_libraries(jobshop PRIVATE
         ${OPENGL_LIBRARIES}

diff --git a/jsp/bindings/jobshop_bindings.cpp b/jsp/bindings/jobshop_bindings.cpp
diff --git a/jsp/bindings/multi_dim_array_bind.cpp b/jsp/bindings/multi_dim_array_bind.cpp
diff --git a/jsp/environments/doris.csv b/jsp/environments/doris.csv
diff --git a/jsp/environments/doris.json b/jsp/environments/doris.json
@@ -0,0 +1,228 @@
+{
+  "metadata": {
+    "numJobs": 36,
+    "numMachines": 3
+  },
+  "jobs": [
+    {
+      "id": 0,
+      "duration": 49,
+      "machine": 0,
+      "dependencies": []
+    },
+    {
+      "id": 1,
+      "duration": 64,
+      "machine": 1,
+      "dependencies": [0]
+    },
+    {
+      "id": 2,
+      "duration": 36,
+      "machine": 2,
+      "dependencies": [10]
+    },
+    {
+      "id": 3,
+      "duration": 12,
+      "machine": 0,
+      "dependencies": [10]
+    },
+    {
+      "id": 4,
+      "duration": 210,
+      "machine": 1,
+      "dependencies": [10]
+    },
+    {
+      "id": 5,
+      "duration": 24,
+      "machine": 2,
+      "dependencies": [10]
+    },
+    {
+      "id": 6,
+      "duration": 10,
+      "machine": 0,
+      "dependencies": [10]
+    },
+    {
+      "id": 7,
+      "duration": 1,
+      "machine": 1,
+      "dependencies": [4]
+    },
+    {
+      "id": 8,
+      "duration": 24,
+      "machine": 2,
+      "dependencies": [4]
+    },
+    {
+      "id": 9,
+      "duration": 1,
+      "machine": 0,
+      "dependencies": [12, 13, 14]
+    },
+    {
+      "id": 10,
+      "duration": 24,
+      "machine": 1,
+      "dependencies": [0]
+    },
+    {
+      "id": 11,
+      "duration": 48,
+      "machine": 2,
+      "dependencies": [10]
+    },
+    {
+      "id": 12,
+      "duration": 60,
+      "machine": 0,
+      "dependencies": [11]
+    },
+    {
+      "id": 13,
+      "duration": 1,
+      "machine": 1,
+      "dependencies": [11]
+    },
+    {
+      "id": 14,
+      "duration": 1,
+      "machine": 2,
+      "dependencies": [11]
+    },
+    {
+      "id": 15,
+      "duration": 48,
+      "machine": 0,
+      "dependencies": [29]
+    },
+    {
+      "id": 16,
+      "duration": 50,
+      "machine": 1,
+      "dependencies": [7]
+    },
+    {
+      "id": 17,
+      "duration": 48,
+      "machine": 2,
+      "dependencies": [12, 13, 14]
+    },
+    {
+      "id": 18,
+      "duration": 24,
+      "machine": 0,
+      "dependencies": [17]
+    },
+    {
+      "id": 19,
+      "duration": 1,
+      "machine": 1,
+      "dependencies": [15]
+    },
+    {
+      "id": 20,
+      "duration": 1,
+      "machine": 2,
+      "dependencies": [15]
+    },
+    {
+      "id": 21,
+      "duration": 1,
+      "machine": 0,
+      "dependencies": [15]
+    },
+    {
+      "id": 22,
+      "duration": 48,
+      "machine": 1,
+      "dependencies": [12, 13, 14, 18, 29]
+    },
+    {
+      "id": 23,
+      "duration": 5,
+      "machine": 2,
+      "dependencies": [12, 13, 14, 22]
+    },
+    {
+      "id": 24,
+      "duration": 1,
+      "machine": 0,
+      "dependencies": [9]
+    },
+    {
+      "id": 25,
+      "duration": 10,
+      "machine": 1,
+      "dependencies": [9, 12, 13, 14]
+    },
+    {
+      "id": 26,
+      "duration": 72,
+      "machine": 2,
+      "dependencies": [31]
+    },
+    {
+      "id": 27,
+      "duration": 36,
+      "machine": 0,
+      "dependencies": [31]
+    },
+    {
+      "id": 28,
+      "duration": 24,
+      "machine": 1,
+      "dependencies": [7]
+    },
+    {
+      "id": 29,
+      "duration": 20,
+      "machine": 2,
+      "dependencies": [28]
+    },
+    {
+      "id": 30,
+      "duration": 10,
+      "machine": 0,
+      "dependencies": [23]
+    },
+    {
+      "id": 31,
+      "duration": 70,
+      "machine": 1,
+      "dependencies": [17]
+    },
+    {
+      "id": 32,
+      "duration": 10,
+      "machine": 2,
+      "dependencies": [4]
+    },
+    {
+      "id": 33,
+      "duration": 10,
+      "machine": 0,
+      "dependencies": [4]
+    },
+    {
+      "id": 34,
+      "duration": 10,
+      "machine": 1,
+      "dependencies": [12, 13, 14]
+    },
+    {
+      "id": 35,
+      "duration": 10,
+      "machine": 2,
+      "dependencies": [24]
+    }
+  ],
+  "operationDependencies": {
+    "comment": "Operation dependencies can be added here if needed",
+    "dependencies": []
+  }
+}