Mercurial > repos > greg > bmsb

changeset 24:af90870ced72 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Fri, 19 Aug 2016 14:38:43 -0400
parents c0ab95d49981
children 08cb8c7228c2
files bmsb.xml
diffstat 1 files changed, 18 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/bmsb.xml	Tue Aug 16 14:17:53 2016 -0400
+++ b/bmsb.xml	Fri Aug 19 14:38:43 2016 -0400
@@ -1,23 +1,29 @@
 <?xml version="."?>
 <tool id="bmsb_model" name="Brown Marmorated Stink Bug" version="1.0.0">
-    <description>model</description>
+    <description></description>
     <requirements>
          <requirement type="package" version="3.3.1">r-base</requirement>
          <requirement type="package" version="1.3.0">r-optparse</requirement>
     </requirements>
     <command>
         <![CDATA[
+            #import json
             Rscript $__tool_directory__/bmsb.R
             -i "$input"
-            #if str($output_r_logging_cond.output_r_logging) == "yes":
-                -s "true"
-                -m "$output_r_log"
-            #end if
             -o "$output"
+            ###if str($output_r_logging_cond.output_r_logging) == "yes":
+            ##    -s "true"
+            ##    -m "$output_r_log"
+            ###end if
+            ###if str($output_r_logging_cond.output_r_logging) == "yes":
+            ##    -e "true"
+            ##    -x "$output_ex_report"
+            ###end if
         ]]>
     </command>
     <inputs>
-        <param name="input" type="data" format="csv" label="Select temperature data" />
+        <param name="input" type="data" format="RData" label="RData input" />
+        <!--
         <conditional name="output_r_logging_cond">
             <param name="output_r_logging" type="select" label="Output R logging?" help="Generate an additional dataset consisting of R messages.">
                 <option value="yes" selected="True">Yes</option>
@@ -26,11 +32,17 @@
             <when value="no"/>
             <when value="yes"/>
         </conditional>
+        -->
     </inputs>
     <outputs>
+        <!--
         <data name="output_r_log" format="txt" label="${tool.name} on ${on_string}: R log">
             <filter>output_r_logging_cond['output_r_logging'] == "yes"</filter>
         </data>
+        <data name="output_ex_report" format="json" label="${tool.name} on ${on_string}: Experiment report">
+            <filter>output_experiment_report_cond['output_experiment_report'] == "yes"</filter>
+        </data>
+        -->
         <data name="output" format="RData"/>
     </outputs>
     <help>