From ad42e8870803335a549784888ddda80e4662f441 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 21 Feb 2019 15:16:14 +0100 Subject: Static documentation rebuilt by pkgdown --- docs/articles/FOCUS_D.html | 10 +++--- docs/articles/FOCUS_L.html | 56 ++++++++++++++--------------- docs/articles/index.html | 2 +- docs/articles/mkin.html | 2 +- docs/articles/twa.html | 2 +- docs/articles/web_only/FOCUS_Z.html | 2 +- docs/articles/web_only/compiled_models.html | 14 ++++---- 7 files changed, 44 insertions(+), 44 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 4a080ac1..4dd23fd2 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -30,7 +30,7 @@ mkin - 0.9.47.6 + 0.9.48.1 @@ -161,10 +161,10 @@

A comprehensive report of the results is obtained using the summary method for mkinfit objects.

summary(fit)
-
## mkin version used for fitting:    0.9.47.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:25 2019 
-## Date of summary: Thu Feb 21 14:58:26 2019 
+## Date of fit:     Thu Feb 21 15:13:35 2019 
+## Date of summary: Thu Feb 21 15:13:35 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.705 s
+## Fitted with method Port using 153 model solutions performed in 0.683 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index b9f72dbe..0820b21a 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -30,7 +30,7 @@
       
       
         mkin
-        0.9.47.6
+        0.9.48.1
       
     
 
@@ -109,17 +109,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.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:27 2019 
-## Date of summary: Thu Feb 21 14:58:27 2019 
+## Date of fit:     Thu Feb 21 15:13:37 2019 
+## Date of summary: Thu Feb 21 15:13:37 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.096 s
+## Fitted with method Port using 37 model solutions performed in 0.101 s
 ## 
 ## Weighting: none
 ## 
@@ -200,17 +200,17 @@
 plot(m.L1.FOMC, show_errmin = TRUE, main = "FOCUS L1 - FOMC")

 

 
summary(m.L1.FOMC, data = FALSE)

-
## mkin version used for fitting:    0.9.47.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:29 2019 
-## Date of summary: Thu Feb 21 14:58:29 2019 
+## Date of fit:     Thu Feb 21 15:13:39 2019 
+## Date of summary: Thu Feb 21 15:13:39 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.507 s
+## Fitted with method Port using 611 model solutions performed in 1.545 s
 ## 
 ## Weighting: none
 ## 
@@ -295,10 +295,10 @@
      main = "FOCUS L2 - FOMC")

 

 
summary(m.L2.FOMC, data = FALSE)

-
## mkin version used for fitting:    0.9.47.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:30 2019 
-## Date of summary: Thu Feb 21 14:58:30 2019 
+## Date of fit:     Thu Feb 21 15:13:39 2019 
+## Date of summary: Thu Feb 21 15:13:39 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -366,10 +366,10 @@
      main = "FOCUS L2 - DFOP")

 

 
summary(m.L2.DFOP, data = FALSE)

-
## mkin version used for fitting:    0.9.47.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:31 2019 
-## Date of summary: Thu Feb 21 14:58:31 2019 
+## Date of fit:     Thu Feb 21 15:13:40 2019 
+## Date of summary: Thu Feb 21 15:13:40 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.842 s
+## Fitted with method Port using 336 model solutions performed in 0.852 s
 ## 
 ## Weighting: none
 ## 
@@ -458,10 +458,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.

 
summary(mm.L3[["DFOP", 1]])

-
## mkin version used for fitting:    0.9.47.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:32 2019 
-## Date of summary: Thu Feb 21 14:58:32 2019 
+## Date of fit:     Thu Feb 21 15:13:41 2019 
+## Date of summary: Thu Feb 21 15:13:41 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.346 s
+## Fitted with method Port using 137 model solutions performed in 0.345 s
 ## 
 ## Weighting: none
 ## 
@@ -559,17 +559,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.

 
summary(mm.L4[["SFO", 1]], data = FALSE)

-
## mkin version used for fitting:    0.9.47.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:32 2019 
-## Date of summary: Thu Feb 21 14:58:33 2019 
+## Date of fit:     Thu Feb 21 15:13:42 2019 
+## Date of summary: Thu Feb 21 15:13:42 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.111 s
+## Fitted with method Port using 46 model solutions performed in 0.112 s
 ## 
 ## Weighting: none
 ## 
@@ -619,17 +619,17 @@
 ##        DT50 DT90
 ## parent  106  352

 
summary(mm.L4[["FOMC", 1]], data = FALSE)

-
## mkin version used for fitting:    0.9.47.6 
+
## mkin version used for fitting:    0.9.48.1 
 ## R version used for fitting:       3.5.2 
-## Date of fit:     Thu Feb 21 14:58:33 2019 
-## Date of summary: Thu Feb 21 14:58:33 2019 
+## Date of fit:     Thu Feb 21 15:13:42 2019 
+## Date of summary: Thu Feb 21 15:13:42 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.165 s
+## Fitted with method Port using 66 model solutions performed in 0.169 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/index.html b/docs/articles/index.html
index 2da6c874..b2b11a3f 100644
--- a/docs/articles/index.html
+++ b/docs/articles/index.html
@@ -60,7 +60,7 @@
       
       
         mkin
-        0.9.47.6
+        0.9.48.1
       
     
 
diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html
index c5b0d9c1..8f770680 100644
--- a/docs/articles/mkin.html
+++ b/docs/articles/mkin.html
@@ -30,7 +30,7 @@
       
       
         mkin
-        0.9.47.6
+        0.9.48.1
       
     
 
diff --git a/docs/articles/twa.html b/docs/articles/twa.html
index 8a1f82a8..2dbe2a32 100644
--- a/docs/articles/twa.html
+++ b/docs/articles/twa.html
@@ -30,7 +30,7 @@
       
       
         mkin
-        0.9.47.6
+        0.9.48.1
       
     
 
diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html
index c55abdbc..b4fa25ac 100644
--- a/docs/articles/web_only/FOCUS_Z.html
+++ b/docs/articles/web_only/FOCUS_Z.html
@@ -30,7 +30,7 @@
       
       
         mkin
-        0.9.47.6
+        0.9.48.1
       
     
 
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index e1149c67..b00fda46 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -30,7 +30,7 @@
       
       
         mkin
-        0.9.47.6
+        0.9.48.1
       
     
 
@@ -126,9 +126,9 @@
 }

 
## Lade nötiges Paket: rbenchmark

 
##                    test replications elapsed relative user.self sys.self
-## 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
+## 3     deSolve, compiled            3   2.340    1.000     2.338        0
+## 1 deSolve, not compiled            3  17.729    7.576    17.720        0
+## 2      Eigenvalue based            3   2.889    1.235     2.888        0
 ##   user.child sys.child
 ## 3          0         0
 ## 1          0         0
@@ -157,13 +157,13 @@
 }

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

 
##                    test replications elapsed relative user.self sys.self
-## 2     deSolve, compiled            3   4.105    1.000     4.101        0
-## 1 deSolve, not compiled            3  37.400    9.111    37.381        0
+## 2     deSolve, compiled            3   4.122     1.00     4.120        0
+## 1 deSolve, not compiled            3  37.471     9.09    37.452        0
 ##   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.6 on

+
This vignette was built with mkin 0.9.48.1 on

 
## R version 3.5.2 (2018-12-20)
 ## Platform: x86_64-pc-linux-gnu (64-bit)
 ## Running under: Debian GNU/Linux 9 (stretch)

-- 
cgit v1.2.1