fix rebase

huawei-noah · Jan 28, 2021 · 46dabe9 · 46dabe9
1 parent c9613d3
commit 46dabe9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/smarts/core/smarts.py b/smarts/core/smarts.py
@@ -574,11 +574,7 @@ def _pybullet_provider_sync(self, provider_state: ProviderState):
                     agent_id
                 )
                 agent_action_space = agent_interface.action_space
-<<<<<<< HEAD
                 if agent_action_space in self._dynamic_action_spaces:
-=======
-                if agent_action_space in self._pybullet_action_spaces:
->>>>>>> Clean up
                     # This is a pybullet agent, we were the source of this vehicle state.
                     # No need to make any changes
                     continue

diff --git a/smarts/core/vehicle_index.py b/smarts/core/vehicle_index.py
@@ -377,7 +377,7 @@ def switch_control_to_agent(
         vehicle = self._vehicles[vehicle_id]
         chassis = None
         # change this to dynamic_action_spaces later when pr merged
-        if agent_interface and agent_interface.action in sim._pybullet_action_spaces:
+        if agent_interface and agent_interface.action in sim._dynamic_action_spaces:
             chassis = AckermannChassis(pose=vehicle.pose, bullet_client=sim.bc)
         else:
             chassis = BoxChassis(