diff --git a/examples/visualization_examples.py b/examples/visualization_examples.py index 2a02fe9309ac8b9ec7f3f28d452e18ba79b22141..863294f10452a17c89a8ea6d42f170bbe44caf46 100644 --- a/examples/visualization_examples.py +++ b/examples/visualization_examples.py @@ -21,12 +21,12 @@ if not os.path.exists(IMAGE_DIR): def example_pointnav_draw_target_birdseye_view(): goal_radius = 0.5 - goal = NavigationGoal([10, 0.25, 10], goal_radius) + goal = NavigationGoal(position=[10, 0.25, 10], radius=goal_radius) agent_position = np.array([0, 0.25, 0]) agent_rotation = -np.pi / 4 dummy_episode = NavigationEpisode( - [goal], + goals=[goal], episode_id="dummy_id", scene_id="dummy_scene", start_position=agent_position, @@ -47,7 +47,7 @@ def example_pointnav_draw_target_birdseye_view(): def example_pointnav_draw_target_birdseye_view_agent_on_border(): goal_radius = 0.5 - goal = NavigationGoal([0, 0.25, 0], goal_radius) + goal = NavigationGoal(position=[0, 0.25, 0], radius=goal_radius) ii = 0 for x_edge in [-1, 0, 1]: for y_edge in [-1, 0, 1]: @@ -58,7 +58,7 @@ def example_pointnav_draw_target_birdseye_view_agent_on_border(): agent_rotation = np.pi / 2 dummy_episode = NavigationEpisode( - [goal], + goals=[goal], episode_id="dummy_id", scene_id="dummy_scene", start_position=agent_position, diff --git a/habitat_baselines/agents/simple_agents.py b/habitat_baselines/agents/simple_agents.py index cc979840b78a4c04668b166e96b336819249c7a3..5524eaedae9838408b7706e5090ec867df7a8ab6 100644 --- a/habitat_baselines/agents/simple_agents.py +++ b/habitat_baselines/agents/simple_agents.py @@ -59,7 +59,10 @@ class RandomForwardAgent(RandomAgent): action = SimulatorActions.MOVE_FORWARD.value else: action = np.random.choice( - [SimulatorActions.TURN_LEFT.value, SimulatorActions.TURN_RIGHT.value] + [ + SimulatorActions.TURN_LEFT.value, + SimulatorActions.TURN_RIGHT.value, + ] ) return action diff --git a/habitat_baselines/agents/slam_agents.py b/habitat_baselines/agents/slam_agents.py index 8afdf6e815f29096ac32f913113c4a192c61920b..c90ecb5f21259a2eca86d2b3732a5fc7ac7a138c 100644 --- a/habitat_baselines/agents/slam_agents.py +++ b/habitat_baselines/agents/slam_agents.py @@ -265,7 +265,10 @@ class ORBSLAM2Agent(RandomAgent): .view(4, 4) .to(self.device), ) - if self.action_history[-1] == SimulatorActions.MOVE_FORWARD.value: + if ( + self.action_history[-1] + == SimulatorActions.MOVE_FORWARD.value + ): self.unseen_obstacle = ( previous_step.item() <= 0.001 ) # hardcoded threshold for not moving diff --git a/test/test_habitat_env.py b/test/test_habitat_env.py index 274b5c0e0ae36cc5d6048fada9e13ebfece20889..e96a34c8e74151f3463422dc3df7049bf8058cbe 100644 --- a/test/test_habitat_env.py +++ b/test/test_habitat_env.py @@ -158,7 +158,9 @@ def test_env(): scene_id=config.SIMULATOR.SCENE, start_position=[-3.0133917, 0.04623024, 7.3064547], start_rotation=[0, 0.163276, 0, 0.98658], - goals=[NavigationGoal([-3.0133917, 0.04623024, 7.3064547])], + goals=[ + NavigationGoal(position=[-3.0133917, 0.04623024, 7.3064547]) + ], info={"geodesic_distance": 0.001}, ) ] @@ -250,7 +252,9 @@ def test_rl_env(): scene_id=config.SIMULATOR.SCENE, start_position=[-3.0133917, 0.04623024, 7.3064547], start_rotation=[0, 0.163276, 0, 0.98658], - goals=[NavigationGoal([-3.0133917, 0.04623024, 7.3064547])], + goals=[ + NavigationGoal(position=[-3.0133917, 0.04623024, 7.3064547]) + ], info={"geodesic_distance": 0.001}, ) ] diff --git a/test/test_sensors.py b/test/test_sensors.py index 04488a62af56e7fd156dff1c6f754a83c1676d84..6b6cc3868711a1d7605c15aac988c794a6e4627a 100644 --- a/test/test_sensors.py +++ b/test/test_sensors.py @@ -182,7 +182,7 @@ def test_static_pointgoal_sensor(): scene_id=config.SIMULATOR.SCENE, start_position=valid_start_position, start_rotation=start_rotation, - goals=[NavigationGoal(goal_position)], + goals=[NavigationGoal(position=goal_position)], ) ]