aboutsummaryrefslogtreecommitdiff
path: root/R
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2019-07-08 18:12:21 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2019-07-08 18:12:21 +0200
commitf84e46db5bd41772fb2616e476ff7263a63a6e68 (patch)
treedca5a5fe96eef1f96de7f9ef8ff69fad8142968f /R
parent67d032fb345f8e0afc7628d7525da5b7f0a98f79 (diff)
Adaptations for gmkin
Diffstat (limited to 'R')
-rw-r--r--R/mkinfit.R4
1 files changed, 3 insertions, 1 deletions
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

Contact - Imprint