aboutsummaryrefslogtreecommitdiff
path: root/R/mkinpredict.R
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2014-01-22 10:46:44 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2014-01-22 10:46:44 +0100
commit9ef8537149a37ebef8a2a18232644202872bbe55 (patch)
tree066de4b62d6fa8078637fe23ae466fe0f525629e /R/mkinpredict.R
parentaf4a101d2cca91598ec5d1dc297c31a75517b139 (diff)
parent8b94131388071980e62c17190eb4229e89975a0c (diff)
Merge branch 'master' of https://github.com/jranke/mkin
Conflicts: DESCRIPTION R/mkinfit.R
Diffstat (limited to 'R/mkinpredict.R')
-rw-r--r--R/mkinpredict.R10
1 files changed, 6 insertions, 4 deletions
diff --git a/R/mkinpredict.R b/R/mkinpredict.R
index 7ce26caf..07c1a819 100644
--- a/R/mkinpredict.R
+++ b/R/mkinpredict.R
@@ -1,6 +1,4 @@
-# $Id$
-
-# Copyright (C) 2010-2012 Johannes Ranke
+# Copyright (C) 2010-2013 Johannes Ranke
# Contact: jranke@uni-bremen.de
# This file is part of the R package mkin
@@ -18,7 +16,10 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <http://www.gnu.org/licenses/>
-mkinpredict <- function(mkinmod, odeparms, odeini, outtimes, solution_type = "deSolve", map_output = TRUE, atol = 1e-8, rtol = 1e-10, ...) {
+mkinpredict <- function(mkinmod, odeparms, odeini,
+ outtimes, solution_type = "deSolve",
+ method.ode = "lsoda", atol = 1e-8, rtol = 1e-10,
+ map_output = TRUE, ...) {
# Get the names of the state variables in the model
mod_vars <- names(mkinmod$diffs)
@@ -96,6 +97,7 @@ mkinpredict <- function(mkinmod, odeparms, odeini, outtimes, solution_type = "de
times = outtimes,
func = mkindiff,
parms = odeparms,
+ method = method.ode,
atol = atol,
rtol = rtol,
...

Contact - Imprint