Build exponential mean interface

mrc-ide · Dec 3, 2024 · a9c7ba3 · a9c7ba3
1 parent f42a391
commit a9c7ba3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/R/combine.R b/R/combine.R
@@ -184,7 +184,7 @@ monty_model_combine <- function(a, b, properties = NULL,
 ##'
 ##' @export
 monty_model_split <- function(model, prior_first = FALSE) {
-  require_monty_model(model, arg = name, call = call)
+  require_monty_model(model, arg = "model", call = call)
 
   if (!inherits(model$model$data, "_combined_model")) {
     cli::cli_abort(

diff --git a/R/cpp11.R b/R/cpp11.R
diff --git a/src/cpp11.cpp b/src/cpp11.cpp
diff --git a/src/random.cpp b/src/random.cpp
@@ -358,21 +358,28 @@ cpp11::doubles cpp_monty_random_exponential_rate(cpp11::doubles rate, cpp11::sex
                                  rate, "rate");
 }
 
-// exponential_rate
 [[cpp11::register]]
 cpp11::doubles cpp_monty_random_n_exponential_rate(size_t n_samples, cpp11::doubles rate, cpp11::sexp ptr) {
   const auto fn = [](auto& state, auto rate) { return monty::random::exponential_rate<double>(state, rate); };
   return monty_random_sample_n_1(fn, n_samples, ptr, "exponential_rate",
                                  rate, "rate");
 }
 
+// exponential_mean
 [[cpp11::register]]
 cpp11::doubles cpp_monty_random_exponential_mean(cpp11::doubles mean, cpp11::sexp ptr) {
   const auto fn = [](auto& state, auto mean) { return monty::random::exponential_mean<double>(state, mean); };
   return monty_random_sample_1_1(fn, ptr, "exponential_mean",
                                  mean, "mean");
 }
 
+[[cpp11::register]]
+cpp11::doubles cpp_monty_random_n_exponential_mean(size_t n_samples, cpp11::doubles mean, cpp11::sexp ptr) {
+  const auto fn = [](auto& state, auto mean) { return monty::random::exponential_mean<double>(state, mean); };
+  return monty_random_sample_n_1(fn, n_samples, ptr, "exponential_mean",
+                                 mean, "mean");
+}
+
 // poisson
 [[cpp11::register]]
 cpp11::doubles cpp_monty_random_poisson(cpp11::doubles lambda, cpp11::sexp ptr) {