Merge pull request #300 from mrc-ide/mrc-4446

mrc-ide · Aug 16, 2023 · 6f39af2 · 6f39af2
2 parents d5e2958 + 5c98040
commit 6f39af2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: odin
 Title: ODE Generation and Integration
-Version: 1.5.5
+Version: 1.5.6
 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
                     email = "rich.fitzjohn@gmail.com"),
              person("Thibaut", "Jombart", role = "ctb"),

diff --git a/R/js.R b/R/js.R
@@ -116,6 +116,9 @@ odin_js_wrapper_continuous <- function(res) {
                      use_names = TRUE, return_statistics = FALSE) {
         t_js <- to_json_js(t, auto_unbox = FALSE)
         y_js <- to_json_js(y, auto_unbox = FALSE, null = "null")
+        if (!is.null(tcrit)) {
+          tcrit <- I(tcrit)
+        }
         control <- list(atol = atol,
                         rtol = rtol,
                         tcrit = tcrit,

diff --git a/inst/js/dust.js b/inst/js/dust.js
diff --git a/inst/js/odin.js b/inst/js/odin.js
diff --git a/tests/testthat/test-run-interpolation.R b/tests/testthat/test-run-interpolation.R
@@ -176,6 +176,7 @@ test_that_odin("linear", {
   expect_error(mod$run(c(tt, max(tp) + 1)),
                "Integration times do not span interpolation range")
 
+  skip_for_target("js", "has better tcrit support")
   expect_error(mod$run(tt, tcrit = 3),
                "Interpolation failed as .+ is out of range")
 })