Linting

Author: matteobettini

vmas/scenarios/ball_trajectory.py

@@ -39,9 +39,9 @@ def make_world(self, batch_dim: int, device: torch.device, **kwargs):
             drag=0,
         )
         # Add agents
-        agent = Agent(name=f"agent 0", shape=Sphere(self.agent_radius), drag=0.25)
+        agent = Agent(name="agent 0", shape=Sphere(self.agent_radius), drag=0.25)
         world.add_agent(agent)
-        agent = Agent(name=f"agent 1", shape=Sphere(self.agent_radius), drag=0.25)
+        agent = Agent(name="agent 1", shape=Sphere(self.agent_radius), drag=0.25)
         world.add_agent(agent)
 
         self.ball = Landmark(

vmas/scenarios/buzz_wire.py

@@ -39,14 +39,14 @@ def make_world(self, batch_dim: int, device: torch.device, **kwargs):
         )
         # Add agents
         agent = Agent(
-            name=f"agent 0",
+            name="agent 0",
             shape=Sphere(self.agent_radius),
             u_multiplier=1,
             mass=1,
         )
         world.add_agent(agent)
         agent = Agent(
-            name=f"agent 1",
+            name="agent 1",
             shape=Sphere(self.agent_radius),
             u_multiplier=1,
             mass=1,

vmas/scenarios/debug/asym_joint.py

@@ -2,7 +2,8 @@
 #  ProrokLab (https://www.proroklab.org/)
 #  All rights reserved.
 import math
-from typing import Dict
+import typing
+from typing import Dict, List
 
 import torch
 from torch import Tensor
@@ -13,6 +14,9 @@
 from vmas.simulator.scenario import BaseScenario
 from vmas.simulator.utils import Color
 
+if typing.TYPE_CHECKING:
+    from vmas.simulator.rendering import Geom
+
 
 def get_line_angle_0_90(rot: Tensor):
     angle = torch.abs(rot) % torch.pi

vmas/scenarios/joint_passage.py

@@ -96,7 +96,7 @@ def make_world(self, batch_dim: int, device: torch.device, **kwargs):
 
         # Add agents
         agent = Agent(
-            name=f"agent 0",
+            name="agent 0",
             shape=Sphere(self.agent_radius),
             obs_noise=self.obs_noise,
             render_action=True,
@@ -109,7 +109,7 @@ def make_world(self, batch_dim: int, device: torch.device, **kwargs):
         world.add_agent(agent)
 
         agent = Agent(
-            name=f"agent 1",
+            name="agent 1",
             shape=Sphere(self.agent_radius),
             mass=1 if self.asym_package else self.mass_ratio,
             color=Color.BLUE,

vmas/scenarios/joint_passage_size.py

@@ -99,7 +99,7 @@ def make_world(self, batch_dim: int, device: torch.device, **kwargs):
 
         # Add agents
         agent = Agent(
-            name=f"agent 0",
+            name="agent 0",
             shape=Sphere(self.agent_radius),
             u_range=0.5,
             obs_noise=self.obs_noise,
@@ -111,7 +111,7 @@ def make_world(self, batch_dim: int, device: torch.device, **kwargs):
         )
         world.add_agent(agent)
         agent = Agent(
-            name=f"agent 1",
+            name="agent 1",
             shape=Sphere(self.agent_radius_2),
             u_range=0.5,
             mass=1 if self.asym_package else self.mass_ratio,

vmas/scenarios/navigation.py

@@ -1,7 +1,8 @@
 #  Copyright (c) 2022.
 #  ProrokLab (https://www.proroklab.org/)
 #  All rights reserved.
-from typing import Dict, Callable
+import typing
+from typing import Dict, Callable, List
 
 import torch
 from torch import Tensor
@@ -11,6 +12,9 @@
 from vmas.simulator.scenario import BaseScenario
 from vmas.simulator.utils import Color, ScenarioUtils
 
+if typing.TYPE_CHECKING:
+    from vmas.simulator.rendering import Geom
+
 
 class Scenario(BaseScenario):
     def make_world(self, batch_dim: int, device: torch.device, **kwargs):

vmas/simulator/core.py

@@ -1908,7 +1908,6 @@ def _get_intersection_point_line_line(self, point_a1, point_a2, point_b1, point_
         u_in_range = (0 <= u) * (u <= 1)
 
         cross_r_s_is_zero = cross_r_s == 0
-        cross_q_minus_p_r_is_zero = cross_q_minus_p_r == 0
 
         distance = torch.full(
             (self.batch_dim,), float("inf"), device=self.device, dtype=torch.float32