create agents data path

COeXISTENCE-PROJECT · Dec 5, 2024 · 8e0d7a0 · 8e0d7a0
1 parent cdb3a4a
commit 8e0d7a0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/RouteRL/create_agents.py b/RouteRL/create_agents.py
@@ -19,7 +19,7 @@ def create_agent_objects(params, free_flow_times):
     # Getting parameters
     action_space_size = params[kc.ACTION_SPACE_SIZE]
 
-    agents_data_path = params[kc.AGENTS_DATA_PATH]
+    agents_data_path = params[kc.CREATE_AGENTS_DATA_PATH]
     if os.path.isfile(agents_data_path):
         logging.info("[CONFIRMED] Agents data file is ready.")
     else:

diff --git a/RouteRL/keychain.py b/RouteRL/keychain.py
@@ -80,6 +80,7 @@ class Keychain:
     RATIO_MUTATING = "ratio_mutating"
     AGENT_ATTRIBUTES = "agent_attributes"
     NEW_MACHINES_AFTER_MUTATION = "new_machines_after_mutation"
+    CREATE_AGENTS_DATA_PATH = "create_agents_data_path"
 
     ### Path generation
     NUMBER_OF_PATHS = "number_of_paths"
@@ -157,7 +158,7 @@ class Keychain:
     SUMO_FCD = "sumo_fcd"
 
     PATHS_CSV_SAVE_PATH = "paths_csv_save_path"
-    AGENTS_DATA_PATH = "agents_data_path"
+    AGENTS_DATA_PATH = "gen_agents_data_path"
     SAVE_TRIPINFO_XML = "save_tripinfo_xml"
     SAVE_TRAJECTORIES_XML = "save_trajectories_xml"
     SAVE_FCD_BASED_SPEEDS = "save_fcd_based_speeds"

diff --git a/tutorials/MarlAlgorithmsCsomorNet/params.json b/tutorials/MarlAlgorithmsCsomorNet/params.json
@@ -27,7 +27,7 @@
 
     "agent_parameters" :
     {
-        "agents_data_path" : "${agent_generation_parameters.agents_data_path}",
+        "create_agents_data_path": "../../RouteRL/network_and_config/agents_data.csv",
         "action_space_size" : "${path_generation_parameters.number_of_paths}",
 
         "machine_parameters" :

diff --git a/tutorials/MarlAlgorithmsTwoRouteNet/params.json b/tutorials/MarlAlgorithmsTwoRouteNet/params.json
@@ -27,7 +27,7 @@
 
     "agent_parameters" :
     {
-        "agents_data_path" : "${agent_generation_parameters.agents_data_path}",
+        "create_agents_data_path": "../../RouteRL/network_and_config/agents_data.csv",
         "action_space_size" : "${path_generation_parameters.number_of_paths}",
 
         "machine_parameters" :

diff --git a/tutorials/PettingZooEnv/params_main.json b/tutorials/PettingZooEnv/params_main.json
@@ -27,7 +27,7 @@
 
     "agent_parameters" :
     {
-        "agents_data_path" : "${agent_generation_parameters.agents_data_path}",
+        "create_agents_data_path": "../../RouteRL/network_and_config/agents_data.csv",
         "action_space_size" : "${path_generation_parameters.number_of_paths}",
 
         "machine_parameters" :

diff --git a/tutorials/SoftwareXExperiments/params.json b/tutorials/SoftwareXExperiments/params.json
@@ -27,7 +27,7 @@
 
     "agent_parameters" :
     {
-        "agents_data_path" : "${agent_generation_parameters.agents_data_path}",
+        "create_agents_data_path": "../../RouteRL/network_and_config/agents_data.csv",
         "action_space_size" : "${path_generation_parameters.number_of_paths}",
 
         "machine_parameters" :
@@ -132,7 +132,8 @@
         "origins" : "${path_generation_parameters.origins}",
         "destinations" : "${path_generation_parameters.destinations}",
 
-        "agents_data_path": "../../RouteRL/network_and_config/agents_data.csv"
+        "gen_agents_data_path": "RouteRL/network_and_config/agents_data.csv"
+
     },