Test the alternate itersource iterables format.

Author: FredLoney

nipype/pipeline/tests/test_engine.py

@@ -211,9 +211,9 @@ def test_synchronize_expansion():
     import nipype.pipeline.engine as pe
     wf1 = pe.Workflow(name='test')
     node1 = pe.Node(TestInterface(),name='node1')
-    node2 = pe.Node(TestInterface(),name='node2')
     node1.iterables = [('input1',[1,2]),('input2',[3,4,5])]
     node1.synchronize = True
+    node2 = pe.Node(TestInterface(),name='node2')
     wf1.connect(node1,'output1', node2, 'input2')
     wf3 = pe.Workflow(name='group')
     for i in [0,1,2]:
@@ -226,18 +226,33 @@ def test_synchronize_expansion():
     # => 18 nodes in the group
     yield assert_equal, len(pe.generate_expanded_graph(wf3._flatgraph).nodes()), 18
 
-def test_itersource_expansion():
+def test_synchronize_tuples_expansion():
     import nipype.pipeline.engine as pe
     wf1 = pe.Workflow(name='test')
     node1 = pe.Node(TestInterface(),name='node1')
     node2 = pe.Node(TestInterface(),name='node2')
-    node3 = pe.Node(TestInterface(),name='node3')
+    node1.iterables = [('input1','input2'), [(1,3), (2,4), (None,5)]]
+    node1.synchronize = True
+    wf1.connect(node1,'output1', node2, 'input2')
+    wf3 = pe.Workflow(name='group')
+    for i in [0,1,2]:
+        wf3.add_nodes([wf1.clone(name='test%d'%i)])
+    wf3._flatgraph = wf3._create_flat_graph()
+    # Identical to test_synchronize_expansion
+    yield assert_equal, len(pe.generate_expanded_graph(wf3._flatgraph).nodes()), 18
+
+def test_itersource_expansion():
+    import nipype.pipeline.engine as pe
+    wf1 = pe.Workflow(name='test')
+    node1 = pe.Node(TestInterface(),name='node1')
     node1.iterables = ('input1',[1,2])
-    node3.itersource = 'node1'
-    node3.iterables = [('input1',{1:[3,4], 2:[5,6,7]}), ('input2',{1:[6,7]})]
-    node4 = pe.Node(TestInterface(),name='node4')
+    node2 = pe.Node(TestInterface(),name='node2')
     wf1.connect(node1,'output1', node2, 'input1')
+    node3 = pe.Node(TestInterface(),name='node3')
+    node3.itersource = ('node1', 'input1')
+    node3.iterables = [('input1', {1:[3,4], 2:[5,6,7]})]
     wf1.connect(node2,'output1', node3, 'input1')
+    node4 = pe.Node(TestInterface(),name='node4')
     wf1.connect(node3,'output1', node4, 'input1')
     wf3 = pe.Workflow(name='group')
     for i in [0,1,2]:
@@ -246,13 +261,13 @@ def test_itersource_expansion():
 
     # each expanded graph clone has:
     # 2 node1 expansion nodes,
-    # 2 node2 successors,
-    # 2 * 2 node3 replicates for the node1 input1 value 1 replicate,
-    # 3 node3 replicates for the node1 input1 value 2 replicate and
+    # 1 node2 per node1 replicate,
+    # 2 node3 replicates for the node1 input1 value 1,
+    # 3 node3 replicates for the node1 input1 value 2 and
     # 1 node4 successor per node3 replicate
-    # => 2 + 2 + (4 + 3) + 7 = 24 nodes per expanded graph clone
-    # => 3 * 18 = 54 nodes in the group
-    yield assert_equal, len(pe.generate_expanded_graph(wf3._flatgraph).nodes()), 54
+    # => 2 + 2 + (2 + 3) + 5 = 14 nodes per expanded graph clone
+    # => 3 * 14 = 42 nodes in the group
+    yield assert_equal, len(pe.generate_expanded_graph(wf3._flatgraph).nodes()), 42
 
 def test_disconnect():
     import nipype.pipeline.engine as pe