Revert "Rewrite the exponential decay process in C++. (mrc-ide#285)"

This reverts commit b3376d3.
plietar · May 21, 2024 · 644b49a · 644b49a
1 parent 5f4e7f3
commit 644b49a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 159 deletions.
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -45,10 +45,6 @@ rainfall <- function(t, g0, g, h, floor) {
     .Call(`_malariasimulation_rainfall`, t, g0, g, h, floor)
 }
 
-exponential_process_cpp <- function(variable, rate) {
-    .Call(`_malariasimulation_exponential_process_cpp`, variable, rate)
-}
-
 solver_get_states <- function(solver) {
     .Call(`_malariasimulation_solver_get_states`, solver)
 }

diff --git a/R/processes.R b/R/processes.R
@@ -285,9 +285,8 @@ create_processes <- function(
 #' @param rate the exponential rate
 #' @noRd
 create_exponential_decay_process <- function(variable, rate) {
-  stopifnot(inherits(variable, "DoubleVariable"))
   decay_rate <- exp(-1/rate)
-  exponential_process_cpp(variable$.variable, decay_rate)
+  function(timestep) variable$queue_update(variable$get_values() * decay_rate)
 }
 
 #' @title Create and initialise lagged_infectivity object

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -179,18 +179,6 @@ BEGIN_RCPP
     return rcpp_result_gen;
 END_RCPP
 }
-// exponential_process_cpp
-Rcpp::XPtr<process_t> exponential_process_cpp(Rcpp::XPtr<DoubleVariable> variable, const double rate);
-RcppExport SEXP _malariasimulation_exponential_process_cpp(SEXP variableSEXP, SEXP rateSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< Rcpp::XPtr<DoubleVariable> >::type variable(variableSEXP);
-    Rcpp::traits::input_parameter< const double >::type rate(rateSEXP);
-    rcpp_result_gen = Rcpp::wrap(exponential_process_cpp(variable, rate));
-    return rcpp_result_gen;
-END_RCPP
-}
 // solver_get_states
 std::vector<double> solver_get_states(Rcpp::XPtr<Solver> solver);
 RcppExport SEXP _malariasimulation_solver_get_states(SEXP solverSEXP) {
@@ -362,7 +350,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"_malariasimulation_carrying_capacity", (DL_FUNC) &_malariasimulation_carrying_capacity, 8},
     {"_malariasimulation_eggs_laid", (DL_FUNC) &_malariasimulation_eggs_laid, 3},
     {"_malariasimulation_rainfall", (DL_FUNC) &_malariasimulation_rainfall, 5},
-    {"_malariasimulation_exponential_process_cpp", (DL_FUNC) &_malariasimulation_exponential_process_cpp, 2},
     {"_malariasimulation_solver_get_states", (DL_FUNC) &_malariasimulation_solver_get_states, 1},
     {"_malariasimulation_solver_set_states", (DL_FUNC) &_malariasimulation_solver_set_states, 3},
     {"_malariasimulation_solver_step", (DL_FUNC) &_malariasimulation_solver_step, 1},

diff --git a/src/processes.cpp b/src/processes.cpp
diff --git a/tests/testthat/test-processes.R b/tests/testthat/test-processes.R