From d337a9665d9261d18734d81edc8fe4b569635e71 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 18 May 2015 16:58:44 +0200 Subject: Make checking faster, testing is done by tests --- man/mkinfit.Rd | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'man/mkinfit.Rd') diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd index 34e5bbae..2d8d3726 100644 --- a/man/mkinfit.Rd +++ b/man/mkinfit.Rd @@ -243,20 +243,14 @@ SFO_SFO <- mkinmod( # Fit the model to the FOCUS example dataset D using defaults system.time(fit <- mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "eigen")) -system.time(fit.deSolve <- mkinfit(SFO_SFO, FOCUS_2006_D, - solution_type = "deSolve", use_compiled = FALSE)) -system.time(fit.deSolve.compiled <- mkinfit(SFO_SFO, FOCUS_2006_D, - solution_type = "deSolve", use_compiled = TRUE)) -# The performance benefit of using the compiled version is immense compared -# with deSolve without compilation, and about a factor of two compared with the -# eigenvalue based solution coef(fit) -coef(fit.deSolve) -coef(fit.deSolve.compiled) endpoints(fit) +\dontrun{ +system.time(fit.deSolve <- mkinfit(SFO_SFO, FOCUS_2006_D, + solution_type = "deSolve")) +coef(fit.deSolve) endpoints(fit.deSolve) -# Check compiled model versions against other solutions - +} # Use stepwise fitting, using optimised parameters from parent only fit, FOMC \dontrun{ @@ -282,6 +276,7 @@ fit.SFORB_SFO.deSolve <- mkinfit(SFORB_SFO, FOCUS_2006_D, solution_type = "deSol # Use starting parameters from parent only SFORB fit (not really needed in this case) fit.SFORB = mkinfit(SFORB, FOCUS_2006_D) fit.SFORB_SFO <- mkinfit(SFORB_SFO, FOCUS_2006_D, parms.ini = fit.SFORB$bparms.ode) +} \dontrun{ # Weighted fits, including IRLS @@ -309,7 +304,5 @@ f.w.man.irls <- mkinfit(SFO_SFO.ff, dw, err = "err.man", reweight.method = "obs") summary(f.w.man.irls) } - } -\keyword{ models } \keyword{ optimize } -- cgit v1.2.1