fixed flake8 errors

docs/flatland.rst

@@ -6,7 +6,6 @@ Subpackages
 
 .. toctree::
 
-    flatland.baselines
     flatland.core
     flatland.envs
     flatland.utils

examples/demo.py

 import os
 import random
-from collections import deque
 
-import time
 import numpy as np
-import torch
 
 from flatland.envs.generators import complex_rail_generator
 # from flatland.envs.generators import rail_from_list_of_saved_GridTransitionMap_generator
@@ -47,7 +44,8 @@ class Scenario_Generator:
     def generate_complex_scenario(number_of_agents=3):
         env = RailEnv(width=15,
                       height=15,
-                      rail_generator=complex_rail_generator(nr_start_goal=6, nr_extra=30, min_dist=10, max_dist=99999, seed=0),
+                      rail_generator=complex_rail_generator(nr_start_goal=6, nr_extra=30, min_dist=10,
+                                                            max_dist=99999, seed=0),
                       number_of_agents=number_of_agents)
 
         return env
@@ -136,15 +134,15 @@ class Demo:
         action_dict = dict()
 
         # Reset environment
-        obs = self.env.reset(False, False)
+        _ = self.env.reset(False, False)
 
         for step in range(max_nbr_of_steps):
             # Action
             for a in range(self.env.get_num_agents()):
-                action = 2 #np.random.choice(self.action_size) #self.agent.act(agent_obs[a])
+                action = 2  # np.random.choice(self.action_size) #self.agent.act(agent_obs[a])
                 action_dict.update({a: action})
 
-            self.renderer.renderEnv(show=True,action_dict=action_dict)
+            self.renderer.renderEnv(show=True, action_dict=action_dict)
 
             # Environment step
             next_obs, all_rewards, done, _ = self.env.step(action_dict)

examples/simple_example_2.py

 import random
 
-from flatland.envs.generators import random_rail_generator, rail_from_list_of_saved_GridTransitionMap_generator
+from flatland.envs.generators import random_rail_generator  # , rail_from_list_of_saved_GridTransitionMap_generator
 from flatland.envs.rail_env import RailEnv
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.utils.rendertools import RenderTool

flatland/utils/editor.py

@@ -99,7 +99,6 @@ class View(object):
 
         # Size of environment when regenerating
 
-
         self.wRegenSizeWidth = IntSlider(value=10, min=5, max=100, step=5, description="Regen Size (Width)",
             tip="Click Regenerate after changing this")
         self.wRegenSizeWidth.observe(self.controller.setRegenSizeWidth, names="value")
@@ -121,7 +120,8 @@ class View(object):
             self.wTab.set_title(i, title)
         self.wTab.children = [
             VBox([self.wDebug, self.wDebug_move, self.wShowObs]),
-            VBox([self.wRegenSizeWidth, self.wRegenSizeHeight, self.wRegenNAgents, self.wRegenMethod, self.wReplaceAgents])]
+            VBox([self.wRegenSizeWidth, self.wRegenSizeHeight, self.wRegenNAgents,
+                  self.wRegenMethod, self.wReplaceAgents])]
 
         # Progress bar intended for stepping in the background (not yet working)
         self.wProg_steps = ipywidgets.IntProgress(value=0, min=0, max=20, step=1, description="Step")
@@ -326,7 +326,7 @@ class Controller(object):
         self.model.reset(replace_agents=self.view.wReplaceAgents.value,
                          nAgents=self.view.wRegenNAgents.value)
 
-    def rotate_agent(self,event):
+    def rotate_agent(self, event):
         self.log("Rotate Agent:", self.model.iSelectedAgent)
         if self.model.iSelectedAgent is not None:
             for iAgent, agent in enumerate(self.model.env.agents_static):
@@ -647,7 +647,7 @@ class EditorModel(object):
         # self.env.rail.save_transition_map(self.env_filename)
         self.env.save(self.env_filename)
 
-    def regenerate(self, method=None, nAgents=0,env=None):
+    def regenerate(self, method=None, nAgents=0, env=None):
         self.log("Regenerate size",
                  self.regen_size_width,
                  self.regen_size_height)
@@ -676,14 +676,12 @@ class EditorModel(object):
         # self.view.init_canvas() # Can't do init_canvas - need to keep the same canvas widget!
         self.redraw()
 
-
     def setRegenSizeWidth(self, size):
         self.regen_size_width = size
 
     def setRegenSizeHeight(self, size):
         self.regen_size_height = size
 
