From b21c601052f85e392e48d903b8903a1a392fe786 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Tue, 14 Apr 2015 19:50:57 +0200
Subject: Compile differential equation models with ccSolve package

If the ccSolve package is available, and time is not in the right hand
side of the equations (i.e. if only SFO and SFORB models are used),
the differential equation model is compiled from auto-generated C code.

Currently, one test (FOCUS 2006 D SFO_SFO) fails
---
 man/mkinfit.Rd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'man/mkinfit.Rd')

diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd
index 9c82f5ff..466f587c 100644
--- a/man/mkinfit.Rd
+++ b/man/mkinfit.Rd
@@ -235,7 +235,8 @@ SFO_SFO <- mkinmod(
   parent = list(type = "SFO", to = "m1", sink = TRUE),
   m1 = list(type = "SFO"))
 # Fit the model to the FOCUS example dataset D using defaults
-fit <- mkinfit(SFO_SFO, FOCUS_2006_D)
+fit <- mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "eigen")
+fit.deSolve <- mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "deSolve")
 summary(fit)
 
 # Use stepwise fitting, using optimised parameters from parent only fit, FOMC
@@ -258,10 +259,10 @@ SFORB_SFO <- mkinmod(
   m1 = list(type = "SFO"))
 # Fit the model to the FOCUS example dataset D using defaults
 fit.SFORB_SFO <- mkinfit(SFORB_SFO, FOCUS_2006_D)
+fit.SFORB_SFO.deSolve <- mkinfit(SFORB_SFO, FOCUS_2006_D, solution_type = "deSolve")
 # 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)
-}
 
 # Weighted fits, including IRLS
 SFO_SFO.ff <- mkinmod(parent = list(type = "SFO", to = "m1"),
-- 
cgit v1.2.1


From 7f5455e1a49f44a0fa341ee7cca86dfb03e273a2 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Thu, 16 Apr 2015 10:01:15 +0200
Subject: Correctly close braces of examples section

---
 man/mkinfit.Rd | 1 +
 1 file changed, 1 insertion(+)

(limited to 'man/mkinfit.Rd')

diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd
index 466f587c..4b0ad1a7 100644
--- a/man/mkinfit.Rd
+++ b/man/mkinfit.Rd
@@ -276,6 +276,7 @@ summary(f.w.mean)
 f.w.mean.irls <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, weight = "mean",
                          reweight.method = "obs")
 summary(f.w.mean.irls)
+}
 
 \dontrun{
 # Manual weighting
-- 
cgit v1.2.1