| Previous changeset 2:6480c6d5fa36 (2023-06-23) Next changeset 4:425c0494ec2d (2024-05-07) |
|
Commit message:
planemo upload for repository https://github.com/RECETOX/galaxytools/tree/master/tools/waveica commit b1cc1aebf796f170d93e3dd46ffcdefdc7b8018a |
|
modified:
waveica.xml waveica_wrapper.R |
| b |
| diff -r 6480c6d5fa36 -r dbbedb14b44c waveica.xml --- a/waveica.xml Fri Jun 23 07:27:29 2023 +0000 +++ b/waveica.xml Thu Oct 12 13:45:41 2023 +0000 |
| b |
| @@ -1,4 +1,4 @@ -<tool id="waveica" name="WaveICA" version="@TOOL_VERSION@+galaxy3" python_template_version="3.5"> +<tool id="waveica" name="WaveICA" version="@TOOL_VERSION@+galaxy4" python_template_version="3.5"> <description>removal of batch effects for untargeted metabolomics data</description> <macros> <import>macros.xml</import> |
| b |
| diff -r 6480c6d5fa36 -r dbbedb14b44c waveica_wrapper.R --- a/waveica_wrapper.R Fri Jun 23 07:27:29 2023 +0000 +++ b/waveica_wrapper.R Thu Oct 12 13:45:41 2023 +0000 |
| [ |
| @@ -109,8 +109,7 @@ data <- sort_by_injection_order(data) - feature_columns <- colnames(data)[!colnames(data) %in% - c(required_columns, optional_columns)] + feature_columns <- colnames(data)[!colnames(data) %in% c(required_columns, optional_columns)] features <- data[, feature_columns] injection_order <- data$injectionOrder @@ -137,14 +136,9 @@ sort_by_injection_order <- function(data) { if ("batch" %in% colnames(data)) { - data <- data[order(data[, "batch"], - data[, "injectionOrder"], - decreasing = FALSE - ), ] + data <- data[order(data[, "batch"], data[, "injectionOrder"], decreasing = FALSE), ] } else { - data <- data[order(data[, "injectionOrder"], - decreasing = FALSE - ), ] + data <- data[order(data[, "injectionOrder"], decreasing = FALSE), ] } return(data) } |