From 2456ec2a62c339dde849d343792d25a235a29175 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 8 Dec 2016 09:39:33 +0100 Subject: Static documentation articles rebuilt by pkgdown::build_articles() --- docs/articles/FOCUS_D.html | 6 ++-- docs/articles/FOCUS_L.html | 40 ++++++++++----------- docs/articles/compiled_models.html | 28 +++++++-------- .../figure-html/benchmark_FOMC_SFO-1.png | Bin 10199 -> 9755 bytes .../figure-html/benchmark_SFO_SFO-1.png | Bin 12764 -> 11237 bytes 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index de1e1072..50b3d00a 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -132,8 +132,8 @@ 
summary(fit)
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:12 2016 
-## Date of summary: Thu Dec  8 09:23:13 2016 
+## Date of fit:     Thu Dec  8 09:39:23 2016 
+## Date of summary: Thu Dec  8 09:39:24 2016 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -141,7 +141,7 @@
 ## 
 ## Model predictions using solution type deSolve 
 ## 
-## Fitted with method Port using 153 model solutions performed in 0.639 s
+## Fitted with method Port using 153 model solutions performed in 0.627 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index a6ec5532..366a0e46 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -79,15 +79,15 @@ FOCUS_2006_L1_mkin <- summary(m.L1.SFO)
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:13 2016 
-## Date of summary: Thu Dec  8 09:23:13 2016 
+## Date of fit:     Thu Dec  8 09:39:24 2016 
+## Date of summary: Thu Dec  8 09:39:24 2016 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 37 model solutions performed in 0.088 s
+## Fitted with method Port using 37 model solutions performed in 0.084 s
 ## 
 ## Weighting: none
 ## 
@@ -172,8 +172,8 @@ FOCUS_2006_L1_mkin <- 
summary(m.L1.FOMC, data = FALSE)

 
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:14 2016 
-## Date of summary: Thu Dec  8 09:23:14 2016 
+## Date of fit:     Thu Dec  8 09:39:25 2016 
+## Date of summary: Thu Dec  8 09:39:25 2016 
 ## 
 ## 
 ## Warning: Optimisation by method Port did not converge.
@@ -269,15 +269,15 @@ FOCUS_2006_L2_mkin <- 
summary(m.L2.FOMC, data = FALSE)

 
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:14 2016 
-## Date of summary: Thu Dec  8 09:23:14 2016 
+## Date of fit:     Thu Dec  8 09:39:26 2016 
+## Date of summary: Thu Dec  8 09:39:26 2016 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 81 model solutions performed in 0.185 s
+## Fitted with method Port using 81 model solutions performed in 0.183 s
 ## 
 ## Weighting: none
 ## 
@@ -339,8 +339,8 @@ FOCUS_2006_L2_mkin <- 
summary(m.L2.DFOP, data = FALSE)

 
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:15 2016 
-## Date of summary: Thu Dec  8 09:23:15 2016 
+## Date of fit:     Thu Dec  8 09:39:27 2016 
+## Date of summary: Thu Dec  8 09:39:27 2016 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -349,7 +349,7 @@ FOCUS_2006_L2_mkin <-  
summary(mm.L3[["DFOP", 1]])

 
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:17 2016 
-## Date of summary: Thu Dec  8 09:23:17 2016 
+## Date of fit:     Thu Dec  8 09:39:28 2016 
+## Date of summary: Thu Dec  8 09:39:28 2016 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -438,7 +438,7 @@ mm.L3 <-  
summary(mm.L4[["SFO", 1]], data = FALSE)

 
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:17 2016 
-## Date of summary: Thu Dec  8 09:23:17 2016 
+## Date of fit:     Thu Dec  8 09:39:28 2016 
+## Date of summary: Thu Dec  8 09:39:29 2016 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 46 model solutions performed in 0.106 s
+## Fitted with method Port using 46 model solutions performed in 0.107 s
 ## 
 ## Weighting: none
 ## 
@@ -588,15 +588,15 @@ mm.L4 <- 
summary(mm.L4[["FOMC", 1]], data = FALSE)

 
## mkin version:    0.9.45 
 ## R version:       3.3.2 
