# HG changeset patch
# User greg
# Date 1508422066 14400
# Node ID f191e0b8fa1d589aa9cc000317bae9a5a2ad7714
# Parent  53a9c312fe7add58ae1fadeef47ba73179d1961e
Uploaded

diff -r 53a9c312fe7a -r f191e0b8fa1d yolo.xml
--- a/yolo.xml	Thu Oct 19 10:01:49 2017 -0400
+++ b/yolo.xml	Thu Oct 19 10:07:46 2017 -0400
@@ -12,12 +12,9 @@
 #if str($input_type_cond.input_type) == 'image':
     #set input_filename = $input.file_name
     #set full_name = $input.name
-    #set head = $full_name.split('.')[0]
-    #set output_filename_png = '%s_predictions.png' % $head
-    #set output_filename_shape_confidence = '%s_shape_detection_confidence.tabular' % $head
     && ln -s $input_filename input_dir/$full_name
-    && darknet detect cfg/yolo.cfg yolo.weights 'input_dir/$full_name' -thresh $thresh > output_shape_confidence_dir/$output_filename_shape_confidence
-    && mv ./predictions.png output_png_dir/$output_filename_png
+    && darknet detect cfg/yolo.cfg yolo.weights 'input_dir/$full_name' -thresh $thresh > $output_shape_confidence
+    && mv ./predictions.png $output_shape
 #else:
     #for $i in $input:
         #set input_filename = $i.file_name
@@ -45,21 +42,21 @@
             </when>
         </conditional>
         <param name="thresh" type="float" value="0.25" label="Object detection threshold"/>
-        <param name="output_shape_confidence" type="select" display="radio" label="Output shape detection confidence levels?">
+        <param name="output_shape_confidence_log" type="select" display="radio" label="Output shape detection confidence levels?">
             <option value="yes" selected="true">Yes</option>
             <option value="no">No</option>
         </param>
     </inputs>
     <outputs>
         <data name="output_shape_confidence" format="tabular" label="${tool.name} (shape detection confidence) on ${on_string}">
-            <filter>input_type_cond['input_type'] == 'image' and output_shape_confidence == 'yes'</filter>
+            <filter>input_type_cond['input_type'] == 'image' and output_shape_confidence_log == 'yes'</filter>
         </data>
         <data name="output_shape" format="png" label="${tool.name} (shapes) on ${on_string}">
             <filter>input_type_cond['input_type'] == 'image'</filter>
         </data>
         <collection name="output_shape_confidences" type="list" label="${tool.name} (shape detection confidence) on ${on_string}">
             <discover_datasets pattern="__name__" directory="output_shape_confidence_dir" format="tabular" />
-            <filter>input_type_cond['input_type'] == 'images' and output_shape_confidence == 'yes'</filter>
+            <filter>input_type_cond['input_type'] == 'images' and output_shape_confidence_log == 'yes'</filter>
         </collection>
         <collection name="output_shapes" type="list" label="${tool.name} (shapes) on ${on_string}">
             <discover_datasets pattern="__name__" directory="output_png_dir" format="png" />