From 39d5dc6988389f026d5165cac208ec63d0645a77 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 22 Feb 2019 09:46:39 +0100 Subject: Further adaptations for the logistic model - Make mmkin compatible - Return DT50 values corresponding to k0 and kmax - Turn incompatible parameter names in parms.ini from an error to a warning, in order to make it possible to use this argument in calls to mmkin --- R/mkinfit.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'R/mkinfit.R') diff --git a/R/mkinfit.R b/R/mkinfit.R index 40413125..2dec3a72 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -99,10 +99,10 @@ mkinfit <- function(mkinmod, observed, # Define starting values for parameters where not specified by the user if (parms.ini[[1]] == "auto") parms.ini = vector() - # Prevent inital parameter specifications that are not in the model + # Warn for inital parameter specifications that are not in the model wrongpar.names <- setdiff(names(parms.ini), mkinmod$parms) if (length(wrongpar.names) > 0) { - stop("Initial parameter(s) ", paste(wrongpar.names, collapse = ", "), + warning("Initial parameter(s) ", paste(wrongpar.names, collapse = ", "), " not used in the model") } -- cgit v1.2.1