changeset 5:e0af18405e37 draft

planemo upload for repository https://github.com/BMCV/galaxy-image-analysis/tree/master/tools/curve_fitting/ commit cd63bc5e6eb7254111012209fac9154569355f20
author imgteam
date Tue, 19 Jul 2022 08:51:41 +0000
parents 004c57179c61
children 2dc244356765
files curve_fitting.py curve_fitting.xml
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/curve_fitting.py	Sat Apr 09 12:46:19 2022 +0000
+++ b/curve_fitting.py	Tue Jul 19 08:51:41 2022 +0000
@@ -68,7 +68,7 @@
         seq = data_all[i][:, -1]
         seq_fit = seq.copy()
         idx_valid = ~np.isnan(seq)
-        seq_fit[idx_valid] = curve_fitting(seq[idx_valid], degree=2, penalty='abs')
+        seq_fit[idx_valid] = curve_fitting(seq[idx_valid], degree=degree, penalty=penalty)
         data_all[i] = np.concatenate((data_all[i], seq_fit.reshape(-1, 1)), axis=1)
         if alpha > 0:
             diff = np.concatenate((diff, seq_fit[idx_valid] - seq[idx_valid]))
--- a/curve_fitting.xml	Sat Apr 09 12:46:19 2022 +0000
+++ b/curve_fitting.xml	Tue Jul 19 08:51:41 2022 +0000
@@ -1,4 +1,4 @@
-<tool id="ip_curve_fitting" name="Curve Fitting" version="0.0.2" profile="20.05"> 
+<tool id="ip_curve_fitting" name="Curve Fitting" version="0.0.3" profile="20.05"> 
     <description>to data points using (1st- or 2nd-degree) polynomial function</description>
     <requirements>
         <requirement type="package" version="1.20.2">numpy</requirement>
@@ -11,9 +11,9 @@
 python '$__tool_directory__/curve_fitting.py'
     '$fn_in'
     ./output.xlsx
-    '$degree'
-    '$penalty'
-    '$alpha'
+    $degree
+    $penalty
+    $alpha
     ]]>
     </command>
     <inputs>