From 3621588c04cbaa393ba62c97137f6aec746d114f Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 26 Nov 2018 09:09:43 +0100 Subject: Support logLik and AIC for manual weights Static documentation rebuilt by pkgdown --- docs/articles/FOCUS_D.html | 2 +- docs/articles/FOCUS_L.html | 38 ++++++++++++++--------------- 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 | 12 ++++----- 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'docs/articles') diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index b03e7612..0d463f63 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -84,7 +84,7 @@

Example evaluation of FOCUS Example Dataset D

Johannes Ranke

-

2018-11-23

+

2018-11-26

diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index e83664bc..dc562002 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -84,7 +84,7 @@

Example evaluation of FOCUS Laboratory Data L1 to L3

Johannes Ranke

-

2018-11-23

+

2018-11-26

@@ -110,8 +110,8 @@ summary(m.L1.SFO) 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Nov 23 20:47:25 2018 
-## Date of summary: Fri Nov 23 20:47:25 2018 
+## Date of fit:     Mon Nov 26 09:07:07 2018 
+## Date of summary: Mon Nov 26 09:07:07 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
@@ -201,15 +201,15 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Nov 23 20:47:26 2018 
-## Date of summary: Fri Nov 23 20:47:26 2018 
+## Date of fit:     Mon Nov 26 09:07:09 2018 
+## Date of summary: Mon Nov 26 09:07:09 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.467 s
+## Fitted with method Port using 611 model solutions performed in 1.481 s
 ## 
 ## Weighting: none
 ## 
@@ -296,15 +296,15 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Nov 23 20:47:27 2018 
-## Date of summary: Fri Nov 23 20:47:27 2018 
+## Date of fit:     Mon Nov 26 09:07:10 2018 
+## Date of summary: Mon Nov 26 09:07:10 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.192 s
+## Fitted with method Port using 81 model solutions performed in 0.191 s
 ## 
 ## Weighting: none
 ## 
@@ -367,8 +367,8 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Nov 23 20:47:28 2018 
-## Date of summary: Fri Nov 23 20:47:28 2018 
+## Date of fit:     Mon Nov 26 09:07:11 2018 
+## Date of summary: Mon Nov 26 09:07:11 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.822 s
+## Fitted with method Port using 336 model solutions performed in 0.86 s
 ## 
 ## Weighting: none
 ## 
@@ -459,8 +459,8 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Nov 23 20:47:29 2018 
-## Date of summary: Fri Nov 23 20:47:29 2018 
+## Date of fit:     Mon Nov 26 09:07:12 2018 
+## Date of summary: Mon Nov 26 09:07:12 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.336 s
+## Fitted with method Port using 137 model solutions performed in 0.339 s
 ## 
 ## Weighting: none
 ## 
@@ -560,8 +560,8 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Nov 23 20:47:29 2018 
-## Date of summary: Fri Nov 23 20:47:30 2018 
+## Date of fit:     Mon Nov 26 09:07:12 2018 
+## Date of summary: Mon Nov 26 09:07:13 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
@@ -620,8 +620,8 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Nov 23 20:47:30 2018 
-## Date of summary: Fri Nov 23 20:47:30 2018 
+## Date of fit:     Mon Nov 26 09:07:13 2018 
+## Date of summary: Mon Nov 26 09:07:13 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html
index 4ead1062..e73b989a 100644
--- a/docs/articles/mkin.html
+++ b/docs/articles/mkin.html
@@ -84,7 +84,7 @@
       
Introduction to mkin

                         
Johannes Ranke

             
-            
2018-11-23

+            
2018-11-26

       
       
       
diff --git a/docs/articles/twa.html b/docs/articles/twa.html
index 8c053c10..6ba7e1a7 100644
--- a/docs/articles/twa.html
+++ b/docs/articles/twa.html
@@ -84,7 +84,7 @@
       
Calculation of time weighted average concentrations with mkin

                         
Johannes Ranke

             
-            
2018-11-23

+            
2018-11-26

       
       
       
diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html
index 5215e039..6ebe3c73 100644
--- a/docs/articles/web_only/FOCUS_Z.html
+++ b/docs/articles/web_only/FOCUS_Z.html
@@ -84,7 +84,7 @@
       
Example evaluation of FOCUS dataset Z

                         
Johannes Ranke

             
-            
2018-11-23

+            
2018-11-26

       
       
       
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index c47425fb..25a3a62e 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -84,7 +84,7 @@
       
Performance benefit by using compiled model definitions in mkin

                         
Johannes Ranke

             
-            
2018-11-23

+            
2018-11-26

       
       
       
@@ -125,9 +125,9 @@
 }

 
## Lade nötiges Paket: rbenchmark

 
##                    test replications elapsed relative user.self sys.self
-## 3     deSolve, compiled            3   2.274    1.000     2.273        0
-## 1 deSolve, not compiled            3  17.686    7.777    17.676        0
-## 2      Eigenvalue based            3   2.800    1.231     2.799        0
+## 3     deSolve, compiled            3   2.296    1.000     2.295        0
+## 1 deSolve, not compiled            3  17.937    7.812    17.928        0
+## 2      Eigenvalue based            3   2.861    1.246     2.859        0
 ##   user.child sys.child
 ## 3          0         0
 ## 1          0         0
@@ -156,8 +156,8 @@
 }

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

 
##                    test replications elapsed relative user.self sys.self
-## 2     deSolve, compiled            3   4.038    1.000     4.035        0
-## 1 deSolve, not compiled            3  37.805    9.362    37.788        0
+## 2     deSolve, compiled            3   4.020    1.000     4.017        0
+## 1 deSolve, not compiled            3  37.721    9.383    37.704        0
 ##   user.child sys.child
 ## 2          0         0
 ## 1          0         0

-- 
cgit v1.2.1