fixes, though something still odd about runArraySimulation with multicores

Author: philchalmers

R/analysis.R

@@ -53,8 +53,7 @@ Analysis <- function(Functions, condition, replications, fixed_objects, cl, MPI,
                    allow_na=allow_na, allow_nan=allow_nan, use_try=use_try,
                    allow_gen_errors=allow_gen_errors), TRUE)
         } else {
-            try(lapply_timer(1L:replications, mainsim,
-                           max_time=max_time, max_RAM=max_RAM,
+            try(lapply(1L:replications, mainsim,
                            condition=condition,
                            generate=Functions$generate,
                            analyse=Functions$analyse,
@@ -69,6 +68,7 @@ Analysis <- function(Functions, condition, replications, fixed_objects, cl, MPI,
                            useGenerate=useGenerate, useAnalyseHandler=useAnalyseHandler,
                            include_replication_index=include_replication_index,
                            allow_na=allow_na, allow_nan=allow_nan, use_try=use_try,
+                           max_time.start=max_time.start, max_time=max_time,
                            allow_gen_errors=allow_gen_errors), TRUE)
         }
     } else {

R/functions.R

@@ -428,6 +428,8 @@ mainsim <- function(index, condition, generate, analyse, fixed_objects, max_erro
 mainsim_maxtime <- function(max_time, max_time.start, ...){
     st <- proc.time()['elapsed']
     time_left <- max_time - (st - max_time.start)
+    if(time_left <= 0)
+        stop("Simulation terminated due to max_time constraint", call.=FALSE)
     out <- R.utils::withTimeout(mainsim(...),
                                 timeout = time_left,
                                 onTimeout = 'warning')