From 587bdfc102dbaa2c882fb0c008d28a3aea1d74d8 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sat, 11 Oct 2014 11:18:01 +0200 Subject: Updated vignettes by building static documentation --- vignettes/FOCUS_L.html | 208 ++++++++++++++++++++++++++----------------------- vignettes/FOCUS_Z.pdf | Bin 220177 -> 213325 bytes vignettes/mkin.pdf | Bin 160326 -> 160333 bytes 3 files changed, 111 insertions(+), 97 deletions(-) diff --git a/vignettes/FOCUS_L.html b/vignettes/FOCUS_L.html index 2dd186de..c0430358 100644 --- a/vignettes/FOCUS_L.html +++ b/vignettes/FOCUS_L.html @@ -5,6 +5,18 @@ Example evaluation of FOCUS Laboratory Data L1 to L3 + + @@ -43,64 +57,71 @@ var hljs=new function(){function m(p){return p.replace(/&/gm,"&").replace(/< hljs.initHighlightingOnLoad(); - - @@ -193,13 +214,7 @@ hr { report, p. 284:

library("mkin")
-
- -
## Loading required package: minpack.lm
-## Loading required package: rootSolve
-
- -
FOCUS_2006_L1 = data.frame(
+FOCUS_2006_L1 = data.frame(
   t = rep(c(0, 1, 2, 3, 5, 7, 14, 21, 30), each = 2),
   parent = c(88.3, 91.4, 85.6, 84.5, 78.9, 77.6, 
              72.0, 71.9, 50.3, 59.4, 47.0, 45.1,
@@ -223,8 +238,8 @@ summary(m.L1.SFO)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:14 2014 
-## Date of summary: Mon Aug 25 10:34:14 2014 
+## Date of fit:     Sat Oct 11 11:06:43 2014 
+## Date of summary: Sat Oct 11 11:06:43 2014 
 ## 
 ## Equations:
 ## d_parent = - k_parent_sink * parent
@@ -308,9 +323,8 @@ summary(m.L1.SFO)
 
plot(m.L1.SFO)
 

 
-
plot of chunk unnamed-chunk-4 

-
-
The residual plot can be easily obtained by

+
plot of chunk unnamed-chunk-4 
+The residual plot can be easily obtained by

 
 
mkinresplot(m.L1.SFO, ylab = "Observed", xlab = "Time")
 

@@ -326,15 +340,15 @@ summary(m.L1.FOMC, data = FALSE)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:17 2014 
-## Date of summary: Mon Aug 25 10:34:17 2014 
+## Date of fit:     Sat Oct 11 11:06:44 2014 
+## Date of summary: Sat Oct 11 11:06:44 2014 
 ## 
 ## Equations:
 ## d_parent = - (alpha/beta) * ((time/beta) + 1)^-1 * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 53 model solutions performed in 0.3 s
+## Fitted with method Marq using 53 model solutions performed in 0.314 s
 ## 
 ## Weighting: none
 ## 
@@ -420,15 +434,15 @@ summary(m.L2.SFO)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:17 2014 
-## Date of summary: Mon Aug 25 10:34:17 2014 
+## Date of fit:     Sat Oct 11 11:06:44 2014 
+## Date of summary: Sat Oct 11 11:06:44 2014 
 ## 
 ## Equations:
 ## d_parent = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 29 model solutions performed in 0.184 s
+## Fitted with method Marq using 29 model solutions performed in 0.173 s
 ## 
 ## Weighting: none
 ## 
@@ -530,15 +544,15 @@ mkinresplot(m.L2.FOMC)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:17 2014 
-## Date of summary: Mon Aug 25 10:34:17 2014 
+## Date of fit:     Sat Oct 11 11:06:46 2014 
+## Date of summary: Sat Oct 11 11:06:47 2014 
 ## 
 ## Equations:
 ## d_parent = - (alpha/beta) * ((time/beta) + 1)^-1 * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 35 model solutions performed in 0.2 s
+## Fitted with method Marq using 35 model solutions performed in 0.206 s
 ## 
 ## Weighting: none
 ## 
@@ -616,8 +630,8 @@ plot(m.L2.DFOP)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:18 2014 
-## Date of summary: Mon Aug 25 10:34:18 2014 
+## Date of fit:     Sat Oct 11 11:06:47 2014 
+## Date of summary: Sat Oct 11 11:06:47 2014 
 ## 
 ## Equations:
 ## d_parent = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * 
@@ -626,7 +640,7 @@ plot(m.L2.DFOP)
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 43 model solutions performed in 0.26 s
+## Fitted with method Marq using 43 model solutions performed in 0.265 s
 ## 
 ## Weighting: none
 ## 
@@ -705,15 +719,15 @@ plot(m.L3.SFO)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:18 2014 
-## Date of summary: Mon Aug 25 10:34:18 2014 
+## Date of fit:     Sat Oct 11 11:06:48 2014 
+## Date of summary: Sat Oct 11 11:06:48 2014 
 ## 
 ## Equations:
 ## d_parent = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 44 model solutions performed in 0.252 s
+## Fitted with method Marq using 44 model solutions performed in 0.261 s
 ## 
 ## Weighting: none
 ## 
@@ -791,15 +805,15 @@ plot(m.L3.FOMC)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:19 2014 
-## Date of summary: Mon Aug 25 10:34:19 2014 
+## Date of fit:     Sat Oct 11 11:06:48 2014 
+## Date of summary: Sat Oct 11 11:06:48 2014 
 ## 
 ## Equations:
 ## d_parent = - (alpha/beta) * ((time/beta) + 1)^-1 * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 26 model solutions performed in 0.148 s
+## Fitted with method Marq using 26 model solutions performed in 0.159 s
 ## 
 ## Weighting: none
 ## 
@@ -864,8 +878,8 @@ plot(m.L3.DFOP)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:19 2014 
-## Date of summary: Mon Aug 25 10:34:19 2014 
+## Date of fit:     Sat Oct 11 11:06:50 2014 
+## Date of summary: Sat Oct 11 11:06:50 2014 
 ## 
 ## Equations:
 ## d_parent = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * 
@@ -874,7 +888,7 @@ plot(m.L3.DFOP)
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 37 model solutions performed in 0.236 s
+## Fitted with method Marq using 37 model solutions performed in 0.225 s
 ## 
 ## Weighting: none
 ## 
@@ -962,15 +976,15 @@ plot(m.L4.SFO)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:19 2014 
-## Date of summary: Mon Aug 25 10:34:19 2014 
+## Date of fit:     Sat Oct 11 11:06:51 2014 
+## Date of summary: Sat Oct 11 11:06:51 2014 
 ## 
 ## Equations:
 ## d_parent = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 20 model solutions performed in 0.123 s
+## Fitted with method Marq using 20 model solutions performed in 0.119 s
 ## 
 ## Weighting: none
 ## 
@@ -1037,15 +1051,15 @@ plot(m.L4.FOMC)
 
 
## mkin version:    0.9.33 
 ## R version:       3.1.1 
-## Date of fit:     Mon Aug 25 10:34:20 2014 
-## Date of summary: Mon Aug 25 10:34:20 2014 
+## Date of fit:     Sat Oct 11 11:06:51 2014 
+## Date of summary: Sat Oct 11 11:06:51 2014 
 ## 
 ## Equations:
 ## d_parent = - (alpha/beta) * ((time/beta) + 1)^-1 * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Marq using 48 model solutions performed in 0.281 s
+## Fitted with method Marq using 48 model solutions performed in 0.283 s
 ## 
 ## Weighting: none
 ## 
diff --git a/vignettes/FOCUS_Z.pdf b/vignettes/FOCUS_Z.pdf
index ca6d2506..426aa0df 100644
Binary files a/vignettes/FOCUS_Z.pdf and b/vignettes/FOCUS_Z.pdf differ
diff --git a/vignettes/mkin.pdf b/vignettes/mkin.pdf
index 0cc413a1..83182e65 100644
Binary files a/vignettes/mkin.pdf and b/vignettes/mkin.pdf differ
-- 
cgit v1.2.1