From ec9e65053b214fa30e8b947ccbc47930eeaa01a4 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 16 Apr 2015 11:00:53 +0200 Subject: Check compiled mkinmod versions in examples and tests Tests all pass (Linux) --- R/mkinfit.R | 3 +++ 1 file changed, 3 insertions(+) (limited to 'R/mkinfit.R') diff --git a/R/mkinfit.R b/R/mkinfit.R index b0df6e8c..38f76674 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -28,6 +28,7 @@ mkinfit <- function(mkinmod, observed, fixed_initials = names(mkinmod$diffs)[-1], solution_type = "auto", method.ode = "lsoda", + use_compiled = "auto", method.modFit = c("Port", "Marq", "SANN", "Nelder-Mead", "BFGS", "CG", "L-BFGS-B"), maxit.modFit = "auto", control.modFit = list(), @@ -263,6 +264,7 @@ mkinfit <- function(mkinmod, observed, out <- mkinpredict(mkinmod, parms, odeini, outtimes, solution_type = solution_type, + use_compiled = use_compiled, method.ode = method.ode, atol = atol, rtol = rtol, ...) @@ -282,6 +284,7 @@ mkinfit <- function(mkinmod, observed, out_plot <- mkinpredict(mkinmod, parms, odeini, outtimes_plot, solution_type = solution_type, + use_compiled = use_compiled, method.ode = method.ode, atol = atol, rtol = rtol, ...) -- cgit v1.2.1