# HG changeset patch
# User greg
# Date 1508347293 14400
# Node ID 916208f6745d293adca0a6a100bf8a98befcfc11
# Parent  c834e636fd665a01dfa6dde85734bd6fbaf37495
Uploaded

diff -r c834e636fd66 -r 916208f6745d yolo.xml
--- a/yolo.xml	Tue Oct 17 13:36:25 2017 -0400
+++ b/yolo.xml	Wed Oct 18 13:21:33 2017 -0400
@@ -12,11 +12,11 @@
     #set input_filename = $i.file_name
     #set full_name = $i.name
     #set head = $full_name.split('.')[0]
-    #set output_filename_png = '%s_predictions.png' % $head
+    #set output_filename_image = '%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 -f jpg > output_shape_confidence_dir/$output_filename_shape_confidence
+    && mv ./predictions.jpg output_png_dir/$output_filename_image
 #end for
     ]]></command>
     <inputs>
@@ -28,13 +28,13 @@
         </param>
     </inputs>
     <outputs>
-        <collection name="output_shape" type="list" label="${tool.name} (shapes) on ${on_string}">
-            <discover_datasets pattern="__name__" directory="output_png_dir" format="png" />
-        </collection>
         <collection name="output_shape_confidence" type="list" label="${tool.name} (shape detection confidence) on ${on_string}">
             <discover_datasets pattern="__name__" directory="output_shape_confidence_dir" format="tabular" />
             <filter>output_shape_confidence == 'yes'</filter>
         </collection>
+        <collection name="output_shape" type="list" label="${tool.name} (shapes) on ${on_string}">
+            <discover_datasets pattern="__name__" directory="output_png_dir" format="png" />
+        </collection>
     </outputs>
     <tests>
         <test>