From 1f100167f4f399062fb077ceb983f50384eccaec Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 18 Sep 2018 15:20:30 +0200 Subject: Static documentation rebuilt by pkgdown --- docs/articles/FOCUS_L.html | 56 ++++++++++++++--------------- docs/articles/web_only/compiled_models.html | 12 +++---- 2 files changed, 34 insertions(+), 34 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index 8ef55b81..ea49ae10 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -108,17 +108,17 @@

Since mkin version 0.9-32 (July 2014), we can use shorthand notation like "SFO" for parent only degradation models. The following two lines fit the model and produce the summary report of the model fit. This covers the numerical analysis given in the FOCUS report.

m.L1.SFO <- mkinfit("SFO", FOCUS_2006_L1_mkin, quiet = TRUE)
 summary(m.L1.SFO)
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 09:50:45 2018 
-## Date of summary: Tue Sep 18 09:50:45 2018 
+## Date of fit:     Tue Sep 18 15:18:12 2018 
+## Date of summary: Tue Sep 18 15:18:12 2018 
 ## 
 ## 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.081 s
+## Fitted with method Port using 37 model solutions performed in 0.084 s
 ## 
 ## Weighting: none
 ## 
@@ -199,17 +199,17 @@
 plot(m.L1.FOMC, show_errmin = TRUE, main = "FOCUS L1 - FOMC")

 

 
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 09:50:47 2018 
-## Date of summary: Tue Sep 18 09:50:47 2018 
+## Date of fit:     Tue Sep 18 15:18:14 2018 
+## Date of summary: Tue Sep 18 15:18:14 2018 
 ## 
 ## 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.294 s
+## Fitted with method Port using 611 model solutions performed in 1.321 s
 ## 
 ## Weighting: none
 ## 
@@ -294,17 +294,17 @@
      main = "FOCUS L2 - FOMC")

 

 
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 09:50:47 2018 
-## Date of summary: Tue Sep 18 09:50:47 2018 
+## Date of fit:     Tue Sep 18 15:18:14 2018 
+## Date of summary: Tue Sep 18 15:18:14 2018 
 ## 
 ## 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.166 s
+## Fitted with method Port using 81 model solutions performed in 0.169 s
 ## 
 ## Weighting: none
 ## 
@@ -365,10 +365,10 @@
      main = "FOCUS L2 - DFOP")

 

 
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 09:50:48 2018 
-## Date of summary: Tue Sep 18 09:50:48 2018 
+## Date of fit:     Tue Sep 18 15:18:15 2018 
+## Date of summary: Tue Sep 18 15:18:15 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -377,7 +377,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 336 model solutions performed in 0.714 s
+## Fitted with method Port using 336 model solutions performed in 0.739 s
 ## 
 ## Weighting: none
 ## 
@@ -457,10 +457,10 @@
 
The objects returned by mmkin are arranged like a matrix, with models as a row index and datasets as a column index.

 
We can extract the summary and plot for e.g. the DFOP fit, using square brackets for indexing which will result in the use of the summary and plot functions working on mkinfit objects.

 
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 09:50:49 2018 
-## Date of summary: Tue Sep 18 09:50:49 2018 
+## Date of fit:     Tue Sep 18 15:18:16 2018 
+## Date of summary: Tue Sep 18 15:18:16 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -469,7 +469,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 137 model solutions performed in 0.299 s
+## Fitted with method Port using 137 model solutions performed in 0.301 s
 ## 
 ## Weighting: none
 ## 
@@ -558,17 +558,17 @@
 

 
The \(\chi^2\) error level of 3.3% as well as the plot suggest that the SFO model fits very well. The error level at which the \(\chi^2\) test passes is slightly lower for the FOMC model. However, the difference appears negligible.

 
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 09:50:50 2018 
-## Date of summary: Tue Sep 18 09:50:50 2018 
+## Date of fit:     Tue Sep 18 15:18:17 2018 
+## Date of summary: Tue Sep 18 15:18:17 2018 
 ## 
 ## 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.093 s
+## Fitted with method Port using 46 model solutions performed in 0.107 s
 ## 
 ## Weighting: none
 ## 
@@ -618,17 +618,17 @@
 ##        DT50 DT90
 ## parent  106  352

 
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 09:50:50 2018 
-## Date of summary: Tue Sep 18 09:50:50 2018 
+## Date of fit:     Tue Sep 18 15:18:17 2018 
+## Date of summary: Tue Sep 18 15:18:17 2018 
 ## 
 ## 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.138 s
+## Fitted with method Port using 66 model solutions performed in 0.139 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index 3b3e9150..684f28cb 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -125,9 +125,9 @@
 }

 
## Lade nötiges Paket: rbenchmark

 
##                    test replications elapsed relative user.self sys.self
-## 3     deSolve, compiled            3   2.001    1.000     1.999        0
-## 1 deSolve, not compiled            3  15.374    7.683    15.368        0
-## 2      Eigenvalue based            3   2.439    1.219     2.438        0
+## 3     deSolve, compiled            3   2.005    1.000     2.003        0
+## 1 deSolve, not compiled            3  15.480    7.721    15.474        0
+## 2      Eigenvalue based            3   2.460    1.227     2.459        0
 ##   user.child sys.child
 ## 3          0         0
 ## 1          0         0
@@ -156,13 +156,13 @@
 }

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

 
##                    test replications elapsed relative user.self sys.self
-## 2     deSolve, compiled            3   3.608    1.000     3.607        0
-## 1 deSolve, not compiled            3  33.150    9.188    33.135        0
+## 2     deSolve, compiled            3   3.524     1.00     3.523    0.000
+## 1 deSolve, not compiled            3  33.021     9.37    33.001    0.004
 ##   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.47.5 on

+
This vignette was built with mkin 0.9.47.6 on

 
## R version 3.5.1 (2018-07-02)
 ## Platform: x86_64-pc-linux-gnu (64-bit)
 ## Running under: Debian GNU/Linux 9 (stretch)

-- 
cgit v1.2.1