Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace _get_parameter_node with get_node
  • Loading branch information
HippocampusGirl committed Oct 19, 2020
commit 84c791b9d03832a65a1c47ac1b10c9ebfec60d4c
31 changes: 2 additions & 29 deletions nipype/pipeline/engine/workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -834,33 +834,6 @@ def _check_is_already_connected(workflow, node, attrname):

return True

def _get_parameter_node(self, parameter, subtype="in"):
"""Returns the underlying node corresponding to an input or
output parameter
"""
attrlist = parameter.split(".")
_ = attrlist.pop() # take attribute name
nodename = attrlist.pop()

targetworkflow = self
while attrlist:
workflowname = attrlist.pop(0)
workflow = None
for node in targetworkflow._graph.nodes():
if node.name == workflowname and isinstance(node, Workflow):
workflow = node
break
if workflow is None:
return
targetworkflow = workflow

for node in targetworkflow._graph.nodes():
if node.name == nodename:
if isinstance(node, Workflow):
return
else:
return node

def _check_outputs(self, parameter):
return self._has_attr(parameter, subtype="out")

Expand Down Expand Up @@ -989,7 +962,7 @@ def _generate_flatgraph(self):
logger.debug("in: connections-> %s", str(d["connect"]))
for cd in deepcopy(d["connect"]):
logger.debug("in: %s", str(cd))
dstnode = node._get_parameter_node(cd[1], subtype="in")
dstnode = node.get_node(parameter.rsplit(".", 1)[0])
srcnode = u
srcout = cd[0]
dstin = cd[1].split(".")[-1]
Expand All @@ -1009,7 +982,7 @@ def _generate_flatgraph(self):
parameter = cd[0][0]
else:
parameter = cd[0]
srcnode = node._get_parameter_node(parameter, subtype="out")
srcnode = node.get_node(parameter.rsplit(".", 1)[0])
if isinstance(cd[0], tuple):
srcout = list(cd[0])
srcout[0] = parameter.split(".")[-1]
Expand Down