Mercurial > repos > testtool > survival

changeset 24:51181b91c57e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author testtool
date Mon, 02 Oct 2017 09:32:44 -0400
parents 501cd6a5cd31
children a0ae4293a398
files survival/survival.xml
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/survival/survival.xml	Mon Oct 02 09:27:02 2017 -0400
+++ b/survival/survival.xml	Mon Oct 02 09:32:44 2017 -0400
@@ -4,7 +4,7 @@
         <requirement type="package" version="2.40_1">r-survival</requirement>
     </requirements>
     <command detect_errors="aggressive">
-        Rscript '$__tool_directory__/survival.R' 
+        Rscript '$__tool_directory__/survival.R' '$input' '$type' '$error' '$conf_type' '$conf_lower' '$fit' '$png'
     </command>
 <inputs>
         <param format="csv" type="data" name="input"  value="" label="survival data" help="
@@ -21,7 +21,6 @@
     <option value="fleming-harrington">fleming-harrington</option>
     <option  value="fh2">fh2</option>
   </param> 
-   <when value="quantile" />
   <when value="kaplan-meier"/>
   <when value="fleming-harrington"/>
   <when value="fh2"/>
@@ -32,6 +31,8 @@
         <option value="greenwood">greenwood</option>
         <option value="tsiatis">tsiatis</option>
       </param>
+      <when value="greenwood" />
+      <when value="tsiatis"/>
     </conditional>
        
           <conditional name="conf_type">
@@ -41,6 +42,10 @@
         <option value="plain">plain</option>
         <option value="none">none</option>
       </param>
+      <when value="log" />
+      <when value="log-log"/>
+      <when value="plain" />
+      <when value="none"/>
     </conditional>
     
         <conditional name="conf_lower">
@@ -49,6 +54,9 @@
         <option value="peto">peto</option>
         <option value="modified">modified</option>
       </param>
+      <when value="usual" />
+      <when value="peto" />
+      <when value="modified" />
     </conditional>
     
     </inputs>