Support min/max

R/generate_dust_sexp.R

@@ -201,9 +201,9 @@ generate_dust_sexp_reduce <- function(expr, dat, options) {
   dim <- paste0(
     if (isFALSE(options$shared_exists)) "dim_" else "shared.dim.",
     target)
-  stopifnot(fn == "sum")
+  stopifnot(fn %in% c("sum", "prod", "min", "max"))
   if (is.null(index)) {
-    sprintf("dust2::array::sum<real_type>(%s, %s)", target_str, dim)
+    sprintf("dust2::array::%s<real_type>(%s, %s)", fn, target_str, dim)
   } else {
     index_str <- paste(vcapply(index, function(el) {
       if (el$type == "single") {
@@ -217,7 +217,7 @@ generate_dust_sexp_reduce <- function(expr, dat, options) {
               generate_dust_sexp(from, dat, options),
               generate_dust_sexp(to, dat, options))
     }), collapse = ", ")
-    sprintf("dust2::array::sum<real_type>(%s, %s, %s)",
-            target_str, dim, index_str)
+    sprintf("dust2::array::%s<real_type>(%s, %s, %s)",
+            fn, target_str, dim, index_str)
   }
 }

tests/testthat/test-generate.R

@@ -1660,3 +1660,21 @@ test_that("Generate conditional debug", {
       "  }",
       "}"))
 })
+
+
+test_that("support min/max", {
+  dat <- odin_parse({
+    update(x) <- min(a) + max(b, c)
+    initial(x) <- 0
+    a[] <- i
+    dim(a) <- 10
+    b <- 20
+    c <- 30
+  })
+  dat <- generate_prepare(dat)
+  expect_equal(
+    generate_dust_system_update(dat),
+    c(method_args$update,
+      "  state_next[0] = dust2::array::min<real_type>(shared.a, shared.dim.a) + std::max(shared.b, shared.c);",
+      "}"))
+})