From 7adb7f63cf424dd41c4d788e4061bfb4c29f38c4 Mon Sep 17 00:00:00 2001 From: SHITIANYU <38762389+SHITIANYU-hue@users.noreply.github.com> Date: Thu, 2 Apr 2020 17:55:08 -0400 Subject: [PATCH 1/2] Update wave_attenuation.py The previous code can only display one rl vehicle, this way it can display all rl vehicles and their leader and follower vehicles, which is in accordance to the paper. --- flow/envs/ring/wave_attenuation.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flow/envs/ring/wave_attenuation.py b/flow/envs/ring/wave_attenuation.py index ec10db16d..8bbc2e10c 100644 --- a/flow/envs/ring/wave_attenuation.py +++ b/flow/envs/ring/wave_attenuation.py @@ -271,6 +271,9 @@ def get_state(self): def additional_command(self): """Define which vehicles are observed for visualization purposes.""" # specify observed vehicles - rl_id = self.k.vehicle.get_rl_ids()[0] - lead_id = self.k.vehicle.get_leader(rl_id) or rl_id - self.k.vehicle.set_observed(lead_id) + for i in range(len(self.k.vehicle.get_rl_ids())): + rl_id = self.k.vehicle.get_rl_ids()[i] + lead_id = self.k.vehicle.get_leader(rl_id) or rl_id + follwer_id = self.k.vehicle.get_follower(rl_id) or rl_id + self.k.vehicle.set_observed(lead_id) + self.k.vehicle.set_observed(follwer_id) From 6fb5697868517fea7098a81b78c1be8e925f09f7 Mon Sep 17 00:00:00 2001 From: Aboudy Kreidieh Date: Wed, 15 Apr 2020 13:55:02 -0700 Subject: [PATCH 2/2] Apply suggestions from code review --- flow/envs/ring/wave_attenuation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/envs/ring/wave_attenuation.py b/flow/envs/ring/wave_attenuation.py index 8bbc2e10c..aaca0eaae 100644 --- a/flow/envs/ring/wave_attenuation.py +++ b/flow/envs/ring/wave_attenuation.py @@ -271,7 +271,7 @@ def get_state(self): def additional_command(self): """Define which vehicles are observed for visualization purposes.""" # specify observed vehicles - for i in range(len(self.k.vehicle.get_rl_ids())): + for i in range(len(self.k.vehicle.get_rl_ids())): rl_id = self.k.vehicle.get_rl_ids()[i] lead_id = self.k.vehicle.get_leader(rl_id) or rl_id follwer_id = self.k.vehicle.get_follower(rl_id) or rl_id