Remove excess configurations

yura-hb · Jun 1, 2024 · 4ca6bed · 4ca6bed
1 parent f10dfeb
commit 4ca6bed
Show file tree

Hide file tree

Showing 251 changed files with 108 additions and 8,161 deletions.
diff --git a/...GRAPH-BEST/experiments/1/0/experiment.yml → ...s/jsp/BEST/experiments/1/0/experiment.yml b/...GRAPH-BEST/experiments/1/0/experiment.yml → ...s/jsp/BEST/experiments/1/0/experiment.yml
@@ -1,53 +1,26 @@
-# Evaluate the effectivenes of basic DQNs on the JSP environment
-base_model: &base_model 'configuration/experiments/jsp/GRAPH-BEST/experiments/1/flexible_machine.yml'
 
 
 default_mods: &default_mods
   - 'util/train_schedule/on_store_256.yml'
   - 'agent/dqn/ddqn.yml'
-#  - 'agent/dqn/dueling.yml'
   - 'agent/dqn/prioritized.yml'
-#  - 'agent/dqn/steps/3.yml'
   - 'util/optimizer/adam_stationary.yml'
   - 'util/optimizer/grad_norm.yml'
-#  - 'util/infrastructure/cuda.yml'
 
 ###############################################################################################
 
 dqn_1: &dqn_1
-  base_path: *base_model
-  template: 'custom_gat'
+  base_path: 'configuration/experiments/jsp/BEST/experiments/1/flexible_machine.yml'
+  template: '../../../../../../mods/machine/model/flexible_custom_gat'
   mod_dirs:
     - 'configuration/mods/machine/mods'
   mods:
     - *default_mods
 
 
-###############################################################################################
-
 dqn_2: &dqn_2
-  base_path: *base_model
-  template: 'custom_gin'
-  mod_dirs:
-    - 'configuration/mods/machine/mods'
-  mods:
-    - *default_mods
-
-###############################################################################################
-
-dqn_3: &dqn_3
-  base_path: *base_model
-  template: 'hierarchical_gin'
-  mod_dirs:
-    - 'configuration/mods/machine/mods'
-  mods:
-    - *default_mods
-
-###############################################################################################
-
-dqn_4: &dqn_4
-  base_path: *base_model
-  template: 'hierarchical_gat'
+  base_path: 'configuration/experiments/jsp/BEST/experiments/1/mr_machine.yml'
+  template: '../../../../../../mods/machine/model/marl_dqn/baseline'
   mod_dirs:
     - 'configuration/mods/machine/mods'
   mods:
@@ -70,7 +43,7 @@ long_single_source_run: &long_single_source_run
   parameters:
     mods:
       __inout_factory__:
-        - [ ['utilization/90.yml' ]]
+        - [ ['utilization/70.yml', 'utilization/80.yml', 'utilization/90.yml']]
     nested:
       parameters:
         dispatch:
@@ -83,7 +56,7 @@ long_single_source_run: &long_single_source_run
 
 task:
   kind: 'multi_task'
-  n_workers: 1
+  n_workers: 2
   n_threads: 30
   debug: False
   store_run_statistics: False
@@ -124,11 +97,10 @@ task:
           simulator:
             kind: 'td'
 
-
           run:
             kind: 'mod'
             parameters:
-              base_path: 'configuration/experiments/jsp/GRAPH-BEST/experiments/1/run.yml'
+              base_path: 'configuration/experiments/jsp/BEST/experiments/1/run.yml'
               mod_dirs:
                 - 'configuration/mods/run/mods'
               mods: []
@@ -141,42 +113,18 @@ task:
                         base:
                           kind: 'mod'
                           parameters:
-                            base_path: 'configuration/experiments/jsp/GRAPH-BEST/experiments/1/simulation.yml'
+                            base_path: 'configuration/experiments/jsp/BEST/experiments/1/simulation.yml'
                             mod_dirs:
                               - 'configuration/mods/simulation/mods'
                             mods: [ ]
                         values:
         values:
           __concat__:
 
-#            - output_dir: 'Global'
-#              machine_agent:
-#                parameters:
-#                  - *dqn_1
-#                  - *dqn_2
-#                  - *dqn_3
-#                  - *dqn_4
-#              graph:
-#                transition_model:
-#                  kind: 'base'
-#                  parameters:
-#                    forward:
-#                      kind: 'complete'
-#
-#                    schedule:
-#                      kind: 'complete'
-#
-#                memory: 0
-#                is_machine_set_in_work_center_connected: False
-#                is_work_center_set_in_shop_floor_connected: False
-
-            - output_dir: 'Local'
+            - output_dir: 'Graph'
               machine_agent:
                 parameters:
                   - *dqn_1
-#                  - *dqn_2
-#                  - *dqn_3
-#                  - *dqn_4
               graph:
                 transition_model:
                   kind: 'base'
@@ -191,6 +139,14 @@ task:
                 is_machine_set_in_work_center_connected: True
                 is_work_center_set_in_shop_floor_connected: True
 
+            - output_dir: 'MARL'
+              machine_agent:
+                parameters:
+                  - *dqn_2
+              graph:
+                transition_model:
+                  kind: 'no'
+
           tape:
             machine_reward:
               *reward

