Skip to content

Commit

Permalink
Merge pull request #662 from nlmixr2/661-make-sure-the-ui-is-uncompre…
Browse files Browse the repository at this point in the history
…ssed-before-checking-for-meta-information

661 make sure the UI is uncompressed before checking for meta information
  • Loading branch information
mattfidler authored Mar 13, 2024
2 parents 4df2d59 + f2b0a8e commit 3259bd0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: rxode2
Version: 2.1.2
Version: 2.1.2.9000
Title: Facilities for Simulating from ODE-Based Models
Authors@R: c(
person("Matthew L.","Fidler",
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# rxode2 (development version)

## Bug fixes

- Make sure that the object is a uncompressed rxode2 ui for solving with `rxSolve` (See #661)

# rxode2 2.1.2

## Other changes
Expand Down
5 changes: 2 additions & 3 deletions R/rxsolve.R
Original file line number Diff line number Diff line change
Expand Up @@ -1149,9 +1149,8 @@ rxSolve.function <- function(object, params = NULL, events = NULL, inits = NULL,
.uiRxControl <- function(ui, params = NULL, events = NULL, inits = NULL, ...,
theta = NULL, eta = NULL) {
.ctl <- rxControl()
if (exists("meta", envir=ui)) {
.meta <- get("meta", ui)
} else {
.meta <- try(ui$meta, silent=TRUE)
if (!is.environment(.meta)) {
.meta <- new.env(parent=emptyenv())
}
.lst <- list(...)
Expand Down

0 comments on commit 3259bd0

Please sign in to comment.