Merge branch 'main' into copyright

# Conflicts:
#	vmas/scenarios/joint_passage_size.py

Author: matteobettini

vmas/scenarios/joint_passage.py

@@ -459,11 +459,10 @@ def reward(self, agent: Agent):
                             self.world.get_distance(a, passage)
                             <= self.min_collision_distance
                         ] += self.collision_reward
-                    for wall in self.walls:
-                        self.collision_rew[
-                            self.world.get_distance(a, wall)
-                            <= self.min_collision_distance
-                        ] += self.collision_reward
+                for wall in self.walls:
+                    self.collision_rew[
+                        self.world.get_distance(a, wall) <= self.min_collision_distance
+                    ] += self.collision_reward
 
             # Joint collisions
             for p in self.passages:

vmas/scenarios/joint_passage_size.py

@@ -454,11 +454,10 @@ def reward(self, agent: Agent):
                                 self.world.get_distance(a, passage)
                                 <= self.min_collision_distance
                             ] += self.collision_reward
-                    for wall in self.walls:
-                        self.collision_rew[
-                            self.world.get_distance(a, wall)
-                            <= self.min_collision_distance
-                        ] += self.collision_reward
+                for wall in self.walls:
+                    self.collision_rew[
+                        self.world.get_distance(a, wall) <= self.min_collision_distance
+                    ] += self.collision_reward
 
             # Energy reward
             if self.energy_reward_coeff != 0: