Mercurial > repos > siwaa > redelac_stics_t

changeset 19:8848db582840 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 9f38541b8f84bf16077819d47c96dbc69e3d1675"
author siwaa
date Thu, 09 Jul 2026 14:30:55 +0000
parents 8293d67cd1a9
children
files redelacSticsTool.R redelacSticsTool.xml
diffstat 2 files changed, 73 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/redelacSticsTool.R	Thu Jul 09 07:09:47 2026 +0000
+++ b/redelacSticsTool.R	Thu Jul 09 14:30:55 2026 +0000
@@ -137,47 +137,6 @@
 durGenT <-
   lubridate::as.duration(lubridate::interval(beforeGenTxtTime, afterGenTxtTime))
 
-endTime <- Sys.time()
-
-dur <-
-  lubridate::as.period(lubridate::as.duration(lubridate::interval(startTime, endTime)))
-durGenXP <- lubridate::as.period(durGenX)
-durGenTP <- lubridate::as.period(durGenT)
-
-print("REDELACSticsInputGenerator Report")
-print("=================================")
-print(paste("number of usms: ", nrow(usms_param)))
-print(paste("redelac optimization:", redelac))
-print(paste("process in parallel:", parallel))
-print(paste("nbslots:", nbSlots))
-
-sprintf(
-  'overall duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
-  lubridate::day(dur),
-  lubridate::hour(dur),
-  lubridate::minute(dur),
-  lubridate::second(dur)
-)
-
-sprintf(
-  'inside gen_usms_xml duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
-  lubridate::day(durGenXP),
-  lubridate::hour(durGenXP),
-  lubridate::minute(durGenXP),
-  lubridate::second(durGenXP)
-)
-
-sprintf(
-  'inside gen_usms_xml2txt duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
-  lubridate::day(durGenTP),
-  lubridate::hour(durGenTP),
-  lubridate::minute(durGenTP),
-  lubridate::second(durGenTP)
-)
-print(
-  "==================================================================================="
-)
-
 #
 # Simulation part
 #
@@ -251,34 +210,28 @@
     return(stics_wrapper(model_options = sim_options, situation = list_usms))
 
   }
-  
+
 afterSimsTime <- Sys.time()
 durSimsT <-
   lubridate::as.duration(lubridate::interval(beforeSimsTime, afterSimsTime))
 durSimsTP <- lubridate::as.period(durSimsT)
 
-sprintf(
-  'Simulations duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
-  lubridate::day(durSimsTP),
-  lubridate::hour(durSimsTP),
-  lubridate::minute(durSimsTP),
-  lubridate::second(durSimsTP)
-)
-print(
-  "==================================================================================="
-)
-
 #
 # Output part
 #
 
 beforeOutputsTime <- Sys.time()
 
-#for (j in  1:length(casesUpcSol)) {
+for (j in  1:length(casesUpcSol)) {
+
+  successive_usms_tab_split[[j]]$Treatment <- NULL
+  successive_usms_tab_split[[j]]$Number_USM <- NULL
 
-foreach(   			   
+}
+
+foreach(
     j = 1:length(casesUpcSol),
-    .options.future = list(packages =c("foreach", "tidyr", "arrow")
+    .options.future = list(packages =c("foreach", "tidyr", "arrow"))
     ) %dordopar% {
 
   splited <- strsplit(casesUpcSol[j], split = "-")[[1]]
@@ -401,8 +354,8 @@
       ))
   }
 
-  successive_usms_tab_split[[j]]$Treatment <- NULL
-  successive_usms_tab_split[[j]]$Number_USM <- NULL
+  #successive_usms_tab_split[[j]]$Treatment <- NULL
+  #successive_usms_tab_split[[j]]$Number_USM <- NULL
 
   list_usms <-
     unlist(unname(as.list(
@@ -551,10 +504,71 @@
 }
 
 afterOutputsTime <- Sys.time()
+
 durOutT <-
   lubridate::as.duration(lubridate::interval(beforeOutputsTime, afterOutputsTime))
+
+
+durGenXP <- lubridate::as.period(durGenX)
+durGenTP <- lubridate::as.period(durGenT)
 durOutTP <- lubridate::as.period(durOutT)
 
+endTime <- Sys.time()
+
+dur <-
+  lubridate::as.period(lubridate::as.duration(lubridate::interval(startTime, endTime)))
+
+print("REDELACSticsInputGenerator Report")
+print("=================================")
+print(paste("number of usms: ", nrow(usms_param)))
+print(paste("redelac optimization:", redelac))
+print(paste("process in parallel:", parallel))
+print(paste("nbslots:", nbSlots))
+
+sprintf(
+  'overall duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
+  lubridate::day(dur),
+  lubridate::hour(dur),
+  lubridate::minute(dur),
+  lubridate::second(dur)
+)
+print(
+  "==================================================================================="
+)
+
+sprintf(
+  'inside gen_usms_xml duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
+  lubridate::day(durGenXP),
+  lubridate::hour(durGenXP),
+  lubridate::minute(durGenXP),
+  lubridate::second(durGenXP)
+)
+print(
+  "==================================================================================="
+)
+
+sprintf(
+  'inside gen_usms_xml2txt duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
+  lubridate::day(durGenTP),
+  lubridate::hour(durGenTP),
+  lubridate::minute(durGenTP),
+  lubridate::second(durGenTP)
+)
+print(
+  "==================================================================================="
+)
+
+sprintf(
+  'Simulations duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
+  lubridate::day(durSimsTP),
+  lubridate::hour(durSimsTP),
+  lubridate::minute(durSimsTP),
+  lubridate::second(durSimsTP)
+)
+print(
+  "==================================================================================="
+)
+
 sprintf(
   'outputs generating duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
   lubridate::day(durOutTP),
--- a/redelacSticsTool.xml	Thu Jul 09 07:09:47 2026 +0000
+++ b/redelacSticsTool.xml	Thu Jul 09 14:30:55 2026 +0000
@@ -1,4 +1,4 @@
-<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.20">
+<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.21">
   <description>to run Stics for REDELAC</description>
   <requirements>
     <container type="singularity">docker://registry.forge.inrae.fr/redelac/redelac-toolbox/sticsrpacks:5337507635242b3ad0f3559a1a6b666512ecf002