From 46b8c7507d2d5fbf0741aeade5b0e7b0614f753f Mon Sep 17 00:00:00 2001
From: Johannes Ranke
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:47:59 2015
-## Date of summary: Sun Jun 21 01:47:59 2015
+## Date of fit: Sun Jun 21 15:31:54 2015
+## Date of summary: Sun Jun 21 15:31:54 2015
##
## Equations:
## d_parent = - k_parent_sink * parent - k_parent_m1 * parent
@@ -325,7 +325,7 @@ objects.
##
## Model predictions using solution type deSolve
##
-## Fitted with method Port using 153 model solutions performed in 0.698 s
+## Fitted with method Port using 153 model solutions performed in 0.611 s
##
## Weighting: none
##
diff --git a/vignettes/FOCUS_L.html b/vignettes/FOCUS_L.html
index 692caf93..84a91652 100644
--- a/vignettes/FOCUS_L.html
+++ b/vignettes/FOCUS_L.html
@@ -238,15 +238,15 @@ summary(m.L1.SFO)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:47:59 2015
-## Date of summary: Sun Jun 21 01:47:59 2015
+## Date of fit: Sun Jun 21 15:31:55 2015
+## Date of summary: Sun Jun 21 15:31:55 2015
##
## Equations:
## d_parent = - k_parent_sink * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 37 model solutions performed in 0.093 s
+## Fitted with method Port using 37 model solutions performed in 0.084 s
##
## Weighting: none
##
@@ -346,8 +346,8 @@ is checked.
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:00 2015
-## Date of summary: Sun Jun 21 01:48:00 2015
+## Date of fit: Sun Jun 21 15:31:55 2015
+## Date of summary: Sun Jun 21 15:31:55 2015
##
##
## Warning: Optimisation by method Port did not converge.
@@ -359,7 +359,7 @@ is checked.
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 188 model solutions performed in 0.463 s
+## Fitted with method Port using 188 model solutions performed in 0.406 s
##
## Weighting: none
##
@@ -448,15 +448,15 @@ summary(m.L2.SFO)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:00 2015
-## Date of summary: Sun Jun 21 01:48:00 2015
+## Date of fit: Sun Jun 21 15:31:55 2015
+## Date of summary: Sun Jun 21 15:31:55 2015
##
## Equations:
## d_parent = - k_parent_sink * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 41 model solutions performed in 0.097 s
+## Fitted with method Port using 41 model solutions performed in 0.09 s
##
## Weighting: none
##
@@ -558,15 +558,15 @@ mkinresplot(m.L2.FOMC)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:00 2015
-## Date of summary: Sun Jun 21 01:48:00 2015
+## Date of fit: Sun Jun 21 15:31:56 2015
+## Date of summary: Sun Jun 21 15:31:56 2015
##
## Equations:
## d_parent = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 81 model solutions performed in 0.191 s
+## Fitted with method Port using 81 model solutions performed in 0.173 s
##
## Weighting: none
##
@@ -647,8 +647,8 @@ plot(m.L2.DFOP)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:02 2015
-## Date of summary: Sun Jun 21 01:48:02 2015
+## Date of fit: Sun Jun 21 15:31:58 2015
+## Date of summary: Sun Jun 21 15:31:58 2015
##
## Equations:
## d_parent = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -657,7 +657,7 @@ plot(m.L2.DFOP)
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 336 model solutions performed in 0.835 s
+## Fitted with method Port using 336 model solutions performed in 0.746 s
##
## Weighting: none
##
@@ -739,15 +739,15 @@ plot(m.L3.SFO)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:03 2015
-## Date of summary: Sun Jun 21 01:48:03 2015
+## Date of fit: Sun Jun 21 15:31:58 2015
+## Date of summary: Sun Jun 21 15:31:58 2015
##
## Equations:
## d_parent = - k_parent_sink * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 43 model solutions performed in 0.104 s
+## Fitted with method Port using 43 model solutions performed in 0.089 s
##
## Weighting: none
##
@@ -825,15 +825,15 @@ plot(m.L3.FOMC)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:03 2015
-## Date of summary: Sun Jun 21 01:48:03 2015
+## Date of fit: Sun Jun 21 15:31:58 2015
+## Date of summary: Sun Jun 21 15:31:58 2015
##
## Equations:
## d_parent = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 83 model solutions performed in 0.196 s
+## Fitted with method Port using 83 model solutions performed in 0.181 s
##
## Weighting: none
##
@@ -901,8 +901,8 @@ plot(m.L3.DFOP)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:03 2015
-## Date of summary: Sun Jun 21 01:48:03 2015
+## Date of fit: Sun Jun 21 15:31:59 2015
+## Date of summary: Sun Jun 21 15:31:59 2015
##
## Equations:
## d_parent = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *
@@ -911,7 +911,7 @@ plot(m.L3.DFOP)
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 137 model solutions performed in 0.35 s
+## Fitted with method Port using 137 model solutions performed in 0.309 s
##
## Weighting: none
##
@@ -1002,15 +1002,15 @@ plot(m.L4.SFO)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:04 2015
-## Date of summary: Sun Jun 21 01:48:04 2015
+## Date of fit: Sun Jun 21 15:31:59 2015
+## Date of summary: Sun Jun 21 15:31:59 2015
##
## Equations:
## d_parent = - k_parent_sink * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 46 model solutions performed in 0.105 s
+## Fitted with method Port using 46 model solutions performed in 0.1 s
##
## Weighting: none
##
@@ -1077,15 +1077,15 @@ plot(m.L4.FOMC)
## mkin version: 0.9.36
## R version: 3.2.1
-## Date of fit: Sun Jun 21 01:48:04 2015
-## Date of summary: Sun Jun 21 01:48:04 2015
+## Date of fit: Sun Jun 21 15:31:59 2015
+## Date of summary: Sun Jun 21 15:31:59 2015
##
## Equations:
## d_parent = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 66 model solutions performed in 0.159 s
+## Fitted with method Port using 66 model solutions performed in 0.139 s
##
## Weighting: none
##
diff --git a/vignettes/FOCUS_Z.pdf b/vignettes/FOCUS_Z.pdf
index 36f3dc14..649410cf 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 5786c5bf..825bb36a 100644
Binary files a/vignettes/mkin.pdf and b/vignettes/mkin.pdf differ
--
cgit v1.2.1