Mercurial > repos > siwaa > redelac_stics_t
changeset 20:475aa4451308 draft
"planemo upload for repository https://forgemia.inra.fr/redelac commit b4077990f5df769fbae45689f5bb12dbc81b2e4e"
| author | siwaa |
|---|---|
| date | Fri, 10 Jul 2026 11:43:17 +0000 |
| parents | 8848db582840 |
| children | 5dcba002e019 |
| files | redelacSticsTool.R redelacSticsTool.xml |
| diffstat | 2 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/redelacSticsTool.R Thu Jul 09 14:30:55 2026 +0000 +++ b/redelacSticsTool.R Fri Jul 10 11:43:17 2026 +0000 @@ -226,20 +226,14 @@ successive_usms_tab_split[[j]]$Treatment <- NULL successive_usms_tab_split[[j]]$Number_USM <- NULL - -} - -foreach( - j = 1:length(casesUpcSol), - .options.future = list(packages =c("foreach", "tidyr", "arrow")) - ) %dordopar% { - splited <- strsplit(casesUpcSol[j], split = "-")[[1]] upc <- splited[1] sol <- splited[2] + simPCPlist <- list() + for (i in 1:nrow(successive_usms_tab_split[[j]])) { #i=1 if (i == 1) { @@ -247,12 +241,21 @@ } else { simPCP$sim_list <- c(simPCP$sim_list, result[[j]][[i]]$sim_list) } + } - } + simPCPlist[[j]] <- simPCP +} + +rm(casesUpcSol) + +foreach( + j = 1:length(simPCPlist), + .options.future = list(packages =c("foreach", "tidyr", "arrow")) + ) %dordopar% { #agregation des sorties dans un dataframe sim_df <- - rbindlist(simPCP$sim_list, use.names = TRUE, idcol = "usm") + rbindlist(simPCPlist[[j]]$sim_list, use.names = TRUE, idcol = "usm") #ajout des colonnes explicatives + de l'horizon temporel sim_df <- sim_df %>%
--- a/redelacSticsTool.xml Thu Jul 09 14:30:55 2026 +0000 +++ b/redelacSticsTool.xml Fri Jul 10 11:43:17 2026 +0000 @@ -1,4 +1,4 @@ -<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.21"> +<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.22"> <description>to run Stics for REDELAC</description> <requirements> <container type="singularity">docker://registry.forge.inrae.fr/redelac/redelac-toolbox/sticsrpacks:5337507635242b3ad0f3559a1a6b666512ecf002