From f84e46db5bd41772fb2616e476ff7263a63a6e68 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 8 Jul 2019 18:12:21 +0200 Subject: Adaptations for gmkin --- R/mkinfit.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/R/mkinfit.R b/R/mkinfit.R index c14c1cea..b5e69e67 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -34,7 +34,7 @@ mkinfit <- function(mkinmod, observed, quiet = FALSE, atol = 1e-8, rtol = 1e-10, n.outtimes = 100, error_model = c("const", "obs", "tc"), - error_model_algorithm = c("d_3", "direct", "twostep", "threestep", "fourstep", "IRLS"), + error_model_algorithm = c("d_3", "direct", "twostep", "threestep", "fourstep", "IRLS", "OLS"), reweight.tol = 1e-8, reweight.max.iter = 10, trace_parms = FALSE, ...) @@ -590,6 +590,8 @@ mkinfit <- function(mkinmod, observed, fit$solution_type <- solution_type fit$transform_rates <- transform_rates fit$transform_fractions <- transform_fractions + fit$reweight.tol <- reweight.tol + fit$reweight.max.iter <- reweight.max.iter fit$control <- control fit$calls <- calls fit$time <- fit_time -- cgit v1.2.1