Skip to content

Commit

Permalink
Merge branch '59-no-bootstrap-result-due-to-matrix-issues'
Browse files Browse the repository at this point in the history
  • Loading branch information
mattfidler committed Jan 26, 2024
2 parents 43690d3 + f952ec4 commit ccac76c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
12 changes: 6 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: nlmixr2extra
Title: Nonlinear Mixed Effects Models in Population PK/PD, Extra Support
Functions
Version: 2.0.8.9000
Version: 2.0.9
Authors@R: c(
person("Matthew", "Fidler", email="[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0001-8538-6691")),
Expand All @@ -20,13 +20,13 @@ Description: Fit and compare nonlinear mixed-effects models in
support functions like preconditioned fits
<doi:10.1208/s12248-016-9866-5>, boostrap and stepwise covariate
selection.
Depends:
Depends:
R (>= 4.0)
License: GPL (>= 3)
URL: https://nlmixr2.github.io/nlmixr2extra/,
https://github.com/nlmixr2/nlmixr2extra/
BugReports: https://github.com/nlmixr2/nlmixr2extra/issues/
Imports:
Imports:
checkmate,
cli (>= 3.4.0),
crayon,
Expand All @@ -44,20 +44,20 @@ Imports:
stats,
symengine,
utils
Suggests:
Suggests:
brms,
nlmixr2data,
testthat (>= 3.0.0),
withr,
dplyr,
devtools
LinkingTo:
LinkingTo:
Rcpp,
RcppArmadillo
Biarch: true
Config/testthat/edition: 3
Encoding: UTF-8
NeedsCompilation: yes
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
LazyData: true
8 changes: 5 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
# nlmixr2extra development version
# nlmixr2extra 2.0.9

* `bootstrapFit()` now will be more careful handling `NA` values so
they do not completely affect results (Issue #59)

* `bootstrapFit()` will now only take the correlation of the non-zero
diagonals (Issue #59).

# nlmixr2extra 2.0.9

* New method for `knit_print()` will generate model equations for LaTeX
reporting automatically.

* Tests are now skipped if they contain linear compartment models that
need gradients when the gradients are not compiled (as in the case
of intel c++).

# nlmixr2extra 2.0.8

* Use `assignInMyNamespace()` instead of using the global assignment
Expand Down
8 changes: 4 additions & 4 deletions tests/testthat/test-bootstrap.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ withr::with_tempdir({
linCmt() ~ add(add.sd)
})
}

skip_if_not(rxode2parse::.linCmtSens())
suppressMessages(suppressWarnings(
fit <-
nlmixr(
Expand Down Expand Up @@ -85,7 +85,7 @@ withr::with_tempdir({
linCmt() ~ add(add.sd)
})
}

skip_if_not(rxode2parse::.linCmtSens())
suppressMessages(suppressWarnings(
fit <-
nlmixr2(
Expand Down Expand Up @@ -131,7 +131,7 @@ withr::with_tempdir({
linCmt() ~ add(add.sd)
})
}

skip_if_not(rxode2parse::.linCmtSens())
suppressMessages(suppressWarnings(
fit <-
nlmixr2(
Expand Down Expand Up @@ -191,7 +191,7 @@ withr::with_tempdir({
table = list(npde = TRUE, cwres = TRUE)
)
))

skip_if_not(rxode2parse::.linCmtSens())
suppressMessages(
expect_error(fit1 <- nlmixr2extra:::bootstrapFit(fit, nboot = 2, restart = TRUE), NA)
)
Expand Down

0 comments on commit ccac76c

Please sign in to comment.