# HG changeset patch # User siwaa # Date 1787150150 0 # Node ID 3b44cb0a1e760ace2af886ce0d6fccf71b635d00 # Parent 15317ef4816b70c388dc012981b711587ddeb944 "planemo upload for repository https://forgemia.inra.fr/redelac commit 4cad1cb9719e5d2ca13cf8a5c8b98b2409303b59" diff -r 15317ef4816b -r 3b44cb0a1e76 redelacSticsTool.R --- 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) { diff -r 15317ef4816b -r 3b44cb0a1e76 redelacSticsTool.xml --- 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 @@ - + to run Stics for REDELAC docker://registry.forge.inrae.fr/redelac/redelac-toolbox/sticsrpacks:5337507635242b3ad0f3559a1a6b666512ecf002