Merge branch 'master' of https://github.com/jranke/mkin

Conflicts:
	DESCRIPTION
	R/mkinfit.R

1 files changed, 6 insertions, 0 deletions

diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd
index 51e26ed..0c5d76a 100644
--- a/man/mkinfit.Rd
+++ b/man/mkinfit.Rd
@@ -20,6 +20,7 @@ mkinfit(mkinmod, observed,
   state.ini = c(100, rep(0, length(mkinmod$diffs) - 1)), 
   fixed_parms = NULL, fixed_initials = names(mkinmod$diffs)[-1], 
   solution_type = "auto",
+  method.ode = "lsoda",
   method.modFit = "Marq",
   control.modFit = list(),
   plot = FALSE, quiet = FALSE, err = NULL, weight = "none", 
@@ -85,6 +86,11 @@ mkinfit(mkinmod, observed,
     dependence of degradation rates and metabolites). This argument is passed
     on to the helper function \code{\link{mkinpredict}}.
   }
+  \item{method.ode}{
+    The solution method passed via \code{\link{mkinpredict}} to
+    \code{\link{ode}} in case the solution type is "deSolve". The default
+    "lsoda" is performant, but sometimes fails to converge.
+  }
   \item{method.modFit}{
     The optimisation method passed to \code{\link{modFit}}. The default "Marq"
     is the Levenberg Marquardt algorithm \code{\link{nls.lm}} from the package