Expand testing

mrc-ide · Dec 18, 2024 · 3557606 · 3557606
1 parent c2f1cf1
commit 3557606
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/R/dsl-differentiate-expr.R b/R/dsl-differentiate-expr.R
@@ -164,7 +164,7 @@ derivative <- list(
     }
 
     ## Have to resort to some actual calculation here, sadly:
-    call("if", fold("&&", i[!j]), 1, 0)
+    call("if", maths$fold("&&", i[!j]), 1, 0)
    },
   exp = function(expr, name) {
     a <- maths$rewrite(expr[[2]])

diff --git a/tests/testthat/test-dsl-differentiation.R b/tests/testthat/test-dsl-differentiation.R
@@ -461,6 +461,9 @@ test_that("differentiate expressions with arrays", {
   expect_equal(differentiate(quote((x[i] - x[i + 1])^2), "x"),
                quote(2 * (x[i] - x[1 + i])))
   expect_equal(differentiate(quote(x[i] - x[i + 1]), "x"), 1)
+
+  expect_equal(differentiate(quote(3 * (x[2] - x[i])), "x"),
+               quote(3 * ((if (2 == i) 1 else 0) - 1)))
 })