Two bug fixes in the graph package: list creation in merge functions and...

Two bug fixes in the graph package: list creation in merge functions and visualisation package without function order given (put coordinator in top left corner).


Former-commit-id: da6567b3ebf0c1f57920c2e5d6a5531ed5dc180c

pyKADMOS/sample/graph.py

@@ -1371,7 +1371,7 @@ class KadmosGraph(nx.DiGraph):
         # Handle the fact that the *args could also be a list or tuple directly
         if len(args) == 1 and (isinstance(args[0], tuple) or isinstance(args[0], list)):
-            args = list(args[0])
+            args = [args[0]]
         # Input assertions
         assert len(args) > 1, 'More than 1 input argument is required.'
@@ -1428,7 +1428,7 @@ class KadmosGraph(nx.DiGraph):
         # Handle the fact that the *args could also be a list or tuple directly
         if len(args) == 1 and (isinstance(args[0], tuple) or isinstance(args[0], list)):
-            args = list(args[0])
+            args = [args[0]]
         # Input assertions
         assert len(args) > 1, 'More than 1 input is required for this function.'
@@ -1498,7 +1498,7 @@ class KadmosGraph(nx.DiGraph):
         # Handle the fact that the *args could also be a list or tuple directly
         if len(args) == 2 and isinstance(args[0], basestring) and (isinstance(args[1], tuple) or isinstance(args[1], list)):
-            args = list(args[0]) + [arg for arg in args[1]]
+            args = [args[0]] + [arg for arg in args[1]]
         # Input assertions
         assert len(args) > 2, 'At least three arguments are required for a function mode merge.'
@@ -3431,7 +3431,10 @@ class KadmosGraph(nx.DiGraph):
         # Determine / check analysis order based on the full_graph (before creating temp folder)
         if not order:
             if not MPG:
-                order = full_graph['attributes']['tools']
+                # Get tool list and put the coordinator in the top left corner
+                tool_list = list(full_graph['attributes']['tools'])
+                tool_list.remove(coordinator_str)
+                order = [coordinator_str] + tool_list
             else:
                 # Find order based on FPG
                 order = []