From 70d158c4dd919f4f77bc12f8ace333d29d249b79 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 14 Sep 2018 16:57:17 +0200 Subject: Remove two vignettes from the package but not from docs - Rebuild static documentation - Adapt test to new approach to two component error model where the model is inadequate --- docs/articles/FOCUS_L.html | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'docs/articles/FOCUS_L.html') diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index cc069d1a..1087c0ed 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -29,7 +29,7 @@ mkin - 0.9.47.4 + 0.9.47.5 @@ -55,10 +55,10 @@ Example evaluation of FOCUS Laboratory Data L1 to L3
  • - Example evaluation of FOCUS Example Dataset Z + Example evaluation of FOCUS Example Dataset Z
  • - Performance benefit by using compiled model definitions in mkin + Performance benefit by using compiled model definitions in mkin
  • Calculation of time weighted average concentrations with mkin @@ -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.3 
+
    ## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 11:36:13 2018 
-## Date of summary: Fri Sep 14 11:36:13 2018 
+## Date of fit:     Fri Sep 14 16:54:49 2018 
+## Date of summary: Fri Sep 14 16:54:49 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.085 s
+## Fitted with method Port using 37 model solutions performed in 0.088 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.3 
+
    ## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 11:36:14 2018 
-## Date of summary: Fri Sep 14 11:36:14 2018 
+## Date of fit:     Fri Sep 14 16:54:51 2018 
+## Date of summary: Fri Sep 14 16:54:51 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.405 s
+## Fitted with method Port using 611 model solutions performed in 1.349 s
 ## 
 ## Weighting: none
 ## 
@@ -294,17 +294,17 @@
      main = "FOCUS L2 - FOMC")
    
 
    
 
-
    ## mkin version used for fitting:    0.9.47.3 
+
    ## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 11:36:15 2018 
-## Date of summary: Fri Sep 14 11:36:15 2018 
+## Date of fit:     Fri Sep 14 16:54:51 2018 
+## Date of summary: Fri Sep 14 16:54:51 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.188 s
+## Fitted with method Port using 81 model solutions performed in 0.18 s
 ## 
 ## Weighting: none
 ## 
@@ -365,10 +365,10 @@
      main = "FOCUS L2 - DFOP")
    
 
    
 
-
    ## mkin version used for fitting:    0.9.47.3 
+
    ## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 11:36:16 2018 
-## Date of summary: Fri Sep 14 11:36:16 2018 
+## Date of fit:     Fri Sep 14 16:54:52 2018 
+## Date of summary: Fri Sep 14 16:54:52 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.833 s
+## Fitted with method Port using 336 model solutions performed in 0.754 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.3 
+
    ## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 11:36:17 2018 
-## Date of summary: Fri Sep 14 11:36:17 2018 
+## Date of fit:     Fri Sep 14 16:54:53 2018 
+## Date of summary: Fri Sep 14 16:54:53 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.335 s
+## Fitted with method Port using 137 model solutions performed in 0.312 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.3 
+
    ## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 11:36:18 2018 
-## Date of summary: Fri Sep 14 11:36:18 2018 
+## Date of fit:     Fri Sep 14 16:54:54 2018 
+## Date of summary: Fri Sep 14 16:54:54 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.099 s
+## Fitted with method Port using 46 model solutions performed in 0.098 s
 ## 
 ## Weighting: none
 ## 
@@ -618,17 +618,17 @@
 ##        DT50 DT90
 ## parent  106  352
    
 
-
    ## mkin version used for fitting:    0.9.47.3 
+
    ## mkin version used for fitting:    0.9.47.5 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 11:36:18 2018 
-## Date of summary: Fri Sep 14 11:36:18 2018 
+## Date of fit:     Fri Sep 14 16:54:54 2018 
+## Date of summary: Fri Sep 14 16:54:54 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.152 s
+## Fitted with method Port using 66 model solutions performed in 0.153 s
 ## 
 ## Weighting: none
 ## 
-- 
cgit v1.2.1