-
     def find_agent_at(self, rcCell):
         for iAgent, agent in enumerate(self.env.agents_static):
             if tuple(agent.position) == tuple(rcCell):
@@ -705,7 +703,7 @@ class EditorModel(object):
             # No
             if self.iSelectedAgent is None:
                 # Create a new agent and select it.
-                agent_static = EnvAgentStatic(rcCell,0, rcCell)
+                agent_static = EnvAgentStatic(rcCell, 0, rcCell)
                 self.iSelectedAgent = self.env.add_agent_static(agent_static)
                 self.player = None  # will need to start a new player
             else:

flatland/utils/graphics_layer.py

@@ -69,5 +69,5 @@ class GraphicsLayer(object):
     def setAgentAt(self, iAgent, row, col, iDirIn, iDirOut):
         pass
 
-    def resize(self,env):
+    def resize(self, env):
         pass

flatland/utils/render_qt.py

@@ -21,7 +21,7 @@ def transform_string_svg(sSVG):
 def create_QtSvgWidget_from_svg_string(sSVG):
     svgWidget = QtSvg.QSvgWidget()
     ret = svgWidget.renderer().load(transform_string_svg(sSVG))
-    if ret == False:
+    if ret is False:
         print("create_QtSvgWidget_from_svg_string : failed to parse:", sSVG)
     return svgWidget
 
@@ -134,26 +134,26 @@ class QTSVG(GraphicsLayer):
         self.lwAgents = []
         self.agents_prev = []
 
-        svgWidget = None
-
-        iArt = 0
-        iCol = 0
-        iRow = 0
-        nCols = 10
-
-        if False:
-            for binTrans in self.track.dSvg.keys():
-                sSVG = self.track.dSvg[binTrans].to_string()
-                self.layout.addWidget(create_QtSvgWidget_from_svg_string(sSVG), iRow, iCol)
-
-                iArt += 1
-                iRow = int(iArt / nCols)
-                iCol = iArt % nCols
-
-            svgWidget2 = QtSvg.QSvgWidget()
-            svgWidget2.renderer().load(bySVG)
-
-            self.layout.addWidget(svgWidget2, 0, 0)
+        # svgWidget = None
+
+        # iArt = 0
+        # iCol = 0
+        # iRow = 0
+        # nCols = 10
+
+        # if False:
+        #     for binTrans in self.track.dSvg.keys():
+        #         sSVG = self.track.dSvg[binTrans].to_string()
+        #         self.layout.addWidget(create_QtSvgWidget_from_svg_string(sSVG), iRow, iCol)
+        #
+        #         iArt += 1
+        #         iRow = int(iArt / nCols)
+        #         iCol = iArt % nCols
+        #
+        #     svgWidget2 = QtSvg.QSvgWidget()
+        #     svgWidget2.renderer().load(bySVG)
+        #
+        #     self.layout.addWidget(svgWidget2, 0, 0)
 
     def is_raster(self):
         return False
@@ -197,8 +197,8 @@ class QTSVG(GraphicsLayer):
 
                 # We can only reuse the image if noth new and old are straight and the same:
                 if iDirIn == iDirOut and \
-                    agentPrev.direction == iDirIn and \
-                    agentPrev.old_direction == agentPrev.direction:
+                   agentPrev.direction == iDirIn and \
+                   agentPrev.old_direction == agentPrev.direction:
                     return
                 else:
                     # need to load new image
@@ -232,6 +232,7 @@ class QTSVG(GraphicsLayer):
         self.wWinMain.resize(env.width * w, env.height * h)
         self.wWinMain.move((width - env.width * w) / 2, (height - env.height * h) / 2)
 
+
 def main2():
     gl = QTGL(10, 10)
     for i in range(10):

flatland/utils/rendertools.py

@@ -621,7 +621,7 @@ class RenderTool(object):
 
         if not self.gl.is_raster():
             self.renderEnv2(show, curves, spacing,
-                            arrows, agents, renderobs,sRailColor,
+                            arrows, agents, renderobs, sRailColor,
                             frames, iEpisode, iStep,
                             iSelectedAgent, action_dict)
 
@@ -768,7 +768,6 @@ class RenderTool(object):
             if action_isValid:
                 self.gl.setAgentAt(iAgent, *agent.position, agent.direction, new_direction, color=oColor)
             else:
-                #pass
                 print("invalid action - agent ", iAgent, " bend ", agent.direction, new_direction)
                 self.gl.setAgentAt(iAgent, *agent.position, agent.direction, new_direction)