Add the controller argument to the C run function

stewid · Oct 5, 2018 · a8f36d9 · a8f36d9
1 parent 936bf6a
commit a8f36d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/R/SimInf_controller.R b/R/SimInf_controller.R
@@ -131,6 +131,7 @@ setMethod("run",
               ## Create the expression to parse
               expr <- paste0(".Call(",
                              expr_controller, ", ",
+                             "model, ",
                              expr_model, ", ",
                              "model@model, ",
                              "threads, ",

diff --git a/src/controllers/SimInf_NULL_controller.c b/src/controllers/SimInf_NULL_controller.c
@@ -19,6 +19,7 @@
 #include "SimInf.h"
 
 SEXP SimInf_NULL_controller_run(
+    SEXP controller,
     SEXP run_fn,
     SEXP model,
     SEXP threads,

diff --git a/src/init.c b/src/init.c
@@ -32,7 +32,7 @@ SEXP SISe3_run(SEXP, SEXP, SEXP);
 SEXP SISe3_sp_run(SEXP, SEXP, SEXP);
 SEXP SISe_sp_run(SEXP, SEXP, SEXP);
 SEXP SimInf_ldata_sp(SEXP, SEXP, SEXP, SEXP);
-SEXP SimInf_NULL_controller_run(SEXP, SEXP, SEXP, SEXP);
+SEXP SimInf_NULL_controller_run(SEXP, SEXP, SEXP, SEXP, SEXP);
 
 /**
  * Is OpenMP available
@@ -60,7 +60,7 @@ static const R_CallMethodDef callMethods[] =
     CALLDEF(SISe_sp_run, 3),
     CALLDEF(SimInf_have_openmp, 0),
     CALLDEF(SimInf_ldata_sp, 3),
-    CALLDEF(SimInf_NULL_controller_run, 4),
+    CALLDEF(SimInf_NULL_controller_run, 5),
     {NULL, NULL, 0}
 };