Merge branch 'master' of gitlab.aicrowd.com:flatland/flatland

flatland/envs/observations.py

@@ -266,7 +266,6 @@ class TreeObsForRailEnv(ObservationBuilder):
         other_agent_same_direction = 0
         other_agent_opposite_direction = 0
 
-
         num_steps = 1
         while exploring:
             # #############################
@@ -378,7 +377,6 @@ class TreeObsForRailEnv(ObservationBuilder):
                            ]
         """
 
-
         if last_isTarget:
             observation = [0,
                            other_target_encountered,

flatland/envs/rail_env.py

@@ -214,22 +214,14 @@ class RailEnv(Environment):
 
             if action == RailEnvActions.DO_NOTHING and agent.moving:
                 # Keep moving
-                # Changed MOVE_FORWARD to DO_NOTHING
-                #action_dict[iAgent] = RailEnvActions.DO_NOTHING
                 action = RailEnvActions.MOVE_FORWARD
 
             if action == RailEnvActions.STOP_MOVING and agent.moving:
-                #action_dict[iAgent] = RailEnvActions.DO_NOTHING
-                # CHanged DO_NOTHING to STOP_MOVING
-                # action = RailEnvActions.STOP_MOVING
                 agent.moving = False
                 self.rewards_dict[iAgent] += stop_penalty
 
             if not agent.moving and action == RailEnvActions.MOVE_FORWARD:
                 # Only allow agent to start moving by pressing forward.
-                #(action == RailEnvActions.MOVE_LEFT or
-                # action == RailEnvActions.MOVE_FORWARD or
-                # action == RailEnvActions.MOVE_RIGHT):
                 agent.moving = True
                 self.rewards_dict[iAgent] += start_penalty