Skip to content
Snippets Groups Projects
Commit 04e3eab3 authored by thierrychambert's avatar thierrychambert
Browse files

Moved progress bar below the "if(interrputed)" section

parent 681173f6
No related branches found
No related tags found
No related merge requests found
...@@ -1762,10 +1762,6 @@ server <- function(input, output, session){ ...@@ -1762,10 +1762,6 @@ server <- function(input, output, session){
## Loops now ## ## Loops now ##
for(sim in 1:nsim){ for(sim in 1:nsim){
## Progress bar
progress$set(value = sim,
message = "Simulation progress",
detail = paste("simulation", sim))
Sys.sleep(0.1) Sys.sleep(0.1)
# Check for user interrupts # Check for user interrupts
...@@ -1774,6 +1770,11 @@ server <- function(input, output, session){ ...@@ -1774,6 +1770,11 @@ server <- function(input, output, session){
stop("User Interrupt") stop("User Interrupt")
} }
## Progress bar
progress$set(value = sim,
message = "Simulation progress",
detail = paste("simulation", sim))
# Notify status file of progress # Notify status file of progress
fire_running(100*sim/nsim) fire_running(100*sim/nsim)
...@@ -1887,10 +1888,6 @@ server <- function(input, output, session){ ...@@ -1887,10 +1888,6 @@ server <- function(input, output, session){
model_demo = model_demo, time_horizon = time_horizon, model_demo = model_demo, time_horizon = time_horizon,
coeff_var_environ = coeff_var_environ, fatal_constant = fatal_constant) coeff_var_environ = coeff_var_environ, fatal_constant = fatal_constant)
# Notify status file of progress
fire_running(100*sim/nsim)
} # sim ##----------------------------------------------------------------------------------------- } # sim ##-----------------------------------------------------------------------------------------
...@@ -1929,7 +1926,7 @@ server <- function(input, output, session){ ...@@ -1929,7 +1926,7 @@ server <- function(input, output, session){
NULL NULL
}else{ }else{
rpint("Not ready : missing values") print("Not ready : missing values")
result_N(NULL) result_N(NULL)
run_message("Not ready : missing values") run_message("Not ready : missing values")
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment