From 54eb679cb599042b33d67e101687dd451c4b53fe Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 31 Jan 2019 15:46:04 +0100 Subject: Correct title for CAKE_export Add NEWS entry. Static documentation rebuilt by pkgdown --- docs/articles/FOCUS_L.html | 38 ++++++++++++++--------------- docs/articles/web_only/compiled_models.html | 12 ++++----- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index daf887e6..b53ab0d0 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -111,15 +111,15 @@ summary(m.L1.SFO) 
## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 15:37:32 2019 
-## Date of summary: Thu Jan 31 15:37:32 2019 
+## Date of fit:     Thu Jan 31 15:43:40 2019 
+## Date of summary: Thu Jan 31 15:43:40 2019 
 ## 
 ## 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.095 s
+## Fitted with method Port using 37 model solutions performed in 0.094 s
 ## 
 ## Weighting: none
 ## 
@@ -202,15 +202,15 @@
 
summary(m.L1.FOMC, data = FALSE)

 
## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 15:37:34 2019 
-## Date of summary: Thu Jan 31 15:37:34 2019 
+## Date of fit:     Thu Jan 31 15:43:42 2019 
+## Date of summary: Thu Jan 31 15:43:42 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 611 model solutions performed in 1.492 s
+## Fitted with method Port using 611 model solutions performed in 1.502 s
 ## 
 ## Weighting: none
 ## 
@@ -297,15 +297,15 @@
 
summary(m.L2.FOMC, data = FALSE)

 
## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 15:37:35 2019 
-## Date of summary: Thu Jan 31 15:37:35 2019 
+## Date of fit:     Thu Jan 31 15:43:42 2019 
+## Date of summary: Thu Jan 31 15:43:42 2019 
 ## 
 ## 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.196 s
+## Fitted with method Port using 81 model solutions performed in 0.195 s
 ## 
 ## Weighting: none
 ## 
@@ -368,8 +368,8 @@
 
summary(m.L2.DFOP, data = FALSE)

 
## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 15:37:36 2019 
-## Date of summary: Thu Jan 31 15:37:36 2019 
+## Date of fit:     Thu Jan 31 15:43:43 2019 
+## Date of summary: Thu Jan 31 15:43:43 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -378,7 +378,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 336 model solutions performed in 0.837 s
+## Fitted with method Port using 336 model solutions performed in 0.836 s
 ## 
 ## Weighting: none
 ## 
@@ -460,8 +460,8 @@
 
summary(mm.L3[["DFOP", 1]])

 
## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 15:37:37 2019 
-## Date of summary: Thu Jan 31 15:37:37 2019 
+## Date of fit:     Thu Jan 31 15:43:44 2019 
+## Date of summary: Thu Jan 31 15:43:45 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -470,7 +470,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 137 model solutions performed in 0.344 s
+## Fitted with method Port using 137 model solutions performed in 0.34 s
 ## 
 ## Weighting: none
 ## 
@@ -561,8 +561,8 @@
 
summary(mm.L4[["SFO", 1]], data = FALSE)

 
## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 15:37:37 2019 
-## Date of summary: Thu Jan 31 15:37:38 2019 
+## Date of fit:     Thu Jan 31 15:43:45 2019 
+## Date of summary: Thu Jan 31 15:43:45 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
@@ -621,8 +621,8 @@
 
summary(mm.L4[["FOMC", 1]], data = FALSE)

 
## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Jan 31 15:37:37 2019 
-## Date of summary: Thu Jan 31 15:37:38 2019 
+## Date of fit:     Thu Jan 31 15:43:45 2019 
+## Date of summary: Thu Jan 31 15:43:45 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index a1fa69f5..d7d76b49 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -126,14 +126,14 @@
 }

 
## Lade nötiges Paket: rbenchmark

 
##                    test replications elapsed relative user.self sys.self
-## 3     deSolve, compiled            3   2.319    1.000     2.317    0.000
-## 1 deSolve, not compiled            3  17.483    7.539    17.473    0.000
-## 2      Eigenvalue based            3   2.857    1.232     2.852    0.003
+## 3     deSolve, compiled            3   2.331    1.000     2.330        0
+## 1 deSolve, not compiled            3  17.369    7.451    17.360        0
+## 2      Eigenvalue based            3   2.878    1.235     2.876        0
 ##   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 8 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 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.

 
 

 

@@ -157,8 +157,8 @@
 }

 
## Successfully compiled differential equation model from auto-generated C code.

 
##                    test replications elapsed relative user.self sys.self
-## 2     deSolve, compiled            3   4.102    1.000     4.100        0
-## 1 deSolve, not compiled            3  37.059    9.034    37.041        0
+## 2     deSolve, compiled            3   4.120    1.000     4.116        0
+## 1 deSolve, not compiled            3  37.011    8.983    36.993        0
 ##   user.child sys.child
 ## 2          0         0
 ## 1          0         0

-- 
cgit v1.2.1