From e1a040d29d013d971c77481d5cb5aa6856b1cbeb Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 21 Jul 2017 16:47:08 +0200 Subject: Reduce vignette sizes --- vignettes/compiled_models.Rmd | 10 +- vignettes/compiled_models.html | 342 +++++++++++------------------------------ vignettes/twa.Rmd | 2 +- vignettes/twa.html | 110 +------------ 4 files changed, 98 insertions(+), 366 deletions(-) diff --git a/vignettes/compiled_models.Rmd b/vignettes/compiled_models.Rmd index 864cac87..956f428a 100644 --- a/vignettes/compiled_models.Rmd +++ b/vignettes/compiled_models.Rmd @@ -1,16 +1,10 @@ --- title: "Performance benefit by using compiled model definitions in mkin" author: "Johannes Ranke" +output: rmarkdown::html_vignette date: "`r Sys.Date()`" -output: - html_document: - theme: united - toc: true - toc_float: true - mathjax: null vignette: > %\VignetteIndexEntry{Performance benefit by using compiled model definitions in mkin} - %\VignetteEngine{knitr::rmarkdown} %\VignetteEncoding{UTF-8} --- @@ -63,7 +57,7 @@ if (require(rbenchmark)) { } ``` -We see that using the compiled model is by a factor of around +We see that using the compiled model is by a factor of around `r factor_SFO_SFO` 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 diff --git a/vignettes/compiled_models.html b/vignettes/compiled_models.html index 67d0f658..ee3347ca 100644 --- a/vignettes/compiled_models.html +++ b/vignettes/compiled_models.html @@ -8,319 +8,161 @@ + - + Performance benefit by using compiled model definitions in mkin - - - - - - - - - - - - + - - - + - - - - -
- - - - - - - - - - - - - - -
-
-
-
-
- -
- - - - -

Model that can also be solved with Eigenvalues

This evaluation is taken from the example section of mkinfit. When using an mkin version equal to or greater than 0.9-36 and a C compiler (gcc) is available, you will see a message that the model is being compiled from autogenerated C code when defining a model using mkinmod. The mkinmod() function checks for presence of the gcc compiler using

-
Sys.which("gcc")
+
Sys.which("gcc")
##            gcc 
 ## "/usr/bin/gcc"

First, we build a simple degradation model for a parent compound with one metabolite.

-
library("mkin")
+
library("mkin")
## Loading required package: minpack.lm
## Loading required package: rootSolve
## Loading required package: inline
-
## Loading required package: methods
## Loading required package: parallel
-
SFO_SFO <- mkinmod(
-  parent = mkinsub("SFO", "m1"),
-  m1 = mkinsub("SFO"))
+
SFO_SFO <- mkinmod(
+  parent = mkinsub("SFO", "m1"),
+  m1 = mkinsub("SFO"))
## Successfully compiled differential equation model from auto-generated C code.

We can compare the performance of the Eigenvalue based solution against the compiled version and the R implementation of the differential equations using the benchmark package.

-
if (require(rbenchmark)) {
-  b.1 <- benchmark(
-    "deSolve, not compiled" = mkinfit(SFO_SFO, FOCUS_2006_D,
-                                      solution_type = "deSolve",
-                                      use_compiled = FALSE, quiet = TRUE),
-    "Eigenvalue based" = mkinfit(SFO_SFO, FOCUS_2006_D,
-                                 solution_type = "eigen", quiet = TRUE),
-    "deSolve, compiled" = mkinfit(SFO_SFO, FOCUS_2006_D,
-                                  solution_type = "deSolve", quiet = TRUE),
-    replications = 3)
-  print(b.1)
-  factor_SFO_SFO <- round(b.1["1", "relative"])
+
if (require(rbenchmark)) {
+  b.1 <- benchmark(
+    "deSolve, not compiled" = mkinfit(SFO_SFO, FOCUS_2006_D,
+                                      solution_type = "deSolve",
+                                      use_compiled = FALSE, quiet = TRUE),
+    "Eigenvalue based" = mkinfit(SFO_SFO, FOCUS_2006_D,
+                                 solution_type = "eigen", quiet = TRUE),
+    "deSolve, compiled" = mkinfit(SFO_SFO, FOCUS_2006_D,
+                                  solution_type = "deSolve", quiet = TRUE),
+    replications = 3)
+  print(b.1)
+  factor_SFO_SFO <- round(b.1["1", "relative"])
 } else {
-  factor_SFO_SFO <- NA
-  print("R package benchmark is not available")
-}
+ factor_SFO_SFO <- NA + print("R package benchmark is not available") +}
## Loading required package: rbenchmark
##                    test replications elapsed relative user.self sys.self
-## 3     deSolve, compiled            3   2.040    1.000     2.040        0
-## 1 deSolve, not compiled            3  14.622    7.168    14.624        0
-## 2      Eigenvalue based            3   2.478    1.215     2.480        0
+## 3     deSolve, compiled            3   2.101    1.000     2.100    0.000
+## 1 deSolve, not compiled            3  25.685   12.225    25.600    0.088
+## 2      Eigenvalue based            3   2.729    1.299     2.728    0.000
 ##   user.child sys.child
 ## 3          0         0
 ## 1          0         0
 ## 2          0         0
-

We see that using the compiled model is by a factor of around 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.

+

We see that using the compiled model is by a factor of around 12 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.

Model that can not be solved with Eigenvalues

This evaluation is also taken from the example section of mkinfit.

-
if (require(rbenchmark)) {
-  FOMC_SFO <- mkinmod(
-    parent = mkinsub("FOMC", "m1"),
-    m1 = mkinsub( "SFO"))
-
-  b.2 <- benchmark(
-    "deSolve, not compiled" = mkinfit(FOMC_SFO, FOCUS_2006_D,
-                                      use_compiled = FALSE, quiet = TRUE),
-    "deSolve, compiled" = mkinfit(FOMC_SFO, FOCUS_2006_D, quiet = TRUE),
-    replications = 3)
-  print(b.2)
-  factor_FOMC_SFO <- round(b.2["1", "relative"])
+
if (require(rbenchmark)) {
+  FOMC_SFO <- mkinmod(
+    parent = mkinsub("FOMC", "m1"),
+    m1 = mkinsub( "SFO"))
+
+  b.2 <- benchmark(
+    "deSolve, not compiled" = mkinfit(FOMC_SFO, FOCUS_2006_D,
+                                      use_compiled = FALSE, quiet = TRUE),
+    "deSolve, compiled" = mkinfit(FOMC_SFO, FOCUS_2006_D, quiet = TRUE),
+    replications = 3)
+  print(b.2)
+  factor_FOMC_SFO <- round(b.2["1", "relative"])
 } else {
-  factor_FOMC_SFO <- NA
-  print("R package benchmark is not available")
-}
+ factor_FOMC_SFO <- NA + print("R package benchmark is not available") +}
## Successfully compiled differential equation model from auto-generated C code.
##                    test replications elapsed relative user.self sys.self
-## 2     deSolve, compiled            3   3.500    1.000     3.500        0
-## 1 deSolve, not compiled            3  29.932    8.552    29.932        0
+## 2     deSolve, compiled            3   3.590    1.000     3.592    0.000
+## 1 deSolve, not compiled            3  51.219   14.267    51.028    0.192
 ##   user.child sys.child
 ## 2          0         0
 ## 1          0         0
-

Here we get a performance benefit of a factor of 9 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.4.0 (2017-04-21)
+

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

+

This vignette was built with mkin 0.9.45.2 on

+
## R version 3.4.1 (2017-06-30)
 ## Platform: x86_64-pc-linux-gnu (64-bit)
-## Running under: Debian GNU/Linux 8 (jessie)
+## Running under: Debian GNU/Linux 9 (stretch)
## CPU model: Intel(R) Core(TM) i7-4710MQ CPU @ 2.50GHz
-
- - - - + - diff --git a/vignettes/twa.Rmd b/vignettes/twa.Rmd index c4fe861f..a37a1c00 100644 --- a/vignettes/twa.Rmd +++ b/vignettes/twa.Rmd @@ -3,8 +3,8 @@ title: Calculation of time weighted average concentrations with mkin author: Johannes Ranke date: "`r Sys.Date()`" bibliography: references.bib +output: rmarkdown::html_vignette vignette: > - %\VignetteEngine{knitr::rmarkdown} %\VignetteIndexEntry{Calculation of time weighted average concentrations with mkin} %\VignetteEncoding{UTF-8} --- diff --git a/vignettes/twa.html b/vignettes/twa.html index 9154d763..b5910932 100644 --- a/vignettes/twa.html +++ b/vignettes/twa.html @@ -8,6 +8,7 @@ + @@ -15,105 +16,17 @@ Calculation of time weighted average concentrations with mkin - - - - - - - - - - - - - - + + - - - - -
- - - - - - - - - - - -

Since version 0.9.45.1 of the ‘mkin’ package, a function for calculating time weighted average concentrations for decline kinetics (i.e. only for the compound applied in the experiment) is included. Strictly speaking, they are maximum moving window time weighted average concentrations, i.e. the maximum time weighted average concentration that can be found when moving a time window of a specified width over the decline curve.

@@ -156,22 +68,6 @@ $(document).ready(function () { - -
- - -