diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2018-03-11 22:12:51 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2018-03-11 22:12:51 +0100 |
commit | d185c26e4909efbae9dc4210ed9eac4b2600910e (patch) | |
tree | 7ac9660d439a6de997dac800d09c82404027ef9a /docs/articles | |
parent | a0bbfd3291aaa1a55438b8746c1e3cfb58ce4172 (diff) |
Static docs rebuilt again, with current pkgdown
Diffstat (limited to 'docs/articles')
-rw-r--r-- | docs/articles/FOCUS_D.html | 13 | ||||
-rw-r--r-- | docs/articles/FOCUS_L.R | 86 | ||||
-rw-r--r-- | docs/articles/FOCUS_L.html | 49 | ||||
-rw-r--r-- | docs/articles/FOCUS_Z.html | 7 | ||||
-rw-r--r-- | docs/articles/compiled_models.html | 19 | ||||
-rw-r--r-- | docs/articles/index.html | 2 | ||||
-rw-r--r-- | docs/articles/mkin.html | 7 | ||||
-rw-r--r-- | docs/articles/twa.html | 7 |
8 files changed, 62 insertions, 128 deletions
diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index d85246f8..a8002acd 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -9,7 +9,10 @@ <!-- jquery --><script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha384-nrOSfDHtoPMzJHjVTdCopGqIqeYETSXhZDFyniQ8ZHcVy08QesyHcnOUpMpqnmWq" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><!-- Font Awesome icons --><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"> <!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js" integrity="sha384-cV+rhyOuRHc9Ub/91rihWcGmMmCXDeksTtCihMupQHSsi8GIIRDG0ThDc3HGQFJ3" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"> -<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> +<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><meta property="og:title" content="Example evaluation of FOCUS Example Dataset D"> +<meta property="og:description" content=""> +<meta name="twitter:card" content="summary"> +<!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> @@ -77,7 +80,7 @@ <h1>Example evaluation of FOCUS Example Dataset D</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-09</h4> + <h4 class="date">2018-03-11</h4> </div> @@ -152,8 +155,8 @@ <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(fit)</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:48 2018 -## Date of summary: Fri Mar 9 23:09:48 2018 +## Date of fit: Sun Mar 11 22:11:56 2018 +## Date of summary: Sun Mar 11 22:11:57 2018 ## ## Equations: ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -161,7 +164,7 @@ ## ## Model predictions using solution type deSolve ## -## Fitted with method Port using 153 model solutions performed in 0.99 s +## Fitted with method Port using 153 model solutions performed in 0.984 s ## ## Weighting: none ## diff --git a/docs/articles/FOCUS_L.R b/docs/articles/FOCUS_L.R deleted file mode 100644 index 063e3d57..00000000 --- a/docs/articles/FOCUS_L.R +++ /dev/null @@ -1,86 +0,0 @@ -## ---- include = FALSE---------------------------------------------------- -library(knitr) -opts_chunk$set(tidy = FALSE, cache = FALSE) - -## ------------------------------------------------------------------------ -library("mkin", quietly = TRUE) -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, - 27.7, 27.3, 10.0, 10.4, 2.9, 4.0)) -FOCUS_2006_L1_mkin <- mkin_wide_to_long(FOCUS_2006_L1) - -## ------------------------------------------------------------------------ -m.L1.SFO <- mkinfit("SFO", FOCUS_2006_L1_mkin, quiet = TRUE) -summary(m.L1.SFO) - -## ----fig.width = 6, fig.height = 5--------------------------------------- -plot(m.L1.SFO, show_errmin = TRUE, main = "FOCUS L1 - SFO") - -## ----fig.width = 6, fig.height = 5--------------------------------------- -mkinresplot(m.L1.SFO, ylab = "Observed", xlab = "Time") - -## ----fig.width = 6, fig.height = 5--------------------------------------- -m.L1.FOMC <- mkinfit("FOMC", FOCUS_2006_L1_mkin, quiet=TRUE) -plot(m.L1.FOMC, show_errmin = TRUE, main = "FOCUS L1 - FOMC") -summary(m.L1.FOMC, data = FALSE) - -## ------------------------------------------------------------------------ -FOCUS_2006_L2 = data.frame( - t = rep(c(0, 1, 3, 7, 14, 28), each = 2), - parent = c(96.1, 91.8, 41.4, 38.7, - 19.3, 22.3, 4.6, 4.6, - 2.6, 1.2, 0.3, 0.6)) -FOCUS_2006_L2_mkin <- mkin_wide_to_long(FOCUS_2006_L2) - -## ----fig.width = 7, fig.height = 6--------------------------------------- -m.L2.SFO <- mkinfit("SFO", FOCUS_2006_L2_mkin, quiet=TRUE) -plot(m.L2.SFO, show_residuals = TRUE, show_errmin = TRUE, - main = "FOCUS L2 - SFO") - -## ----fig.width = 7, fig.height = 6--------------------------------------- -m.L2.FOMC <- mkinfit("FOMC", FOCUS_2006_L2_mkin, quiet = TRUE) -plot(m.L2.FOMC, show_residuals = TRUE, - main = "FOCUS L2 - FOMC") -summary(m.L2.FOMC, data = FALSE) - -## ----fig.width = 7, fig.height = 6--------------------------------------- -m.L2.DFOP <- mkinfit("DFOP", FOCUS_2006_L2_mkin, quiet = TRUE) -plot(m.L2.DFOP, show_residuals = TRUE, show_errmin = TRUE, - main = "FOCUS L2 - DFOP") -summary(m.L2.DFOP, data = FALSE) - -## ------------------------------------------------------------------------ -FOCUS_2006_L3 = data.frame( - t = c(0, 3, 7, 14, 30, 60, 91, 120), - parent = c(97.8, 60, 51, 43, 35, 22, 15, 12)) -FOCUS_2006_L3_mkin <- mkin_wide_to_long(FOCUS_2006_L3) - -## ----fig.height = 8------------------------------------------------------ -# Only use one core here, not to offend the CRAN checks -mm.L3 <- mmkin(c("SFO", "FOMC", "DFOP"), cores = 1, - list("FOCUS L3" = FOCUS_2006_L3_mkin), quiet = TRUE) -plot(mm.L3) - -## ----fig.height = 5------------------------------------------------------ -summary(mm.L3[["DFOP", 1]]) -plot(mm.L3[["DFOP", 1]], show_errmin = TRUE) - -## ------------------------------------------------------------------------ -FOCUS_2006_L4 = data.frame( - t = c(0, 3, 7, 14, 30, 60, 91, 120), - parent = c(96.6, 96.3, 94.3, 88.8, 74.9, 59.9, 53.5, 49.0)) -FOCUS_2006_L4_mkin <- mkin_wide_to_long(FOCUS_2006_L4) - -## ----fig.height = 6------------------------------------------------------ -# Only use one core here, not to offend the CRAN checks -mm.L4 <- mmkin(c("SFO", "FOMC"), cores = 1, - list("FOCUS L4" = FOCUS_2006_L4_mkin), - quiet = TRUE) -plot(mm.L4) - -## ----fig.height = 8------------------------------------------------------ -summary(mm.L4[["SFO", 1]], data = FALSE) -summary(mm.L4[["FOMC", 1]], data = FALSE) - diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index 196a0c4f..a23876ec 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -9,7 +9,10 @@ <!-- jquery --><script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha384-nrOSfDHtoPMzJHjVTdCopGqIqeYETSXhZDFyniQ8ZHcVy08QesyHcnOUpMpqnmWq" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><!-- Font Awesome icons --><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"> <!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js" integrity="sha384-cV+rhyOuRHc9Ub/91rihWcGmMmCXDeksTtCihMupQHSsi8GIIRDG0ThDc3HGQFJ3" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"> -<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> +<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><meta property="og:title" content="Example evaluation of FOCUS Laboratory Data L1 to L3"> +<meta property="og:description" content=""> +<meta name="twitter:card" content="summary"> +<!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> @@ -77,7 +80,7 @@ <h1>Example evaluation of FOCUS Laboratory Data L1 to L3</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-09</h4> + <h4 class="date">2018-03-11</h4> </div> @@ -100,15 +103,15 @@ FOCUS_<span class="dv">2006</span>_L1_mkin <-<span class="st"> </span><span c <span class="kw">summary</span>(m.L1.SFO)</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:50 2018 -## Date of summary: Fri Mar 9 23:09:50 2018 +## Date of fit: Sun Mar 11 22:11:58 2018 +## Date of summary: Sun Mar 11 22:11:58 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.264 s +## Fitted with method Port using 37 model solutions performed in 0.235 s ## ## Weighting: none ## @@ -191,15 +194,15 @@ FOCUS_<span class="dv">2006</span>_L1_mkin <-<span class="st"> </span><span c <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(m.L1.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:52 2018 -## Date of summary: Fri Mar 9 23:09:52 2018 +## Date of fit: Sun Mar 11 22:12:01 2018 +## Date of summary: Sun Mar 11 22:12:01 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.451 s +## Fitted with method Port using 611 model solutions performed in 1.458 s ## ## Weighting: none ## @@ -286,15 +289,15 @@ FOCUS_<span class="dv">2006</span>_L2_mkin <-<span class="st"> </span><span c <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(m.L2.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:53 2018 -## Date of summary: Fri Mar 9 23:09:53 2018 +## Date of fit: Sun Mar 11 22:12:01 2018 +## Date of summary: Sun Mar 11 22:12:01 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.175 s +## Fitted with method Port using 81 model solutions performed in 0.158 s ## ## Weighting: none ## @@ -357,8 +360,8 @@ FOCUS_<span class="dv">2006</span>_L2_mkin <-<span class="st"> </span><span c <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(m.L2.DFOP, <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:54 2018 -## Date of summary: Fri Mar 9 23:09:54 2018 +## Date of fit: Sun Mar 11 22:12:02 2018 +## Date of summary: Sun Mar 11 22:12:02 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -367,7 +370,7 @@ FOCUS_<span class="dv">2006</span>_L2_mkin <-<span class="st"> </span><span c ## ## Model predictions using solution type analytical ## -## Fitted with method Port using 336 model solutions performed in 0.739 s +## Fitted with method Port using 336 model solutions performed in 0.681 s ## ## Weighting: none ## @@ -449,8 +452,8 @@ mm.L3 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(mm.L3[[<span class="st">"DFOP"</span>, <span class="dv">1</span>]])</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:55 2018 -## Date of summary: Fri Mar 9 23:09:55 2018 +## Date of fit: Sun Mar 11 22:12:03 2018 +## Date of summary: Sun Mar 11 22:12:03 2018 ## ## Equations: ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -459,7 +462,7 @@ mm.L3 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin ## ## Model predictions using solution type analytical ## -## Fitted with method Port using 137 model solutions performed in 0.293 s +## Fitted with method Port using 137 model solutions performed in 0.272 s ## ## Weighting: none ## @@ -550,15 +553,15 @@ mm.L4 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(mm.L4[[<span class="st">"SFO"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:55 2018 -## Date of summary: Fri Mar 9 23:09:56 2018 +## Date of fit: Sun Mar 11 22:12:04 2018 +## Date of summary: Sun Mar 11 22:12:04 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.09 s +## Fitted with method Port using 46 model solutions performed in 0.092 s ## ## Weighting: none ## @@ -610,15 +613,15 @@ mm.L4 <-<span class="st"> </span><span class="kw"><a href="../reference/mmkin <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">summary</span>(mm.L4[[<span class="st">"FOMC"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</code></pre></div> <pre><code>## mkin version: 0.9.46.3 ## R version: 3.4.3 -## Date of fit: Fri Mar 9 23:09:56 2018 -## Date of summary: Fri Mar 9 23:09:56 2018 +## Date of fit: Sun Mar 11 22:12:04 2018 +## Date of summary: Sun Mar 11 22:12:04 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.134 s +## Fitted with method Port using 66 model solutions performed in 0.13 s ## ## Weighting: none ## diff --git a/docs/articles/FOCUS_Z.html b/docs/articles/FOCUS_Z.html index 606121ff..78a00062 100644 --- a/docs/articles/FOCUS_Z.html +++ b/docs/articles/FOCUS_Z.html @@ -9,7 +9,10 @@ <!-- jquery --><script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha384-nrOSfDHtoPMzJHjVTdCopGqIqeYETSXhZDFyniQ8ZHcVy08QesyHcnOUpMpqnmWq" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><!-- Font Awesome icons --><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"> <!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js" integrity="sha384-cV+rhyOuRHc9Ub/91rihWcGmMmCXDeksTtCihMupQHSsi8GIIRDG0ThDc3HGQFJ3" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"> -<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> +<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><meta property="og:title" content="Example evaluation of FOCUS dataset Z"> +<meta property="og:description" content=""> +<meta name="twitter:card" content="summary"> +<!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> @@ -77,7 +80,7 @@ <h1>Example evaluation of FOCUS dataset Z</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-09</h4> + <h4 class="date">2018-03-11</h4> </div> diff --git a/docs/articles/compiled_models.html b/docs/articles/compiled_models.html index 915e5474..8923acac 100644 --- a/docs/articles/compiled_models.html +++ b/docs/articles/compiled_models.html @@ -9,7 +9,10 @@ <!-- jquery --><script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha384-nrOSfDHtoPMzJHjVTdCopGqIqeYETSXhZDFyniQ8ZHcVy08QesyHcnOUpMpqnmWq" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><!-- Font Awesome icons --><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"> <!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js" integrity="sha384-cV+rhyOuRHc9Ub/91rihWcGmMmCXDeksTtCihMupQHSsi8GIIRDG0ThDc3HGQFJ3" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"> -<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> +<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><meta property="og:title" content="Performance benefit by using compiled model definitions in mkin"> +<meta property="og:description" content=""> +<meta name="twitter:card" content="summary"> +<!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> @@ -77,7 +80,7 @@ <h1>Performance benefit by using compiled model definitions in mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-09</h4> + <h4 class="date">2018-03-11</h4> </div> @@ -115,9 +118,9 @@ SFO_SFO <-<span class="st"> </span><span class="kw"><a href="../reference/mki }</code></pre></div> <pre><code>## Lade nötiges Paket: rbenchmark</code></pre> <pre><code>## test replications elapsed relative user.self sys.self -## 3 deSolve, compiled 3 2.044 1.000 2.042 0 -## 1 deSolve, not compiled 3 14.198 6.946 14.185 0 -## 2 Eigenvalue based 3 2.751 1.346 2.747 0 +## 3 deSolve, compiled 3 1.978 1.000 1.976 0 +## 1 deSolve, not compiled 3 13.541 6.846 13.531 0 +## 2 Eigenvalue based 3 2.332 1.179 2.330 0 ## user.child sys.child ## 3 0 0 ## 1 0 0 @@ -146,12 +149,12 @@ SFO_SFO <-<span class="st"> </span><span class="kw"><a href="../reference/mki }</code></pre></div> <pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre> <pre><code>## test replications elapsed relative user.self sys.self -## 2 deSolve, compiled 3 3.695 1.000 3.692 0 -## 1 deSolve, not compiled 3 31.143 8.428 31.114 0 +## 2 deSolve, compiled 3 3.334 1.000 3.331 0 +## 1 deSolve, not compiled 3 29.917 8.973 29.888 0 ## user.child sys.child ## 2 0 0 ## 1 0 0</code></pre> -<p>Here we get a performance benefit of a factor of 8 using the version of the differential equation model compiled from C code!</p> +<p>Here we get a performance benefit of a factor of 9 using the version of the differential equation model compiled from C code!</p> <p>This vignette was built with mkin 0.9.46.3 on</p> <pre><code>## R version 3.4.3 (2017-11-30) ## Platform: x86_64-pc-linux-gnu (64-bit) diff --git a/docs/articles/index.html b/docs/articles/index.html index c0c5864b..f338f1b2 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -27,6 +27,7 @@ <script src="../pkgdown.js"></script> +<meta property="og:title" content="Articles" /> <!-- mathjax --> <script src='https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'></script> @@ -134,3 +135,4 @@ </body> </html> + diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html index f668b500..7b26b3f1 100644 --- a/docs/articles/mkin.html +++ b/docs/articles/mkin.html @@ -9,7 +9,10 @@ <!-- jquery --><script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha384-nrOSfDHtoPMzJHjVTdCopGqIqeYETSXhZDFyniQ8ZHcVy08QesyHcnOUpMpqnmWq" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><!-- Font Awesome icons --><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"> <!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js" integrity="sha384-cV+rhyOuRHc9Ub/91rihWcGmMmCXDeksTtCihMupQHSsi8GIIRDG0ThDc3HGQFJ3" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"> -<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> +<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><meta property="og:title" content="Introduction to mkin"> +<meta property="og:description" content=""> +<meta name="twitter:card" content="summary"> +<!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> @@ -77,7 +80,7 @@ <h1>Introduction to mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-09</h4> + <h4 class="date">2018-03-11</h4> </div> diff --git a/docs/articles/twa.html b/docs/articles/twa.html index e5b68cfe..7f4c941e 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.html @@ -9,7 +9,10 @@ <!-- jquery --><script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha384-nrOSfDHtoPMzJHjVTdCopGqIqeYETSXhZDFyniQ8ZHcVy08QesyHcnOUpMpqnmWq" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><!-- Font Awesome icons --><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"> <!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js" integrity="sha384-cV+rhyOuRHc9Ub/91rihWcGmMmCXDeksTtCihMupQHSsi8GIIRDG0ThDc3HGQFJ3" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"> -<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> +<script src="../jquery.sticky-kit.min.js"></script><script src="../pkgdown.js"></script><meta property="og:title" content="Calculation of time weighted average concentrations with mkin"> +<meta property="og:description" content=""> +<meta name="twitter:card" content="summary"> +<!-- mathjax --><script src="https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> @@ -77,7 +80,7 @@ <h1>Calculation of time weighted average concentrations with mkin</h1> <h4 class="author">Johannes Ranke</h4> - <h4 class="date">2018-03-09</h4> + <h4 class="date">2018-03-11</h4> </div> |