# HG changeset patch
# User ebi-gxa
# Date 1606484766 0
# Node ID b869bb6d4b014b5c19632f44d339e818db111ba1
# Parent  d071810dc6dbf739ccf291db0b5f320874e65c31
"planemo upload for repository https://github.com/ebi-gene-expression-group/container-galaxy-sc-tertiary/ commit a1ad1ddd9b8e4db5bb82c3accae8311e0e488b19"

diff -r d071810dc6db -r b869bb6d4b01 scpred_macros.xml
--- a/scpred_macros.xml	Fri Aug 14 10:57:27 2020 -0400
+++ b/scpred_macros.xml	Fri Nov 27 13:46:06 2020 +0000
@@ -1,10 +1,10 @@
 <macros>
-    <token name="@TOOL_VERSION@">1.0.1</token>
+    <token name="@TOOL_VERSION@">1.0.2</token>
     <token name="@HELP@">More information can be found at https://joseah.github.io/post/introduction-to-scpred/</token>
     <token name="@PROFILE@">18.01</token>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="0.0.9">scpred-cli</requirement>
+            <requirement type="package" version="0.1.0">scpred-cli</requirement>
                 <yield/>
         </requirements>
     </xml>
@@ -15,6 +15,7 @@
     </xml>
     <token name="@VERSION_HISTORY@"><![CDATA[
         **Version history**
+        1.0.2+galaxy0: Update to a new version of r-scpred
         1.0.1+galaxy0: Update output format from csv to tsv
         1.0.0+galaxy0: Initilal contribution. Andrey Solovyev, Expression Atlas team https://www.ebi.ac.uk/gxa/home at EMBL-EBI https://www.ebi.ac.uk/.
         ]]></token>
diff -r d071810dc6db -r b869bb6d4b01 scpred_predict.xml
--- a/scpred_predict.xml	Fri Aug 14 10:57:27 2020 -0400
+++ b/scpred_predict.xml	Fri Nov 27 13:46:06 2020 +0000
@@ -5,39 +5,44 @@
     </macros>
     <expand macro="requirements" />
     <command detect_errors="exit_code"><![CDATA[
-        scpred_predict.R --input-object "${input_object}" --pred-data "${pred_data}" --output-path "${output_tbl_path}"  
+        scpred_predict.R --input-object "${input_object}" --pred-data "${pred_data}" --normalise-data "${normalise_data}"       --recompute-alignment "${recompute_alignment}" --reference-scaling "${reference_scaling}" --output-path "${output_path}"  
 
-        #if $test_labels
-        --test-labels "${test_labels}" 
+        #if $normalisation_method
+        --normalisation-method "${normalisation_method}"
         #end if
-        #if $cell_types_column
-        --cell-types-column "${cell_types_column}"
+        #if $scale_factor
+        --scale-factor "${scale_factor}"
         #end if
-        #if $plot_path
-        --plot-path "${plot_path}"
+        #if $threshold_level
+        --threshold-level "${threshold_level}"
         #end if
-        #if $confusion_table
-        --confusion-table "${confusion_table}"
+        #if $max_iter_harmony
+        --max-iter-harmony "${max_iter_harmony}"
         #end if
 
         ]]></command>
     <inputs>
-        <param type="data" name="input_object" label="Input SCE object" format="rdata" help="Input SCE object in .rds format" />
-        <param type="data" name="pred_data" label="Matrix with query data" format="rdata" help="Path to the input prediction matrix in .rds format"/>
-        <param type="data" name="test_labels" optional="true" format="txt" label="Test labels" help="Path to the test labels file for evalutation of model performance in text format" />
-        <param type="text" name="cell_types_column" value="cell_type2" optional="true" label="Cell types column name" help="Column name of true labels in provided metadata file" />
+
+        <param type="data" name="input_object" label="Input Seurat Object" format="rdata" help="Input Seurat object in .rds format" />
+        <param type="data" name="pred_data" label="Query Data Matrix" format="rdata" help="Path to the input prediction matrix in .rds format"/>
+        <param type="boolean" checked="false" name="normalise_data" label="Normalise Data"  help="Should the predicted expression data be normalised? Default: False"/>
+        <param type="text" name="normalisation_method" optional="true" value="LogNormalize" label="Normalisation Method" help="What normalisation method should be applied to predicted data? Default: LogNormalize"  />
+        <param type="integer" name="scale_factor" optional="true" value="1000000" label="Scale Factor" help="What scale factor should be applied? Note: for CPM normalisation, 1e6 is selected by default"  />
+        <param type="float" name="threshold_level" optional="true" value="0.8" label="Threshold Level" help="Classification threshold value"  />
+        <param type="integer" name="max_iter_harmony" optional="true" value="20" label="Max Iterations" help="Maximum number of rounds to run Harmony. One round of Harmony involves one clustering and one correction step"  />
+        <param type="boolean" checked="true" name="recompute_alignment" label="Recompute Alignment" help="Recompute alignment? Useful if scPredict() has already been run. Default: True"/>
+        <param type="boolean" checked="true" name="reference_scaling" label="Reference Scaling" help="Scale new dataset based on means and stdevs from reference dataset before alignment. Default: True"/>
+
     </inputs>
     <outputs>
-        <data name="output_tbl_path" format="txt" />
-        <data name="plot_path" format="png" />
-        <data name="confusion_table" format="txt" />
+        <data name="output_path" format="rdata" />
     </outputs>
     <tests>
         <test>
             <param name="input_object" value="scPred_trained.rds" />
-            <param name="pred_data" value="test_matrix.mtx" />
-            <param name="test_labels" value="test_metadata.txt" />
-            <output name="output_tbl_path" file="predictions_table.txt" compare="sim_size"/>
+            <param name="normalise_data" value="True" />
+            <param name="pred_data" value="query_pbmc.rds" />
+            <output name="output_path" file="predicted_data.rds" compare="sim_size" delta="10000000"/>
         </test>
     </tests>
      <help><![CDATA[