diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-12-10 17:53:50 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-12-10 17:53:50 +0100 |
| commit | c60bb84cd907b7286f29a72eeb4e63dcc5ebf1ce (patch) | |
| tree | c2d5358cb7a7b6ed38e86989b617bdaf3c12a2f4 | |
| parent | 9c87bd68e2eb0342bc53d11fe2c3920a2e903d16 (diff) | |
nlme with varConstProp is released
Also fix incompatibility with saem fits from earlier mkin versions
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | R/summary.saem.mmkin.R | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 0953d07e..697aa90d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: mkin Type: Package Title: Kinetic Evaluation of Chemical Degradation Data Version: 0.9.50.4 -Date: 2020-11-19 +Date: 2020-12-10 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de", comment = c(ORCID = "0000-0003-4371-6538")), @@ -18,7 +18,7 @@ Description: Calculation routines based on the FOCUS Kinetics Report (2006, particular purpose. Depends: R (>= 2.15.1), parallel Imports: stats, graphics, methods, deSolve, R6, inline (>= 0.3.17), numDeriv, - lmtest, pkgbuild, nlme (>= 3.1-150.1), purrr, saemix (>= 3.1.9000) + lmtest, pkgbuild, nlme (>= 3.1-151), purrr, saemix (>= 3.1.9000) Suggests: knitr, rbenchmark, tikzDevice, testthat, rmarkdown, covr, vdiffr, benchmarkme, tibble, stats4 License: GPL diff --git a/R/summary.saem.mmkin.R b/R/summary.saem.mmkin.R index 3f50c42d..e92c561c 100644 --- a/R/summary.saem.mmkin.R +++ b/R/summary.saem.mmkin.R @@ -89,6 +89,9 @@ summary.saem.mmkin <- function(object, data = FALSE, verbose = FALSE, distimes = confint_trans <- as.matrix(conf.int[pnames, c("estimate", "lower", "upper")]) colnames(confint_trans)[1] <- "est." + # In case objects were produced by earlier versions of saem + if (is.null(object$transformations)) object$transformations <- "mkin" + if (object$transformations == "mkin") { bp <- backtransform_odeparms(confint_trans[, "est."], object$mkinmod, object$transform_rates, object$transform_fractions) |