-## Date of fit:     Thu Dec  8 09:23:17 2016 
-## Date of summary: Thu Dec  8 09:23:17 2016 
+## Date of fit:     Thu Dec  8 09:39:28 2016 
+## Date of summary: Thu Dec  8 09:39:29 2016 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 66 model solutions performed in 0.148 s
+## Fitted with method Port using 66 model solutions performed in 0.145 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/compiled_models.html b/docs/articles/compiled_models.html
index 660af1d1..457f5a1d 100644
--- a/docs/articles/compiled_models.html
+++ b/docs/articles/compiled_models.html
@@ -99,21 +99,21 @@ mb.1 <- micr
 print(mb.1)

 
## Unit: milliseconds
 ##                   expr       min        lq      mean    median        uq
-##  deSolve, not compiled 5006.3815 5014.4629 5112.7115 5022.5443 5165.8765
-##       Eigenvalue based  840.3027  874.3549  892.0593  908.4071  917.9376
-##      deSolve, compiled  706.9909  712.8031  723.4380  718.6154  731.6615
+##  deSolve, not compiled 5185.0893 5231.5690 5266.8769 5278.0487 5307.7706
+##       Eigenvalue based  843.3153  847.1503  876.5398  850.9853  893.1520
+##      deSolve, compiled  723.0636  740.5682  755.9995  758.0729  772.4674
 ##        max neval cld
-##  5309.2087     3   b
-##   927.4680     3  a 
-##   744.7077     3  a

+##  5337.4926     3   b
+##   935.3187     3  a 
+##   786.8620     3  a

 
autoplot(mb.1)

 

 
We see that using the compiled model is by a factor of 7 faster than using the R version with the default ode solver, and it is even faster than the Eigenvalue based solution implemented in R which does not need iterative solution of the ODEs:

 
rownames(smb.1) <- smb.1$expr
 smb.1["median"]/smb.1["deSolve, compiled", "median"]

 
##                         median
-## deSolve, not compiled 6.989197
-## Eigenvalue based      1.264108
+## deSolve, not compiled 6.962456
+## Eigenvalue based      1.122564
 ## deSolve, compiled     1.000000

 
 

@@ -134,19 +134,19 @@ smb.1["median"]/smb
smb.2 <- summary(mb.2)
 print(mb.2)

 
## Unit: seconds
-##                   expr       min       lq     mean    median        uq
-##  deSolve, not compiled 11.015990 11.17783 11.24827 11.339674 11.364403
-##      deSolve, compiled  1.285264  1.29794  1.32988  1.310616  1.352189
+##                   expr       min        lq      mean   median        uq
+##  deSolve, not compiled 10.963655 10.992677 11.033360 11.02170 11.068212
+##      deSolve, compiled  1.287898  1.309754  1.322972  1.33161  1.340509
 ##        max neval cld
-##  11.389132     3   b
-##   1.393762     3  a

+##  11.114726     3   b
+##   1.349408     3  a

 
smb.2["median"]/smb.2["deSolve, compiled", "median"]

 
##   median
 ## 1     NA
 ## 2     NA

 
autoplot(mb.2)

 

-
Here we get a performance benefit of a factor of 8.7 using the version of the differential equation model compiled from C code!

+
Here we get a performance benefit of a factor of 8.3 using the version of the differential equation model compiled from C code!

 
This vignette was built with mkin 0.9.45 on

 
## R version 3.3.2 (2016-10-31)
 ## Platform: x86_64-pc-linux-gnu (64-bit)
diff --git a/docs/articles/compiled_models_files/figure-html/benchmark_FOMC_SFO-1.png b/docs/articles/compiled_models_files/figure-html/benchmark_FOMC_SFO-1.png
index 53ff97f7..dae2c9d4 100644
Binary files a/docs/articles/compiled_models_files/figure-html/benchmark_FOMC_SFO-1.png and b/docs/articles/compiled_models_files/figure-html/benchmark_FOMC_SFO-1.png differ
diff --git a/docs/articles/compiled_models_files/figure-html/benchmark_SFO_SFO-1.png b/docs/articles/compiled_models_files/figure-html/benchmark_SFO_SFO-1.png
index d3a507bd..696236dc 100644
Binary files a/docs/articles/compiled_models_files/figure-html/benchmark_SFO_SFO-1.png and b/docs/articles/compiled_models_files/figure-html/benchmark_SFO_SFO-1.png differ
-- 
cgit v1.2.1