Merged from 323_unordered_cell_locking

flatland/envs/agent_chains.py

@@ -16,7 +16,8 @@ class MotionCheck(object):
     def addAgent(self, iAg, rc1, rc2, xlabel=None):
         """ add an agent and its motion as row,col tuples of current and next position.
             The agent's current position is given an "agent" attribute recording the agent index.
-            If an agent does not move this round then its cell is
+            If an agent does not want to move this round (rc1 == rc2) then a self-loop edge is created.
+            xlabel is used for test cases to give a label (see graphviz)
         """
 
         # Agents which have not yet entered the env have position None.
@@ -181,14 +182,19 @@ class MotionCheck(object):
 
 
 def render(omc:MotionCheck, horizontal=True):
-    oAG = nx.drawing.nx_agraph.to_agraph(omc.G)
-    oAG.layout("dot")
-    sDot = oAG.to_string()
-    if horizontal:
-        sDot = sDot.replace('{', '{ rankdir="LR" ')
-    #return oAG.draw(format="png")
-    # This returns a graphviz object which implements __repr_svg
-    return gv.Source(sDot)
+    try:
+        oAG = nx.drawing.nx_agraph.to_agraph(omc.G)
+        oAG.layout("dot")
+        sDot = oAG.to_string()
+        if horizontal:
+            sDot = sDot.replace('{', '{ rankdir="LR" ')
+        #return oAG.draw(format="png")
+        # This returns a graphviz object which implements __repr_svg
+        return gv.Source(sDot)
+    except ImportError as oError:
+        print("Flatland agent_chains ignoring ImportError - install pygraphviz to render graphs")
+        return None
+
 
 class ChainTestEnv(object):
     """ Just for testing agent chains

flatland/envs/schedule_generators.py

@@ -329,13 +329,17 @@ def schedule_from_file(filename, load_from_package=None) -> ScheduleGenerator:
 
         # setup with loaded data
         agents_position = [a.initial_position for a in agents]
-        agents_direction = [a.direction for a in agents]
+
+        # this logic is wrong - we should really load the initial_direction as the direction.
+        #agents_direction = [a.direction for a in agents]
+        agents_direction = [a.initial_direction for a in agents]
         agents_target = [a.target for a in agents]
         agents_speed = [a.speed_data['speed'] for a in agents]
-        agents_malfunction = [a.malfunction_data['malfunction_rate'] for a in agents]
+        #agents_malfunction = [a.malfunction_data['malfunction_rate'] for a in agents]
 
         return Schedule(agent_positions=agents_position, agent_directions=agents_direction,
-                        agent_targets=agents_target, agent_speeds=agents_speed, agent_malfunction_rates=None,
+                        agent_targets=agents_target, agent_speeds=agents_speed, 
+                        agent_malfunction_rates=None,
                         max_episode_steps=max_episode_steps)
 
     return generator

requirements_dev.txt

@@ -21,5 +21,5 @@ attrs
 gym==0.14.0
 networkx
 ipycanvas
-pygraphviz
 graphviz
+imageio