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/endpoints.R | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'R/endpoints.R') diff --git a/R/endpoints.R b/R/endpoints.R index 80450185..f8a44c4d 100644 --- a/R/endpoints.R +++ b/R/endpoints.R @@ -166,6 +166,11 @@ endpoints <- function(fit) { r = parms.all["r"] DT50 = (1/r) * log(1 - ((kmax/k0) * (1 - 2^(r/kmax)))) DT90 = (1/r) * log(1 - ((kmax/k0) * (1 - 10^(r/kmax)))) + + DT50_k0 = log(2)/k0 + DT50_kmax = log(2)/kmax + ep$distimes[obs_var, c("DT50_k0")] = DT50_k0 + ep$distimes[obs_var, c("DT50_kmax")] = DT50_kmax } ep$distimes[obs_var, c("DT50", "DT90")] = c(DT50, DT90) } -- cgit v1.2.1