Mercurial > repos > siwaa > redelac_stics_t

changeset 23:3b44cb0a1e76 draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://forgemia.inra.fr/redelac commit 4cad1cb9719e5d2ca13cf8a5c8b98b2409303b59"
author siwaa
date Wed, 19 Aug 2026 14:35:50 +0000
parents 15317ef4816b
children
files redelacSticsTool.R redelacSticsTool.xml
diffstat 2 files changed, 16 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/redelacSticsTool.R	Tue Jul 21 14:23:47 2026 +0000
+++ b/redelacSticsTool.R	Wed Aug 19 14:35:50 2026 +0000
@@ -251,7 +251,7 @@
     )
 
     list_usms <- vec
-
+    
     cat(paste0("--> succession : ", successive_usms_tab_split[[j]][i, 1], " launched\n"))
 
     return(stics_wrapper(model_options = sim_options, situation = list_usms))
@@ -267,14 +267,18 @@
 # Output part
 #
 
+for (j in  1:length(casesUpcSol)) {
+  successive_usms_tab_split[[j]]$Treatment <- NULL
+  successive_usms_tab_split[[j]]$Number_USM <- NULL
+}
+
 beforeOutputsTime <- Sys.time()
 
-simPCPlist <- list()
+foreach(
+    j = 1:length(casesUpcSol),
+    .options.future = list(packages =c("foreach", "tidyr", "arrow"))
+    ) %dordopar% {
 
-for (j in  1:length(casesUpcSol)) {
-
-  successive_usms_tab_split[[j]]$Treatment <- NULL
-  successive_usms_tab_split[[j]]$Number_USM <- NULL
   splited <- strsplit(casesUpcSol[j], split = "-")[[1]]
 
   upc <- splited[1]
@@ -288,21 +292,13 @@
     } 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(simPCPlist[[j]]$sim_list, use.names = TRUE, idcol = "usm")
+    rbindlist(simPCP$sim_list, use.names = TRUE, idcol = "usm")
+
 
   #ajout des colonnes explicatives + de l'horizon temporel
   sim_df <- sim_df %>%
@@ -322,6 +318,8 @@
       remove = FALSE
     )
 
+    cat(paste0("--> rotation upc sol : ", " ", rotation, " ", upc, " " , sol, " to be gathered\n"))
+
   #sauvegarde sous la forme d'un fichier rds
 
   if (baseOut) {
--- a/redelacSticsTool.xml	Tue Jul 21 14:23:47 2026 +0000
+++ b/redelacSticsTool.xml	Wed Aug 19 14:35:50 2026 +0000
@@ -1,4 +1,4 @@
-<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.24">
+<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.25">
   <description>to run Stics for REDELAC</description>
   <requirements>
     <container type="singularity">docker://registry.forge.inrae.fr/redelac/redelac-toolbox/sticsrpacks:5337507635242b3ad0f3559a1a6b666512ecf002