diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-06-04 13:27:44 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-06-04 13:27:44 +0200 |
| commit | ae64167d93bfae36158578f0a1c7771e6bab9350 (patch) | |
| tree | a29ed6dc384956d6b35587c628f8ff035e09c327 /CakeNullPlot.R | |
| parent | 1684a82b15dee35812c1340e26d721ee64a28751 (diff) | |
Version 3.4 as just publicly announcedv3.4
Peter Rainbird just announced the release on the PFMODELS email list.
Diffstat (limited to 'CakeNullPlot.R')
| -rw-r--r-- | CakeNullPlot.R | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CakeNullPlot.R b/CakeNullPlot.R index e0823f2..52245ce 100644 --- a/CakeNullPlot.R +++ b/CakeNullPlot.R @@ -2,8 +2,8 @@ # Generates model curves so the GUI can plot them. Used when all params are fixed so there was no fit # Some of the CAKE R modules are based on mkin # Based on code in IRLSkinfit -# Modifications developed by Tessella for Syngenta: Copyright (C) 2011-2016 Syngenta -# Tessella Project Reference: 6245, 7247, 8361, 7414 +# Modifications developed by Tessella for Syngenta: Copyright (C) 2011-2020 Syngenta +# Tessella Project Reference: 6245, 7247, 8361, 7414, 10091 # The CAKE R modules are free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. CakeNullPlot <- function(model, parms.ini, state.ini, observed, xlim = range(observed$time), - digits = max(3, getOption("digits") - 3), sannMaxIter = 10000, atol = 1e-6, ...) + digits = max(3, getOption("digits") - 3), dfopDtMaxIter = 10000, atol = 1e-6, ...) { # Print the fixed values fixed <- data.frame(value = c(state.ini, parms.ini)) @@ -37,7 +37,7 @@ CakeNullPlot <- function(model, parms.ini, state.ini, observed, xlim = range(obs for (obs_var in obs_vars) { type = names(model$map[[obs_var]])[1] if(exists("DT50")) distimes[obs_var, ] = c(DT50, DT90) - distimes[obs_var, ] = CakeDT(type,obs_var,parms.all,sannMaxIter) + distimes[obs_var, ] = CakeDT(type,obs_var,parms.all,dfopDtMaxIter) extraDT50[obs_var, ] = CakeExtraDT(type, obs_var, parms.all) } |