diff EDeN_feature.xml @ 9:5be8af51780d draft

Uploaded
author bgruening
date Thu, 15 May 2014 12:11:27 -0400
parents 59b3b6ce10bb
children
line wrap: on
line diff
--- a/EDeN_feature.xml	Mon Jan 13 09:28:44 2014 -0500
+++ b/EDeN_feature.xml	Thu May 15 12:11:27 2014 -0400
@@ -5,12 +5,8 @@
     </macros>
     <expand macro="requirements" />
     <command>
-        tmp_dir=`mktemp -d -u`;
-
         EDeN --action FEATURE
 
-        --output_directory_path \$tmp_dir
-
         --input_data_file_name $infile
         --model_file_name $outfile
 
@@ -34,10 +30,6 @@
 
         @input_smooth_conditional@
 
-        ;
-        cp \$tmp_dir/feature $outfile;
-        rm \$tmp_dir -rf;
-
     </command>
     <stdio>
         <regex match="Error" 
@@ -54,6 +46,7 @@
                 <option value="GRAPH">Graph</option>
                 <option value="SPARSE_VECTOR">sparse vector</option>
                 <option value="SEQUENCE">Sequence</option>
+                <option value="STRINGSEQ">String (can be any word like character sequence)</option>
             </param>
             <when value="GRAPH" />
             <when value="SPARSE_VECTOR" />
@@ -65,8 +58,7 @@
                 <param name="sequence_multi_line" type="boolean" label="Sequence is in multi-line notation" truevalue="--sequence_multi_line" falsevalue="" checked="false" />
                 <param name="sequence_pairwise_interaction" type="boolean" label="Sequence pairwise iterations" truevalue="--sequence_pairwise_interaction" falsevalue="" checked="false" />
             </when>
-            <when value="sdf" />
-            <when value="smi" />
+            <when value="STRINGSEQ" />
         </conditional>
 
         <expand macro="kernel_type_options" />
@@ -114,7 +106,7 @@
 </configfile>
     </configfiles>
     <outputs>
-        <data format="sparsevector" name="outfile" label="Sparse Vector from ${on_string}"/>
+        <data format="sparsevector" name="outfile" from_work_dir="feature" label="Sparse Vector from ${on_string}"/>
     </outputs>
     <tests>
         <test>