diff options
Diffstat (limited to 'docs/articles')
| -rw-r--r-- | docs/articles/FOCUS_D.html | 8 | ||||
| -rw-r--r-- | docs/articles/FOCUS_L.html | 42 | ||||
| -rw-r--r-- | docs/articles/mkin.html | 2 | ||||
| -rw-r--r-- | docs/articles/twa.html | 2 | ||||
| -rw-r--r-- | docs/articles/web_only/FOCUS_Z.html | 2 | ||||
| -rw-r--r-- | docs/articles/web_only/NAFTA_examples.html | 2 | ||||
| -rw-r--r-- | docs/articles/web_only/benchmarks.html | 24 | ||||
| -rw-r--r-- | docs/articles/web_only/compiled_models.html | 12 | 
8 files changed, 47 insertions, 47 deletions
| diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 53164ffd..f8c51e2d 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -90,7 +90,7 @@        <h1>Example evaluation of FOCUS Example Dataset D</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>FOCUS_D.Rmd</code></div> @@ -170,8 +170,8 @@  <div class="sourceCode" id="cb11"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb11-1" title="1"><span class="kw"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(fit)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:07 2019  -## Date of summary: Wed Sep 18 18:24:08 2019  +## Date of fit:     Thu Sep 19 09:52:55 2019  +## Date of summary: Thu Sep 19 09:52:56 2019   ##   ## Equations:  ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -179,7 +179,7 @@  ##   ## Model predictions using solution type deSolve   ##  -## Fitted using 389 model solutions performed in 1.014 s +## Fitted using 389 model solutions performed in 1.001 s  ##   ## Error model: Constant variance   ##  diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index 50c83db6..7b35beeb 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -90,7 +90,7 @@        <h1>Example evaluation of FOCUS Laboratory Data L1 to L3</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>FOCUS_L.Rmd</code></div> @@ -116,8 +116,8 @@  <a class="sourceLine" id="cb2-2" title="2"><span class="kw"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(m.L1.SFO)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:09 2019  -## Date of summary: Wed Sep 18 18:24:09 2019  +## Date of fit:     Thu Sep 19 09:52:57 2019  +## Date of summary: Thu Sep 19 09:52:57 2019   ##   ## Equations:  ## d_parent/dt = - k_parent_sink * parent @@ -218,8 +218,8 @@  ## finite result is doubtful</code></pre>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:12 2019  -## Date of summary: Wed Sep 18 18:24:12 2019  +## Date of fit:     Thu Sep 19 09:52:59 2019  +## Date of summary: Thu Sep 19 09:52:59 2019   ##   ##   ## Warning: Optimisation did not converge: @@ -231,7 +231,7 @@  ##   ## Model predictions using solution type analytical   ##  -## Fitted using 899 model solutions performed in 1.954 s +## Fitted using 899 model solutions performed in 1.908 s  ##   ## Error model: Constant variance   ##  @@ -323,15 +323,15 @@  <div class="sourceCode" id="cb17"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb17-1" title="1"><span class="kw"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(m.L2.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:13 2019  -## Date of summary: Wed Sep 18 18:24:13 2019  +## Date of fit:     Thu Sep 19 09:53:00 2019  +## Date of summary: Thu Sep 19 09:53:00 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.497 s +## Fitted using 239 model solutions performed in 0.49 s  ##   ## Error model: Constant variance   ##  @@ -399,8 +399,8 @@  <div class="sourceCode" id="cb20"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb20-1" title="1"><span class="kw"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(m.L2.DFOP, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:14 2019  -## Date of summary: Wed Sep 18 18:24:14 2019  +## Date of fit:     Thu Sep 19 09:53:02 2019  +## Date of summary: Thu Sep 19 09:53:02 2019   ##   ## Equations:  ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -409,7 +409,7 @@  ##   ## Model predictions using solution type analytical   ##  -## Fitted using 572 model solutions performed in 1.215 s +## Fitted using 572 model solutions performed in 1.204 s  ##   ## Error model: Constant variance   ##  @@ -499,8 +499,8 @@  <div class="sourceCode" id="cb24"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb24-1" title="1"><span class="kw"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(mm.L3[[<span class="st">"DFOP"</span>, <span class="dv">1</span>]])</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:16 2019  -## Date of summary: Wed Sep 18 18:24:16 2019  +## Date of fit:     Thu Sep 19 09:53:04 2019  +## Date of summary: Thu Sep 19 09:53:04 2019   ##   ## Equations:  ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -509,7 +509,7 @@  ##   ## Model predictions using solution type analytical   ##  -## Fitted using 373 model solutions performed in 0.778 s +## Fitted using 373 model solutions performed in 0.799 s  ##   ## Error model: Constant variance   ##  @@ -605,15 +605,15 @@  <div class="sourceCode" id="cb29"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb29-1" title="1"><span class="kw"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(mm.L4[[<span class="st">"SFO"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:17 2019  -## Date of summary: Wed Sep 18 18:24:17 2019  +## Date of fit:     Thu Sep 19 09:53:04 2019  +## Date of summary: Thu Sep 19 09:53:05 2019   ##   ## Equations:  ## d_parent/dt = - k_parent_sink * parent  ##   ## Model predictions using solution type analytical   ##  -## Fitted using 142 model solutions performed in 0.293 s +## Fitted using 142 model solutions performed in 0.287 s  ##   ## Error model: Constant variance   ##  @@ -670,15 +670,15 @@  <div class="sourceCode" id="cb31"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb31-1" title="1"><span class="kw"><a href="https://rdrr.io/r/base/summary.html">summary</a></span>(mm.L4[[<span class="st">"FOMC"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.49.6   ## R version used for fitting:       3.6.1  -## Date of fit:     Wed Sep 18 18:24:17 2019  -## Date of summary: Wed Sep 18 18:24:17 2019  +## Date of fit:     Thu Sep 19 09:53:05 2019  +## Date of summary: Thu Sep 19 09:53:05 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.46 s +## Fitted using 224 model solutions performed in 0.48 s  ##   ## Error model: Constant variance   ##  diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html index 90549b0f..ec138595 100644 --- a/docs/articles/mkin.html +++ b/docs/articles/mkin.html @@ -90,7 +90,7 @@        <h1>Introduction to mkin</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>mkin.Rmd</code></div> diff --git a/docs/articles/twa.html b/docs/articles/twa.html index 2d44a89d..9cb5873a 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.html @@ -90,7 +90,7 @@        <h1>Calculation of time weighted average concentrations with mkin</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>twa.Rmd</code></div> diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html index aed1debc..5ea0b256 100644 --- a/docs/articles/web_only/FOCUS_Z.html +++ b/docs/articles/web_only/FOCUS_Z.html @@ -90,7 +90,7 @@        <h1>Example evaluation of FOCUS dataset Z</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>FOCUS_Z.Rmd</code></div> diff --git a/docs/articles/web_only/NAFTA_examples.html b/docs/articles/web_only/NAFTA_examples.html index 3ca93667..0476acf8 100644 --- a/docs/articles/web_only/NAFTA_examples.html +++ b/docs/articles/web_only/NAFTA_examples.html @@ -90,7 +90,7 @@        <h1>Evaluation of example datasets from Attachment 1 to the US EPA SOP for the NAFTA guidance</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>NAFTA_examples.Rmd</code></div> diff --git a/docs/articles/web_only/benchmarks.html b/docs/articles/web_only/benchmarks.html index d46e738a..c0682cb0 100644 --- a/docs/articles/web_only/benchmarks.html +++ b/docs/articles/web_only/benchmarks.html @@ -90,7 +90,7 @@        <h1>Benchmark timings for mkin on various systems</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>benchmarks.Rmd</code></div> @@ -204,77 +204,77 @@  ## 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.936 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 5.970 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 6.005  ##                                                                         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 20.545 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 36.524 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 37.266  ##                                                                        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.446 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 4.607 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 4.559  ##                                                                         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 15.335 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 31.617 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 31.574  ##                                                                         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  6.002 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 10.543 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 10.659  ##                                                                        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.635 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 2.579 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 2.634  ##                                                                        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.259 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 4.341 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 4.324  ##                                                                        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.737 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 8.101 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 8.233  ##                                                                         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  7.763 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 16.211 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 16.376  ##                                                                       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 3.427 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 8.041 +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 8.058  ##                                                                        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  5.626 -## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 10.804</code></pre> +## Linux, AMD Ryzen 7 1700 Eight-Core Processor, mkin version 0.9.49.6 11.133</code></pre>  <div class="sourceCode" id="cb17"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb17-1" title="1"><span class="kw"><a href="https://rdrr.io/r/base/save.html">save</a></span>(mkin_benchmarks, <span class="dt">file =</span> <span class="st">"~/git/mkin/vignettes/mkin_benchmarks.rda"</span>)</a></code></pre></div>  </div>    </div> diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html index 1876e2b3..6df504ed 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.html @@ -90,7 +90,7 @@        <h1>Performance benefit by using compiled model definitions in mkin</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-09-18</h4> +            <h4 class="date">2019-09-19</h4>        <div class="hidden name"><code>compiled_models.Rmd</code></div> @@ -165,9 +165,9 @@  ## Warning in mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "deSolve", quiet  ## = TRUE): Observations with value of zero were removed from the data</code></pre>  <pre><code>##                    test replications elapsed relative user.self sys.self -## 3     deSolve, compiled            3   3.129    1.000     3.127        0 -## 1 deSolve, not compiled            3  28.841    9.217    28.827        0 -## 2      Eigenvalue based            3   4.433    1.417     4.430        0 +## 3     deSolve, compiled            3   3.171    1.000     3.170        0 +## 1 deSolve, not compiled            3  29.012    9.149    28.996        0 +## 2      Eigenvalue based            3   4.473    1.411     4.470        0  ##   user.child sys.child  ## 3          0         0  ## 1          0         0 @@ -216,8 +216,8 @@  ## Warning in mkinfit(FOMC_SFO, FOCUS_2006_D, quiet = TRUE): Observations with  ## value of zero were removed from the data</code></pre>  <pre><code>##                    test replications elapsed relative user.self sys.self -## 2     deSolve, compiled            3   4.860    1.000     4.857        0 -## 1 deSolve, not compiled            3  53.877   11.086    53.850        0 +## 2     deSolve, compiled            3   4.913    1.000     4.909        0 +## 1 deSolve, not compiled            3  53.418   10.873    53.393        0  ##   user.child sys.child  ## 2          0         0  ## 1          0         0</code></pre> | 
