From af84d618508d5882072ab7b8de481cb5efc60852 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 21 Feb 2019 15:01:03 +0100 Subject: Make example logistic fit quiet --- docs/articles/FOCUS_D.html | 6 ++--- docs/articles/FOCUS_L.html | 42 ++++++++++++++--------------- docs/articles/web_only/compiled_models.html | 12 ++++----- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 6a8500a0..4a080ac1 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -163,8 +163,8 @@ 
summary(fit)
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:03 2019 
-## Date of summary: Thu Feb 21 14:32:04 2019 
+## Date of fit:     Thu Feb 21 14:58:25 2019 
+## Date of summary: Thu Feb 21 14:58:26 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -172,7 +172,7 @@
 ## 
 ## Model predictions using solution type deSolve 
 ## 
-## Fitted with method Port using 153 model solutions performed in 0.735 s
+## Fitted with method Port using 153 model solutions performed in 0.705 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index 265dd96c..b9f72dbe 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.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:06 2019 
-## Date of summary: Thu Feb 21 14:32:06 2019 
+## Date of fit:     Thu Feb 21 14:58:27 2019 
+## Date of summary: Thu Feb 21 14:58:27 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.097 s
+## Fitted with method Port using 37 model solutions performed in 0.096 s
 ## 
 ## Weighting: none
 ## 
@@ -202,15 +202,15 @@
 
summary(m.L1.FOMC, data = FALSE)

 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:08 2019 
-## Date of summary: Thu Feb 21 14:32:08 2019 
+## Date of fit:     Thu Feb 21 14:58:29 2019 
+## Date of summary: Thu Feb 21 14:58:29 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.547 s
+## Fitted with method Port using 611 model solutions performed in 1.507 s
 ## 
 ## Weighting: none
 ## 
@@ -297,15 +297,15 @@
 
summary(m.L2.FOMC, data = FALSE)

 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:08 2019 
-## Date of summary: Thu Feb 21 14:32:08 2019 
+## Date of fit:     Thu Feb 21 14:58:30 2019 
+## Date of summary: Thu Feb 21 14:58:30 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.201 s
+## Fitted with method Port using 81 model solutions performed in 0.197 s
 ## 
 ## Weighting: none
 ## 
@@ -368,8 +368,8 @@
 
summary(m.L2.DFOP, data = FALSE)

 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:09 2019 
-## Date of summary: Thu Feb 21 14:32:09 2019 
+## Date of fit:     Thu Feb 21 14:58:31 2019 
+## Date of summary: Thu Feb 21 14:58:31 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.86 s
+## Fitted with method Port using 336 model solutions performed in 0.842 s
 ## 
 ## Weighting: none
 ## 
@@ -460,8 +460,8 @@
 
summary(mm.L3[["DFOP", 1]])

 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:10 2019 
-## Date of summary: Thu Feb 21 14:32:11 2019 
+## Date of fit:     Thu Feb 21 14:58:32 2019 
+## Date of summary: Thu Feb 21 14:58:32 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.351 s
+## Fitted with method Port using 137 model solutions performed in 0.346 s
 ## 
 ## Weighting: none
 ## 
@@ -561,15 +561,15 @@
 
summary(mm.L4[["SFO", 1]], data = FALSE)

 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:11 2019 
-## Date of summary: Thu Feb 21 14:32:11 2019 
+## Date of fit:     Thu Feb 21 14:58:32 2019 
+## Date of summary: Thu Feb 21 14:58:33 2019 
 ## 
 ## 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.113 s
+## Fitted with method Port using 46 model solutions performed in 0.111 s
 ## 
 ## Weighting: none
 ## 
@@ -621,15 +621,15 @@
 
summary(mm.L4[["FOMC", 1]], data = FALSE)

 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:32:11 2019 
-## Date of summary: Thu Feb 21 14:32:11 2019 
+## Date of fit:     Thu Feb 21 14:58:33 2019 
+## Date of summary: Thu Feb 21 14:58:33 2019 
 ## 
 ## 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.168 s
+## Fitted with method Port using 66 model solutions performed in 0.165 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index 3a37d114..e1149c67 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.429    1.000     2.427        0
-## 1 deSolve, not compiled            3  17.826    7.339    17.815        0
-## 2      Eigenvalue based            3   2.968    1.222     2.967        0
+## 3     deSolve, compiled            3   2.329    1.000     2.327        0
+## 1 deSolve, not compiled            3  17.556    7.538    17.549        0
+## 2      Eigenvalue based            3   2.863    1.229     2.860        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 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 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.

 
 

 

@@ -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.234    1.000     4.232        0
-## 1 deSolve, not compiled            3  37.807    8.929    37.785        0
+## 2     deSolve, compiled            3   4.105    1.000     4.101        0
+## 1 deSolve, not compiled            3  37.400    9.111    37.381        0
 ##   user.child sys.child
 ## 2          0         0
 ## 1          0         0

-- 
cgit v1.2.1