diff --git a/...sp/MARL-DQN/experiment/0/0/experiment.yml → ...s/jsp/BEST/experiments/1/1/experiment.yml b/...sp/MARL-DQN/experiment/0/0/experiment.yml → ...s/jsp/BEST/experiments/1/1/experiment.yml
@@ -1,54 +1,39 @@
-# Evaluate the effectivenes of basic DQNs on the JSP environment
 
-template: &template 'baseline'
-base_model: &base_model 'configuration/experiments/jsp/MARL-DQN/experiment/0/machine.yml'
+
 default_mods: &default_mods
-  - 'util/train_schedule/on_store_32.yml'
+  - 'util/train_schedule/on_store_256.yml'
+  - 'agent/dqn/ddqn.yml'
+  - 'agent/dqn/prioritized.yml'
+  - 'util/optimizer/adam_stationary.yml'
+  - 'util/optimizer/grad_norm.yml'
+
 ###############################################################################################
 
 dqn_1: &dqn_1
-  base_path: *base_model
-  template: 'baseline'
+  base_path: 'configuration/experiments/jsp/BEST/experiments/1/flexible_machine.yml'
+  template: '../../../../../../mods/machine/model/flexible_custom_gat'
   mod_dirs:
     - 'configuration/mods/machine/mods'
   mods:
-    - 'agent/dqn/ddqn.yml'
-    - 'util/agent/multi_agent.yml'
-#    - 'agent/dqn/prioritized.yml'
     - *default_mods
 
-###############################################################################################
 
 dqn_2: &dqn_2
-  base_path: *base_model
-  template: 'relu'
-  mod_dirs:
-    - 'configuration/mods/machine/mods'
-  mods:
-    - 'agent/dqn/ddqn.yml'
-    - 'util/agent/multi_agent.yml'
-#    - 'agent/dqn/prioritized.yml'
-    - *default_mods
-
-  ###############################################################################################
-
-dqn_3: &dqn_3
-  base_path: *base_model
-  template: 'tanh'
+  base_path: 'configuration/experiments/jsp/BEST/experiments/1/mr_machine.yml'
+  template: '../../../../../../mods/machine/model/marl_dqn/baseline'
   mod_dirs:
     - 'configuration/mods/machine/mods'
   mods:
-    - 'agent/dqn/ddqn.yml'
-    - 'util/agent/multi_agent.yml'
-#    - 'agent/dqn/prioritized.yml'
     - *default_mods
 
 ###############################################################################################
 
 reward: &reward
-  - kind: 'global_decomposed_tardiness'
+  - kind: 'surrogate_tardiness'
     parameters:
-      span: 128
+      winq_factor: 0.2
+      span: 80
+      critical_level_factor: 64
 
 ##############################################################################################
 
@@ -58,24 +43,24 @@ long_single_source_run: &long_single_source_run
   parameters:
     mods:
       __inout_factory__:
-        - [ [ 'utilization/80.yml' ] ]
+        - [ ['utilization/70.yml', 'utilization/80.yml', 'utilization/90.yml']]
     nested:
       parameters:
         dispatch:
           seed:
-            - '__range__': [ 1300, 1450 ]
+            - '__range__': [ 2200, 2400 ]
 
 
 ###############################################################################################
 
 
 task:
   kind: 'multi_task'
-  n_workers: 3
-  n_threads: 3
+  n_workers: 2
+  n_threads: 30
   debug: False
   store_run_statistics: False
-  output_dir: 'results/jsp/experiments/MARL/(0) NN/'
+  output_dir: 'results/jsp/experiments/FINAL/BEST/1'
 
   tasks:
     - kind: 'multi_value'
@@ -84,6 +69,7 @@ task:
           name: 'model'
           output_dir: '1'
           log_stdout: False
+          seed: 123
 
           machine_agent:
             kind: 'mod'
@@ -111,14 +97,10 @@ task:
           simulator:
             kind: 'td'
 
-          graph:
-            transition_model:
-              kind: 'no'
-
           run:
             kind: 'mod'
             parameters:
-              base_path: 'configuration/experiments/jsp/MARL-DQN/experiment/0/run.yml'
+              base_path: 'configuration/experiments/jsp/BEST/experiments/1/run.yml'
               mod_dirs:
                 - 'configuration/mods/run/mods'
               mods: []
@@ -131,25 +113,39 @@ task:
                         base:
                           kind: 'mod'
                           parameters:
-                            base_path: 'configuration/experiments/jsp/MARL-DQN/experiment/0/episode_simulation.yml'
+                            base_path: 'configuration/experiments/jsp/BEST/experiments/1/simulation.yml'
                             mod_dirs:
                               - 'configuration/mods/simulation/mods'
                             mods: [ ]
                         values:
         values:
           __concat__:
-            - output_dir: 'Baseline'
+
+            - output_dir: 'Graph'
               machine_agent:
                 parameters:
                   - *dqn_1
-            - output_dir: 'Relu'
+              graph:
+                transition_model:
+                  kind: 'base'
+                  parameters:
+                    forward:
+                      kind: 'complete'
+
+                    schedule:
+                      kind: 'machine_compressed'
+
+                memory: 0
+                is_machine_set_in_work_center_connected: True
+                is_work_center_set_in_shop_floor_connected: True
+
+            - output_dir: 'MARL'
               machine_agent:
                 parameters:
                   - *dqn_2
-            - output_dir: 'Tanh'
-              machine_agent:
-                parameters:
-                  - *dqn_3
+              graph:
+                transition_model:
+                  kind: 'no'
 
           tape:
             machine_reward: