From 4de47be0bc4e6b923a6db15b9abc461046a99eac Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 2 Feb 2018 10:02:23 +0100 Subject: Show R and mkin version used for fitting in the summary For fits generated with previous version, the version numbers used for fitting were not stored in the fit object. Therefore, the versions used for fitting can only be shown for fits generated with mkin containing this commit. --- NEWS.md | 4 +++- R/mkinfit.R | 17 +++++++++++++++-- docs/news/index.html | 7 ++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index 26da68bd..87bad442 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# mkin 0.9.47.1 (2017-01-30) +# mkin 0.9.47.1 (2017-02-02) - 'test_data_from_UBA_2014': Added this list of datasets containing experimental data used in the expertise from 2014 @@ -6,6 +6,8 @@ - 'summary.mkinfit': Improved output regarding weighting method. No predictions are returned for NA values in the model (see above). +- 'summary.mkinfit': Show versions of mkin and R used for fitting (not the ones used for the summary) if the fit was generated with mkin >= 0.9.47.1 + # mkin 0.9.46.3 (2017-11-16) - `README.md`, `vignettes/mkin.Rmd`: URLs were updated diff --git a/R/mkinfit.R b/R/mkinfit.R index adc20a9f..ab7b5ad2 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -597,6 +597,8 @@ mkinfit <- function(mkinmod, observed, names(fit$bparms.state) <- gsub("_0$", "", names(fit$bparms.state)) fit$date <- date() + fit$version <- as.character(utils::packageVersion("mkin")) + fit$Rversion <- paste(R.version$major, R.version$minor, sep=".") class(fit) <- c("mkinfit", "modFit") return(fit) @@ -694,6 +696,11 @@ summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, alpha = 0.05, par = param, bpar = bparam) + if (!is.null(object$version)) { + ans$fit_version <- object$version + ans$fit_Rversion <- object$Rversion + } + ans$diffs <- object$mkinmod$diffs if(data) ans$data <- object$data ans$start <- object$start @@ -715,8 +722,14 @@ summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, alpha = 0.05, # Expanded from print.summary.modFit print.summary.mkinfit <- function(x, digits = max(3, getOption("digits") - 3), ...) { - cat("mkin version: ", x$version, "\n") - cat("R version: ", x$Rversion, "\n") + if (is.null(x$fit_version)) { + cat("mkin version: ", x$version, "\n") + cat("R version: ", x$Rversion, "\n") + } else { + cat("mkin version used for fitting: ", x$fit_version, "\n") + cat("R version used for fitting: ", x$fit_Rversion, "\n") + } + cat("Date of fit: ", x$date.fit, "\n") cat("Date of summary:", x$date.summary, "\n") diff --git a/docs/news/index.html b/docs/news/index.html index 28ec949f..0e7ceabf 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -103,13 +103,14 @@
-
+

-mkin 0.9.47.1 (2017-01-30)

+mkin 0.9.47.1 (2017-02-02)

  • ‘test_data_from_UBA_2014’: Added this list of datasets containing experimental data used in the expertise from 2014

  • ‘mkinfit’: Added the iterative reweighting method ‘tc’ using the two-component error model from Rocke and Lorenzato. NA values in the data are not returned any more.

  • ‘summary.mkinfit’: Improved output regarding weighting method. No predictions are returned for NA values in the model (see above).

    • +

  • ‘summary.mkinfit’: Show versions of mkin and R used for fitting (not the ones used for the summary) if the fit was generated with mkin >= 0.9.47.1

@@ -587,7 +588,7 @@

Contents