Skip to content

Commit f4c8867

Browse files
committed
fixed number input min and max, removed numbers from custom inputs (caused too many failures)
1 parent 61c836f commit f4c8867

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

nipype/utils/nipype2boutiques.py

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,14 @@ def get_boutiques_input(inputs, interface, input_name, spec,
226226
# Deal with range inputs
227227
if handler_type == "Range":
228228
input['type'] = "Number"
229-
if trait_handler.low is not None:
230-
input['minimum'] = trait_handler.low
231-
if trait_handler.high is not None:
232-
input['maximum'] = trait_handler.high
233-
if trait_handler.exclude_low is not None:
234-
input['exclusive-minimum'] = trait_handler.exclude_low
235-
if trait_handler.exclude_high is not None:
236-
input['exclusive-maximum'] = trait_handler.exclude_high
229+
if trait_handler._low is not None:
230+
input['minimum'] = trait_handler._low
231+
if trait_handler._high is not None:
232+
input['maximum'] = trait_handler._high
233+
if trait_handler._exclude_low:
234+
input['exclusive-minimum'] = True
235+
if trait_handler._exclude_high:
236+
input['exclusive-maximum'] = True
237237

238238
# Deal with list inputs
239239
# TODO handle lists of lists (e.g. FSL ProbTrackX seed input)
@@ -492,24 +492,16 @@ def fill_in_missing_output_path(output, output_name, tool_inputs):
492492
return output
493493

494494

495-
496495
def generate_custom_inputs(desc_inputs):
497496
'''
498497
Generates a bunch of custom input dictionaries in order to generate as many outputs as possible
499498
(to get their path templates)
500-
Limitations:
501-
-Does not support String inputs since some interfaces require specific strings
502-
-Does not support File inputs since the file has to actually exist or the interface will fail
503-
-Does not support list inputs yet
499+
Currently only works with flag inputs and inputs with defined value choices.
504500
'''
505501
custom_input_dicts = []
506502
for desc_input in desc_inputs:
507-
if desc_input.get('list'): # TODO support list inputs
508-
continue
509503
if desc_input['type'] == 'Flag':
510504
custom_input_dicts.append({desc_input['id']: True})
511-
elif desc_input['type'] == 'Number':
512-
custom_input_dicts.append({desc_input['id']: generate_random_number_input(desc_input)})
513505
elif desc_input.get('value-choices'):
514506
for value in desc_input['value-choices']:
515507
custom_input_dicts.append({desc_input['id']: value})

0 commit comments

Comments
 (0)