multiple days

COeXISTENCE-PROJECT · Nov 18, 2024 · fc88c55 · fc88c55
1 parent daed035
commit fc88c55
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/RouteRL/environment/environment.py b/RouteRL/environment/environment.py
@@ -77,6 +77,8 @@ def __init__(self,
         self.phase_names = self.training_params[kc.PHASE_NAMES]
         self.frequent_progressbar = self.training_params[kc.FREQUENT_PROGRESSBAR_UPDATE]
         self.remember_every = self.training_params[kc.REMEMBER_EVERY]
+
+        self.number_of_days = environment_params[kc.NUMBER_OF_DAYS]
 
         """ recorder attributes """
         self.remember_episodes = [ep for ep in range(self.remember_every, self.num_episodes+1, self.remember_every)]
@@ -233,11 +235,11 @@ def step(self, machine_action: int = None) -> None:
 
                 # The episode ends when we complete episode_length days
                 self.truncations = {
-                    agent: True for agent in self.agents
+                    agent: not (self.day % self.number_of_days)  for agent in self.agents
                 }
-
+                
                 self.terminations = {
-                    agent: True for agent in self.agents
+                    agent: not (self.day % self.number_of_days) for agent in self.agents
                 }
 
                 self.info = {

diff --git a/RouteRL/keychain.py b/RouteRL/keychain.py
@@ -57,6 +57,7 @@ class Keychain:
     FREQUENT_PROGRESSBAR_UPDATE = "frequent_progressbar_update"
 
     ### Environment
+    NUMBER_OF_DAYS = "number_of_days"
 
     ### Simulator
     SUMO_TYPE = "sumo_type"

diff --git a/tutorials/MLinPL/params.json b/tutorials/MLinPL/params.json
@@ -64,7 +64,8 @@
 
     "environment_parameters":
     {
-        "action_space_size" : "${path_generation_parameters.number_of_paths}"
+        "action_space_size" : "${path_generation_parameters.number_of_paths}",
+        "number_of_days" : 1
     },
 
 

diff --git a/tutorials/MarlAlgorithms/params.json b/tutorials/MarlAlgorithms/params.json
@@ -64,7 +64,8 @@
 
     "environment_parameters":
     {
-        "action_space_size" : "${path_generation_parameters.number_of_paths}"
+        "action_space_size" : "${path_generation_parameters.number_of_paths}",
+        "number_of_days" : 1
     },
 
 

diff --git a/tutorials/PettingZooEnv/params_main.json b/tutorials/PettingZooEnv/params_main.json
@@ -64,7 +64,8 @@
 
     "environment_parameters":
     {
-        "action_space_size" : "${path_generation_parameters.number_of_paths}"
+        "action_space_size" : "${path_generation_parameters.number_of_paths}",
+        "number_of_days" : 1
     },