aboutsummaryrefslogtreecommitdiff
path: root/R
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2020-12-09 13:08:01 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2020-12-09 13:08:01 +0100
commit3b15daaf373ebc36da2eb92f2e37ed569731f07d (patch)
tree75339d1b69c30edf26251a48fedeee70b6069d82 /R
parentc6944440507b4b793a3715704122dfffb350a5a0 (diff)
More tests
Diffstat (limited to 'R')
-rw-r--r--R/nlme.mmkin.R2
-rw-r--r--R/summary.nlme.mmkin.R8
2 files changed, 5 insertions, 5 deletions
diff --git a/R/nlme.mmkin.R b/R/nlme.mmkin.R
index c6f15c8e..82d5f6de 100644
--- a/R/nlme.mmkin.R
+++ b/R/nlme.mmkin.R
@@ -230,7 +230,7 @@ print.nlme.mmkin <- function(x, digits = max(3, getOption("digits") - 3), ...) {
length(unique(x$data$name)), "variable(s) grouped in",
length(unique(x$data$ds)), "datasets\n")
cat("\nLog-", if(x$method == "REML") "restricted-" else "",
- "likelihood: ", format(x$logLik), "\n", sep = "")
+ "likelihood: ", format(x$logLik, digits = digits), "\n", sep = "")
fixF <- x$call$fixed
cat("\nFixed effects:\n",
deparse(
diff --git a/R/summary.nlme.mmkin.R b/R/summary.nlme.mmkin.R
index 29f1207b..b42d5d7b 100644
--- a/R/summary.nlme.mmkin.R
+++ b/R/summary.nlme.mmkin.R
@@ -184,15 +184,15 @@ print.summary.nlme.mmkin <- function(x, digits = max(3, getOption("digits") - 3)
tc = "Two-component variance function"), "\n")
cat("\nMean of starting values for individual parameters:\n")
- print(x$mean_dp_start)
+ print(x$mean_dp_start, digits = digits)
cat("\nFixed degradation parameter values:\n")
if(length(x$fixed$value) == 0) cat("None\n")
- else print(x$fixed)
+ else print(x$fixed, digits = digits)
cat("\nResults:\n\n")
print(data.frame(AIC = x$AIC, BIC = x$BIC, logLik = x$logLik,
- row.names = " "), ...)
+ row.names = " "), digits = digits, ...)
cat("\nOptimised, transformed parameters with symmetric confidence intervals:\n")
print(x$confint_trans, digits = digits, ...)
@@ -220,7 +220,7 @@ print.summary.nlme.mmkin <- function(x, digits = max(3, getOption("digits") - 3)
printff <- !is.null(x$ff)
if(printff){
cat("\nResulting formation fractions:\n")
- print(data.frame(ff = x$ff), ...)
+ print(data.frame(ff = x$ff), digits = digits, ...)
}
printdistimes <- !is.null(x$distimes)

Contact - Imprint