changeset 10:d495c233148c draft

Uploaded
author bgruening
date Thu, 15 May 2014 17:22:44 -0400
parents 5be8af51780d
children bf63bd4cf462
files EDeN_test.xml EDeN_train.xml
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/EDeN_test.xml	Thu May 15 12:11:27 2014 -0400
+++ b/EDeN_test.xml	Thu May 15 17:22:44 2014 -0400
@@ -13,13 +13,13 @@
 
         --model_file_name $model_infile
 
-        --minimal_output 
+        --minimal_output
 
     </command>
     <inputs>
-        <param format="eden_sparse_vector" name="sparse_vector_infile" type="data" label="Input File" help=""/>
-        <param format="txt" name="model_infile" type="data" label="Input Model" 
-            help="created with the EDeN Train program"/>
+        <param format="eden_sparse_vector" name="sparse_vector_infile" type="data" label="Input File" help="Sparse Vector file, created with EDeN convert." />
+        <param format="txt" name="model_infile" type="data" label="Input Model"
+            help="Created with EDeN Train."/>
 
         <expand macro="kernel_type_options" />
 
@@ -29,7 +29,8 @@
 
     </inputs>
     <outputs>
-        <data format="tabular" name="output" from_work_dir="prediction" label="Generated from ${on_string}"/>
+        <data format="tabular" name="output" from_work_dir="prediction" label="EDeN on ${on_string}: Prediction"/>
+        <data format="tabular" name="output" from_work_dir="margin" label="EDeN on ${on_string}: Margin"/>
     </outputs>
     <tests>
         <test>
--- a/EDeN_train.xml	Thu May 15 12:11:27 2014 -0400
+++ b/EDeN_train.xml	Thu May 15 17:22:44 2014 -0400
@@ -33,10 +33,9 @@
             --only_negative $supervised_opts.only_negative
         #end if
 
-
     </command>
     <inputs>
-        <param format="eden_sparse_vector" name="infile" type="data" label="Input Graph" help=""/>
+        <param format="eden_sparse_vector" name="infile" type="data" label="Input File" help="Sparse Vector file, created with EDeN convert."/>
         <param format="txt" name="target_infile" type="data" label="Target file" help="indicates with -1 and 1 the class"/>
 
         <param name="epoch" type="integer" value="10" label="Epoch, Stochastic gradient descend algorithm." help="">
@@ -62,7 +61,7 @@
             </param>
             <when value="non">
             </when>
-            <when value="">
+            <when value="supervised">
                 <!-- Semi-supervised-settings -->
                 <param name="threshold" type="float" value="1.0" label="Top and low quantile" 
                     help="Only the top and low quantile will be used as positives and negative instances. A threshold of 1 means that all unsupervised instaces are used in the next phase.">