From 5fb9649aefcb5e1c901bf27d90cb86bbe4992fa9 Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Wed, 16 Oct 2019 20:06:53 +0200 Subject: [PATCH] fix --- LF.challenge.yaml | 2 +- LFV.challenge.yaml | 2 +- LFV_test.challenge.yaml | 2 +- simulator/gym_bridge.py | 4 ++-- simulator/requirements.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LF.challenge.yaml b/LF.challenge.yaml index 938b97c..ac40973 100644 --- a/LF.challenge.yaml +++ b/LF.challenge.yaml @@ -1,7 +1,7 @@ challenge: aido3-LF-sim-validation title: "LF 🚗 - Lane following (simulation 👾, validation 🏋)" -tags: [visible, ml-validation, aido2, aido2-embodied, LF, v4, simulation] +tags: [visible, ml-validation, aido3, aido3-embodied, LF, v4, simulation] description: | Lane following challenge. diff --git a/LFV.challenge.yaml b/LFV.challenge.yaml index 233a64b..c35181d 100644 --- a/LFV.challenge.yaml +++ b/LFV.challenge.yaml @@ -1,7 +1,7 @@ challenge: aido3-LFV-sim-validation title: "LFV 🚗🚗 - Lane following + Vehicles (simulation 👾, validation 🏋)" -tags: [visible, ml-validation, aido2, aido2-embodied, LFV, v4, simulation] +tags: [visible, ml-validation, aido3, aido3-embodied, LFV, v4, simulation] description: | Lane following challenge. diff --git a/LFV_test.challenge.yaml b/LFV_test.challenge.yaml index 86af51f..0c8d2b5 100644 --- a/LFV_test.challenge.yaml +++ b/LFV_test.challenge.yaml @@ -1,7 +1,7 @@ challenge: aido3-LFV-sim-testing title: "LFV 🚗🚗 - Lane following + Vehicles (simulation 👾, testing 🥇)" -tags: [visible, ml-testing, aido2, aido2-embodied, LFV, v4, simulation] +tags: [visible, ml-testing, aido3, aido3-embodied, LFV, v4, simulation] description: | Lane following challenge. diff --git a/simulator/gym_bridge.py b/simulator/gym_bridge.py index 3f02483..0a49325 100755 --- a/simulator/gym_bridge.py +++ b/simulator/gym_bridge.py @@ -67,7 +67,7 @@ class GymDuckiebotSimulator: robot_name: Optional[RobotName] spawn_pose: Any - npcs: Dict[RobotName, Any] + npcs: Dict[RobotName, DuckiebotObj] spawn_configuration: RobotConfiguration last_commands: np.array @@ -343,7 +343,7 @@ def on_received_get_robot_state(self, context: Context, data: GetRobotState): t_effective=self.current_time, state=state) else: - obj: DuckiebotObj = self.npcs[data] + obj: DuckiebotObj = self.npcs[robot_name] q = env.cartesian_from_weird(obj.pos, obj.angle) # FIXME: how to get velocity? v = geometry.se2_from_linear_angular([0, 0], 0) diff --git a/simulator/requirements.txt b/simulator/requirements.txt index 219a0f0..9b7fcbf 100644 --- a/simulator/requirements.txt +++ b/simulator/requirements.txt @@ -3,7 +3,7 @@ aido-protocols-daffy>=5.0.16 duckietown-world-daffy>=5.0.6 zuper-typing-z5>=5.0.11 zuper-ipce-z5>=5.0.7 -zuper-nodes-z5>=5.0.6 +zuper-nodes-z5>=5.0.7 duckietown-gym-daffy>=5.0.4