Skip to content

Rebased version of JoinNode PR #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 91 commits into from
Oct 9, 2013
Merged

Rebased version of JoinNode PR #658

Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
835baf2
Simplify the XNAT data sink.
Mar 20, 2013
4782333
Make a SHA-1 digest directory name for long parameterizations.
Mar 20, 2013
c4cadb0
The ANTS 1.9 affine map is Affine.mat.
Mar 29, 2013
0617e6a
use_histogram_matching can be a Bool which applies to all transforms.…
May 21, 2013
e8eda0d
Add postfix file name input option.
May 21, 2013
0c2f849
Update the shape and slice dimension after a meta extension update.
May 21, 2013
bbdecd5
Remove unused line.
Mar 29, 2013
8113e55
Forego iterable param merge if there are no iterables.
May 21, 2013
45f66cf
Disable the ants Registration interface sigma_units vox value until i…
May 24, 2013
a6573c4
Format the smoothing-sigmas option without a unit if none is supplied.
May 24, 2013
a86e616
Set the input values.
Jun 14, 2013
63a0067
Remove unused line.
Mar 29, 2013
28df659
Remove unused kwargs Workflow parameter.
Jun 15, 2013
0001a9f
Add join feature.
Jul 24, 2013
d5fcb2d
Refactor join into JoinNode rather than a Join interface.
Jul 25, 2013
b897d8c
Clean up white space.
Jul 25, 2013
0b1d3da
Remove obsolete joinsource Node init parameter.
Jul 25, 2013
eb00354
Iterate with nodes_iter rather than nodes.
Jul 25, 2013
7976538
Support a Set join field.
Jul 25, 2013
cd30706
Support an identity join node.
Jul 26, 2013
3e3649a
The joinfield default is all input fields.
Jul 29, 2013
1382671
Support multiple join fields.
Jul 29, 2013
d620ba2
Support the unique flag.
Jul 29, 2013
c2bf451
Remove extraneous debug message.
Jul 29, 2013
cedcfac
Add new line.
Jul 30, 2013
3365581
Add itersource.
Jul 30, 2013
1bab9e1
Add itersource test.
Jul 30, 2013
385baec
The itersource iterables key is a tuple only if there is more than on…
Jul 30, 2013
306c78f
Remove spurious line.
Jul 30, 2013
f2b9305
Flush out the itersource test.
Jul 31, 2013
83d9d2e
Build the itersource iterables from the ancestor value lookup.
Jul 31, 2013
15012ff
Fix _iterable_nodes merge.
Jul 31, 2013
99b9f01
Support join on a node with an itersource.
Aug 1, 2013
6e92e9e
Add iterables synchronize.
Aug 2, 2013
a8e6e23
Clarify comment.
Aug 3, 2013
0830956
Refactor iterable standardization to account for the itersource alter…
Aug 3, 2013
088ec83
Test the alternate itersource iterables format.
Aug 3, 2013
37e01ce
Add the itersource field.
Aug 3, 2013
a9ba9c8
Support synchronize iterables tuple values.
Aug 3, 2013
766b5fc
Make the transposed synchronize iterable values a list.
Aug 4, 2013
114d026
Handle the alternate synchronize iterables format.
Aug 6, 2013
dee068d
Copy all join node fields from the override self._inputs to the base …
Aug 9, 2013
9246db6
Add a test for multiple join nodes.
Aug 9, 2013
96c9bac
The join node loop current node variable is jnode, not dest.
Aug 9, 2013
d8408f9
Use in rather than has_key for lookup.
Aug 9, 2013
80bf24e
Make joinsource a property and convert a setter node value to the nod…
Aug 14, 2013
cd340ea
Add whitespace.
Aug 16, 2013
8cd8347
Add join feature.
Jul 24, 2013
79bd1fd
Refactor join into JoinNode rather than a Join interface.
Jul 25, 2013
318a096
Clean up white space.
Jul 25, 2013
195abb1
Remove obsolete joinsource Node init parameter.
Jul 25, 2013
2a7bdda
Iterate with nodes_iter rather than nodes.
Jul 25, 2013
0a8caad
Support a Set join field.
Jul 25, 2013
ff7e157
Support an identity join node.
Jul 26, 2013
1928390
The joinfield default is all input fields.
Jul 29, 2013
49a37e9
Support multiple join fields.
Jul 29, 2013
3cdb9c1
Support the unique flag.
Jul 29, 2013
d289545
Remove extraneous debug message.
Jul 29, 2013
50b0ca6
Add new line.
Jul 30, 2013
2461482
Add itersource.
Jul 30, 2013
3d71609
Add itersource test.
Jul 30, 2013
8e8f0a9
The itersource iterables key is a tuple only if there is more than on…
Jul 30, 2013
e8ab121
Flush out the itersource test.
Jul 31, 2013
dbb091a
Build the itersource iterables from the ancestor value lookup.
Jul 31, 2013
8a90be5
Fix _iterable_nodes merge.
Jul 31, 2013
293b80f
Support join on a node with an itersource.
Aug 1, 2013
ae1a25a
Add iterables synchronize.
Aug 2, 2013
24b33d9
Clarify comment.
Aug 3, 2013
5f4a764
Refactor iterable standardization to account for the itersource alter…
Aug 3, 2013
d630887
Test the alternate itersource iterables format.
Aug 3, 2013
8ee3ea3
Add the itersource field.
Aug 3, 2013
aab06f5
Support synchronize iterables tuple values.
Aug 3, 2013
fa08d85
Make the transposed synchronize iterable values a list.
Aug 4, 2013
2a6bb8f
Handle the alternate synchronize iterables format.
Aug 6, 2013
9808609
Copy all join node fields from the override self._inputs to the base …
Aug 9, 2013
80383d0
Add a test for multiple join nodes.
Aug 9, 2013
9ece179
The join node loop current node variable is jnode, not dest.
Aug 9, 2013
c1eb0c1
Use in rather than has_key for lookup.
Aug 9, 2013
d7098af
Make joinsource a property and convert a setter node value to the nod…
Aug 14, 2013
192a7a9
Add whitespace.
Aug 16, 2013
a1c387c
Delete Nipype master merge artifact.
Sep 5, 2013
459cc3c
Add the JoinNode and itersource chapter to the index.
Sep 6, 2013
04e05d0
Add midstream itersource join tests.
Sep 6, 2013
bdfc4e4
Add JoinNode and itersource chapter to User Guide.
Sep 6, 2013
13a6bea
Improve JoinNode documentation.
Sep 6, 2013
d2106c0
Add JoinNode to pipeline init
Sep 9, 2013
c27f62d
Add JoinNode to nipype init
Sep 9, 2013
091b4a5
Flatten imports in JoinNode example.
Sep 9, 2013
8e26e7f
Fix the _add_join_item_fields doctest.
Sep 9, 2013
6d6a617
fix: tests
satra Sep 14, 2013
826cab1
sty: fixed white spaces
satra Sep 14, 2013
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
Use in rather than has_key for lookup.
  • Loading branch information
@satra
FredLoney authored and satra committed Sep 14, 2013
commit c1eb0c1e013f20eb26503c2a30f20ffc087d0787
2 changes: 1 addition & 1 deletion nipype/pipeline/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ def generate_expanded_graph(graph_in):
# lookup is a {source key: iteration list} dictionary. Look up the
# current iterable value using the predecessor itersource input values.
iter_dict = {field: lookup[key] for field, lookup in inode.iterables
if lookup.has_key(key)}
if key in lookup}
# convert the iterables to the standard {field: function} format
iter_items = map(lambda(field, value): (field, lambda: value),
iter_dict.iteritems())
Expand Down