aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--R/summary.mkinfit.R7
-rw-r--r--tests/testthat/summary_DFOP_FOCUS_C.txt5
-rw-r--r--tests/testthat/summary_DFOP_FOCUS_D_deSolve.txt5
-rw-r--r--tests/testthat/summary_DFOP_FOCUS_D_eigen.txt5
4 files changed, 22 insertions, 0 deletions
diff --git a/R/summary.mkinfit.R b/R/summary.mkinfit.R
index 90f32da9..246bc41d 100644
--- a/R/summary.mkinfit.R
+++ b/R/summary.mkinfit.R
@@ -125,6 +125,9 @@ summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, alpha = 0.05,
warning = object$warning,
use_of_ff = object$mkinmod$use_of_ff,
error_model_algorithm = object$error_model_algorithm,
+ AIC = AIC(object),
+ BIC = BIC(object),
+ logLik = logLik(object),
df = c(p, rdf),
covar = covar,
covar_notrans = covar_notrans,
@@ -217,6 +220,10 @@ print.summary.mkinfit <- function(x, digits = max(3, getOption("digits") - 3), .
if(length(x$fixed$value) == 0) cat("None\n")
else print(x$fixed)
+ cat("\nResults:\n\n")
+ print(data.frame(AIC = x$AIC, BIC = x$BIC, logLik = x$logLik,
+ row.names = " "))
+
cat("\nOptimised, transformed parameters with symmetric confidence intervals:\n")
print(signif(x$par, digits = digits))
diff --git a/tests/testthat/summary_DFOP_FOCUS_C.txt b/tests/testthat/summary_DFOP_FOCUS_C.txt
index 14e00f62..4f96c8d3 100644
--- a/tests/testthat/summary_DFOP_FOCUS_C.txt
+++ b/tests/testthat/summary_DFOP_FOCUS_C.txt
@@ -33,6 +33,11 @@ g_ilr 0.000000 -Inf Inf
Fixed parameter values:
None
+Results:
+
+ AIC BIC logLik
+ 29.02372 30.00984 -9.511861
+
Optimised, transformed parameters with symmetric confidence intervals:
Estimate Std. Error Lower Upper
parent_0 85.0000 0.66620 83.1500 86.8500
diff --git a/tests/testthat/summary_DFOP_FOCUS_D_deSolve.txt b/tests/testthat/summary_DFOP_FOCUS_D_deSolve.txt
index 66ab9348..5a9093c3 100644
--- a/tests/testthat/summary_DFOP_FOCUS_D_deSolve.txt
+++ b/tests/testthat/summary_DFOP_FOCUS_D_deSolve.txt
@@ -33,6 +33,11 @@ Fixed parameter values:
value type
m1_0 0 state
+Results:
+
+ AIC BIC logLik
+ 204.4486 212.6365 -97.22429
+
Optimised, transformed parameters with symmetric confidence intervals:
Estimate Std. Error Lower Upper
parent_0 99.600 1.57000 96.400 102.800
diff --git a/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt b/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt
index 1626c5da..f597cad5 100644
--- a/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt
+++ b/tests/testthat/summary_DFOP_FOCUS_D_eigen.txt
@@ -33,6 +33,11 @@ Fixed parameter values:
value type
m1_0 0 state
+Results:
+
+ AIC BIC logLik
+ 204.4486 212.6365 -97.22429
+
Optimised, transformed parameters with symmetric confidence intervals:
Estimate Std. Error Lower Upper
parent_0 99.600 1.57000 96.400 102.800

Contact - Imprint