From c6079a807e2b400fe0c772603392aeacd887da2f Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 8 May 2019 20:57:48 +0200 Subject: Add functionality to plot the error model by plotting squared residuals against predicted values, and showing the variance function used in the fitted error model. Rebuild docs --- docs/articles/FOCUS_D.html | 8 +++--- docs/articles/FOCUS_L.html | 44 ++++++++++++++--------------- docs/articles/mkin.html | 2 +- docs/articles/twa.html | 2 +- docs/articles/web_only/FOCUS_Z.html | 2 +- docs/articles/web_only/NAFTA_examples.html | 2 +- docs/articles/web_only/benchmarks.html | 24 ++++++++-------- docs/articles/web_only/compiled_models.html | 12 ++++---- 8 files changed, 48 insertions(+), 48 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 644a35b5..ba694065 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -88,7 +88,7 @@

Example evaluation of FOCUS Example Dataset D

Johannes Ranke

-

2019-05-07

+

2019-05-08

@@ -168,8 +168,8 @@ 
summary(fit)
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:46 2019 
-## Date of summary: Tue May  7 08:37:46 2019 
+## Date of fit:     Wed May  8 20:52:27 2019 
+## Date of summary: Wed May  8 20:52:27 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -177,7 +177,7 @@
 ## 
 ## Model predictions using solution type deSolve 
 ## 
-## Fitted using 389 model solutions performed in 1.018 s
+## Fitted using 389 model solutions performed in 0.998 s
 ## 
 ## Error model:
 ## Constant variance 
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index 2cffb323..6771bf63 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -88,7 +88,7 @@
       
Example evaluation of FOCUS Laboratory Data L1 to L3

                         
Johannes Ranke

             
-            
2019-05-07

+            
2019-05-08

       
       
       
@@ -114,15 +114,15 @@
 summary(m.L1.SFO)
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:48 2019 
-## Date of summary: Tue May  7 08:37:48 2019 
+## Date of fit:     Wed May  8 20:52:29 2019 
+## Date of summary: Wed May  8 20:52:29 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 133 model solutions performed in 0.284 s
+## Fitted using 133 model solutions performed in 0.276 s
 ## 
 ## Error model:
 ## Constant variance 
@@ -215,8 +215,8 @@
 ## finite result is doubtful
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:50 2019 
-## Date of summary: Tue May  7 08:37:50 2019 
+## Date of fit:     Wed May  8 20:52:31 2019 
+## Date of summary: Wed May  8 20:52:31 2019 
 ## 
 ## 
 ## Warning: Optimisation did not converge:
@@ -228,7 +228,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 899 model solutions performed in 1.913 s
+## Fitted using 899 model solutions performed in 1.868 s
 ## 
 ## Error model:
 ## Constant variance 
@@ -319,15 +319,15 @@
 
summary(m.L2.FOMC, data = FALSE)

 
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:51 2019 
-## Date of summary: Tue May  7 08:37:51 2019 
+## Date of fit:     Wed May  8 20:52:32 2019 
+## Date of summary: Wed May  8 20:52:32 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 239 model solutions performed in 0.494 s
+## Fitted using 239 model solutions performed in 0.483 s
 ## 
 ## Error model:
 ## Constant variance 
@@ -394,8 +394,8 @@
 
summary(m.L2.DFOP, data = FALSE)

 
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:53 2019 
-## Date of summary: Tue May  7 08:37:53 2019 
+## Date of fit:     Wed May  8 20:52:33 2019 
+## Date of summary: Wed May  8 20:52:33 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -404,7 +404,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 572 model solutions performed in 1.244 s
+## Fitted using 572 model solutions performed in 1.185 s
 ## 
 ## Error model:
 ## Constant variance 
@@ -493,8 +493,8 @@
 
summary(mm.L3[["DFOP", 1]])

 
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:55 2019 
-## Date of summary: Tue May  7 08:37:55 2019 
+## Date of fit:     Wed May  8 20:52:35 2019 
+## Date of summary: Wed May  8 20:52:35 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -503,7 +503,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 373 model solutions performed in 0.791 s
+## Fitted using 373 model solutions performed in 0.768 s
 ## 
 ## Error model:
 ## Constant variance 
@@ -598,15 +598,15 @@
 
summary(mm.L4[["SFO", 1]], data = FALSE)

 
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:56 2019 
-## Date of summary: Tue May  7 08:37:56 2019 
+## Date of fit:     Wed May  8 20:52:36 2019 
+## Date of summary: Wed May  8 20:52:37 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 142 model solutions performed in 0.29 s
+## Fitted using 142 model solutions performed in 0.289 s
 ## 
 ## Error model:
 ## Constant variance 
@@ -662,15 +662,15 @@
 
summary(mm.L4[["FOMC", 1]], data = FALSE)

 
## mkin version used for fitting:    0.9.49.4 
 ## R version used for fitting:       3.6.0 
-## Date of fit:     Tue May  7 08:37:56 2019 
-## Date of summary: Tue May  7 08:37:56 2019 
+## Date of fit:     Wed May  8 20:52:36 2019 
+## Date of summary: Wed May  8 20:52:37 2019 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted using 224 model solutions performed in 0.453 s
+## Fitted using 224 model solutions performed in 0.45 s
 ## 
 ## Error model:
 ## Constant variance 
diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html
index 271da77e..c274696c 100644
--- a/docs/articles/mkin.html
+++ b/docs/articles/mkin.html
@@ -88,7 +88,7 @@
       
Introduction to mkin

                         
Johannes Ranke

             
-            
2019-05-07

+            
2019-05-08

       
       
       
diff --git a/docs/articles/twa.html b/docs/articles/twa.html
index 9f08036a..9f660fab 100644
--- a/docs/articles/twa.html
+++ b/docs/articles/twa.html
@@ -88,7 +88,7 @@
       
Calculation of time weighted average concentrations with mkin

                         
Johannes Ranke

             
-            
2019-05-07

+            
2019-05-08

       
       
       
diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html
index 3cda0261..9184fad5 100644
--- a/docs/articles/web_only/FOCUS_Z.html
+++ b/docs/articles/web_only/FOCUS_Z.html
@@ -88,7 +88,7 @@
       
Example evaluation of FOCUS dataset Z

                         
Johannes Ranke

             
-            
2019-05-07

+            
2019-05-08

       
       
       
diff --git a/docs/articles/web_only/NAFTA_examples.html b/docs/articles/web_only/NAFTA_examples.html
index 237b506e..4d9e9b2d 100644
--- a/docs/articles/web_only/NAFTA_examples.html
+++ b/docs/articles/web_only/NAFTA_examples.html
@@ -88,7 +88,7 @@
       
Evaluation of example datasets from Attachment 1 to the US EPA SOP for the NAFTA guidance

                         
Johannes Ranke

             
-            
2019-05-07

+            
2019-05-08

       
       
       
diff --git a/docs/articles/web_only/benchmarks.html b/docs/articles/web_only/benchmarks.html
index a250f005..a53f1927 100644
--- a/docs/articles/web_only/benchmarks.html
+++ b/docs/articles/web_only/benchmarks.html
@@ -88,7 +88,7 @@
       
Benchmark timings for mkin on various systems

                         
Johannes Ranke

             
-            
2019-05-07

+            
2019-05-08

       
       
       
@@ -198,67 +198,67 @@
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 8.184
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 7.064
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 7.296
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.982
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.792
 ##                                                                         t2
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 11.019
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 22.889
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 12.558
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 21.239
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 17.777
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 17.398
 ##                                                                        t3
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 3.764
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 4.649
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 4.786
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 4.510
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.545
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.427
 ##                                                                         t4
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 14.347
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 13.789
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2  8.461
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 13.805
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 16.684
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 16.104
 ##                                                                        t5
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 9.495
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 6.395
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 5.675
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 7.386
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 7.868
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 7.527
 ##                                                                        t6
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 2.623
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 2.542
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 2.723
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 2.643
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4  2.66
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 2.541
 ##                                                                        t7
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 4.587
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 4.128
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 4.478
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 4.374
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.496
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.308
 ##                                                                        t8
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 7.525
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 4.632
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 4.862
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3  7.02
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.919
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 4.775
 ##                                                                         t9
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 16.621
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1  8.171
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2  7.618
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 11.124
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 11.683
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 11.116
 ##                                                                       t10
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 8.576
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1 3.676
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2 3.579
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3 5.388
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.344
+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4 5.063
 ##                                                                        t11
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.48.1 31.267
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.1  5.636
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.2  5.574
 ## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.3  7.365
-## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4  7.752

+## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.4  7.784

 
save(mkin_benchmarks, file = "~/git/mkin/vignettes/mkin_benchmarks.rda")

 
   
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index 54d3148f..f296c8a4 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -88,7 +88,7 @@
       
Performance benefit by using compiled model definitions in mkin

                         
Johannes Ranke

             
-            
2019-05-07

+            
2019-05-08

       
       
       
@@ -163,9 +163,9 @@
 ## Warning in mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "deSolve", quiet
 ## = TRUE): Observations with value of zero were removed from the data

 
##                    test replications elapsed relative user.self sys.self
-## 3     deSolve, compiled            3   3.067    1.000     3.065        0
-## 1 deSolve, not compiled            3  28.135    9.173    28.122        0
-## 2      Eigenvalue based            3   4.306    1.404     4.303        0
+## 3     deSolve, compiled            3   3.131    1.000     3.129        0
+## 1 deSolve, not compiled            3  28.306    9.041    28.290        0
+## 2      Eigenvalue based            3   4.361    1.393     4.358        0
 ##   user.child sys.child
 ## 3          0         0
 ## 1          0         0
@@ -214,8 +214,8 @@
 ## Warning in mkinfit(FOMC_SFO, FOCUS_2006_D, quiet = TRUE): Observations with
 ## value of zero were removed from the data

 
##                    test replications elapsed relative user.self sys.self
-## 2     deSolve, compiled            3   4.827    1.000     4.825        0
-## 1 deSolve, not compiled            3  52.646   10.907    52.622        0
+## 2     deSolve, compiled            3   5.023    1.000     5.021        0
+## 1 deSolve, not compiled            3  53.267   10.605    53.235        0
 ##   user.child sys.child
 ## 2          0         0
 ## 1          0         0

-- 
cgit v1.2.1