From 0b98c459c30a0629a728acf6b311de035c55fb64 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 18 Jul 2018 15:18:30 +0200 Subject: Correct references to the Rocke and Lorenzato model Rename 'sigma_rl' to 'sigma_twocomp' as the Rocke and Lorenzato model assumes lognormal distribution for large y. Rebuild static documentation. --- docs/articles/FOCUS_D.html | 12 ++++---- docs/articles/FOCUS_L.html | 60 +++++++++++++++++++------------------- docs/articles/FOCUS_Z.html | 4 +-- docs/articles/compiled_models.html | 18 ++++++------ docs/articles/index.html | 2 +- docs/articles/mkin.html | 4 +-- docs/articles/twa.html | 4 +-- 7 files changed, 52 insertions(+), 52 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 8a1f51d1..630b1d02 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -29,7 +29,7 @@ mkin - 0.9.47.1 + 0.9.47.2 @@ -84,7 +84,7 @@

Example evaluation of FOCUS Example Dataset D

Johannes Ranke

-

2018-06-06

+

2018-07-18

@@ -161,9 +161,9 @@

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.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:49 2018 
-## Date of summary: Wed Jun  6 01:21:50 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 14:52:30 2018 
+## Date of summary: Wed Jul 18 14:52:31 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -171,7 +171,7 @@
 ## 
 ## Model predictions using solution type deSolve 
 ## 
-## Fitted with method Port using 153 model solutions performed in 0.633 s
+## Fitted with method Port using 153 model solutions performed in 0.604 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index fcd0719d..72c293b9 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -29,7 +29,7 @@
       
       
         mkin
-        0.9.47.1
+        0.9.47.2
       
     
 
@@ -84,7 +84,7 @@
       
Example evaluation of FOCUS Laboratory Data L1 to L3

                         
Johannes Ranke

             
-            
2018-06-06

+            
2018-07-18

       
       
       
@@ -109,16 +109,16 @@ FOCUS_2006_L1_mkin <- 
m.L1.SFO <- mkinfit("SFO", FOCUS_2006_L1_mkin, quiet = TRUE)
 summary(m.L1.SFO)

 
## mkin version used for fitting:    0.9.47.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:52 2018 
-## Date of summary: Wed Jun  6 01:21:52 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 15:16:17 2018 
+## Date of summary: Wed Jul 18 15:16:17 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.094 s
+## Fitted with method Port using 37 model solutions performed in 0.081 s
 ## 
 ## Weighting: none
 ## 
@@ -200,16 +200,16 @@ FOCUS_2006_L1_mkin <- 

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

 
## mkin version used for fitting:    0.9.47.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:53 2018 
-## Date of summary: Wed Jun  6 01:21:53 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 15:16:19 2018 
+## Date of summary: Wed Jul 18 15:16:19 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.369 s
+## Fitted with method Port using 611 model solutions performed in 1.304 s
 ## 
 ## Weighting: none
 ## 
@@ -295,16 +295,16 @@ FOCUS_2006_L2_mkin <- 

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

 
## mkin version used for fitting:    0.9.47.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:54 2018 
-## Date of summary: Wed Jun  6 01:21:54 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 15:16:19 2018 
+## Date of summary: Wed Jul 18 15:16:19 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.173 s
+## Fitted with method Port using 81 model solutions performed in 0.175 s
 ## 
 ## Weighting: none
 ## 
@@ -366,9 +366,9 @@ FOCUS_2006_L2_mkin <- 

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

 
## mkin version used for fitting:    0.9.47.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:55 2018 
-## Date of summary: Wed Jun  6 01:21:55 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 15:16:20 2018 
+## Date of summary: Wed Jul 18 15:16:20 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -377,7 +377,7 @@ FOCUS_2006_L2_mkin <-  
summary(mm.L3[["DFOP", 1]])

 
## mkin version used for fitting:    0.9.47.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:56 2018 
-## Date of summary: Wed Jun  6 01:21:56 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 15:16:21 2018 
+## Date of summary: Wed Jul 18 15:16:21 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -469,7 +469,7 @@ mm.L3 <-  \(\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.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:56 2018 
-## Date of summary: Wed Jun  6 01:21:57 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 15:16:22 2018 
+## Date of summary: Wed Jul 18 15:16:22 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.092 s
 ## 
 ## Weighting: none
 ## 
@@ -619,16 +619,16 @@ mm.L4 <- 
summary(mm.L4[["FOMC", 1]], data = FALSE)

 
## mkin version used for fitting:    0.9.47.1 
-## R version used for fitting:       3.5.0 
-## Date of fit:     Wed Jun  6 01:21:57 2018 
-## Date of summary: Wed Jun  6 01:21:57 2018 
+## R version used for fitting:       3.5.1 
+## Date of fit:     Wed Jul 18 15:16:22 2018 
+## Date of summary: Wed Jul 18 15:16:22 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.146 s
+## Fitted with method Port using 66 model solutions performed in 0.137 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/FOCUS_Z.html b/docs/articles/FOCUS_Z.html
index 61425745..d8b9c961 100644
--- a/docs/articles/FOCUS_Z.html
+++ b/docs/articles/FOCUS_Z.html
@@ -29,7 +29,7 @@
       
       
         mkin
-        0.9.47.1
+        0.9.47.2
       
     
 
@@ -84,7 +84,7 @@
       
Example evaluation of FOCUS dataset Z

                         
Johannes Ranke

             
-            
2018-06-06

+            
2018-07-18

       
       
       
diff --git a/docs/articles/compiled_models.html b/docs/articles/compiled_models.html
index 379176bf..183c9658 100644
--- a/docs/articles/compiled_models.html
+++ b/docs/articles/compiled_models.html
@@ -29,7 +29,7 @@
       
       
         mkin
-        0.9.47.1
+        0.9.47.2
       
     
 
@@ -84,7 +84,7 @@
       
Performance benefit by using compiled model definitions in mkin

                         
Johannes Ranke

             
-            
2018-06-06

+            
2018-07-18

       
       
       
@@ -125,14 +125,14 @@ SFO_SFO <- 
 

@@ -156,14 +156,14 @@ SFO_SFO <- 
         mkin
-        0.9.47.1
+        0.9.47.2
       
     
 
diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html
index 28186062..14a2f9b9 100644
--- a/docs/articles/mkin.html
+++ b/docs/articles/mkin.html
@@ -29,7 +29,7 @@
       
       
         mkin
-        0.9.47.1
+        0.9.47.2
       
     
 
@@ -84,7 +84,7 @@
       
Introduction to mkin

                         
Johannes Ranke

             
-            
2018-06-06

+            
2018-07-18

       
       
       
diff --git a/docs/articles/twa.html b/docs/articles/twa.html
index 53afcca3..0c5fe558 100644
--- a/docs/articles/twa.html
+++ b/docs/articles/twa.html
@@ -29,7 +29,7 @@
       
       
         mkin
-        0.9.47.1
+        0.9.47.2
       
     
 
@@ -84,7 +84,7 @@
       
Calculation of time weighted average concentrations with mkin

                         
Johannes Ranke

             
-            
2018-06-06

+            
2018-07-18

       
       
       
-- 
cgit v1.2.1