diff options
author | Johannes Ranke <johannes.ranke@jrwb.de> | 2025-02-16 17:27:18 +0100 |
---|---|---|
committer | Johannes Ranke <johannes.ranke@jrwb.de> | 2025-02-16 17:29:28 +0100 |
commit | 4f62f39b8979cb3a5c52d65d425e530dc0770665 (patch) | |
tree | 895d4bde0773a600943e5c308e17651c12358a67 /docs/dev/articles | |
parent | 44c30938872bd7cc80a4c84dd4db593e26000fce (diff) |
The special case occurs if not observed data for time zero
are available. Fixes #16. Write NEWS and update docs.
A lot of html was regenerated, because I had checked out
the main branch in between, which made pkgdown believe that
I have changed the help files.
Diffstat (limited to 'docs/dev/articles')
-rw-r--r-- | docs/dev/articles/FOCUS_D.html | 8 | ||||
-rw-r--r-- | docs/dev/articles/FOCUS_L.html | 34 | ||||
-rw-r--r-- | docs/dev/articles/mkin.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/prebuilt/2022_cyan_pathway.html | 71 | ||||
-rw-r--r-- | docs/dev/articles/prebuilt/2022_dmta_parent.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/prebuilt/2022_dmta_pathway.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/prebuilt/2023_mesotrione_parent.html | 31 | ||||
-rw-r--r-- | docs/dev/articles/twa.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/web_only/FOCUS_Z.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/web_only/NAFTA_examples.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/web_only/benchmarks.html | 24 | ||||
-rw-r--r-- | docs/dev/articles/web_only/compiled_models.html | 14 | ||||
-rw-r--r-- | docs/dev/articles/web_only/dimethenamid_2018.html | 12 | ||||
-rw-r--r-- | docs/dev/articles/web_only/multistart.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/web_only/saem_benchmarks.html | 22 |
15 files changed, 113 insertions, 117 deletions
diff --git a/docs/dev/articles/FOCUS_D.html b/docs/dev/articles/FOCUS_D.html index a21ed6d4..d9b783e7 100644 --- a/docs/dev/articles/FOCUS_D.html +++ b/docs/dev/articles/FOCUS_D.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 31 January 2019 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/FOCUS_D.rmd" class="external-link"><code>vignettes/FOCUS_D.rmd</code></a></small> <div class="d-none name"><code>FOCUS_D.rmd</code></div> @@ -188,8 +188,8 @@ the <code>mkinparplot</code> function.</p> <code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">fit</span><span class="op">)</span></span></code></pre></div> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:09 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:09 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:33 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:33 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - k_parent * parent</span></span> @@ -197,7 +197,7 @@ the <code>mkinparplot</code> function.</p> <span><span class="co">## </span></span> <span><span class="co">## Model predictions using solution type analytical </span></span> <span><span class="co">## </span></span> -<span><span class="co">## Fitted using 401 model solutions performed in 0.053 s</span></span> +<span><span class="co">## Fitted using 401 model solutions performed in 0.051 s</span></span> <span><span class="co">## </span></span> <span><span class="co">## Error model: Constant variance </span></span> <span><span class="co">## </span></span> diff --git a/docs/dev/articles/FOCUS_L.html b/docs/dev/articles/FOCUS_L.html index badf4822..fe1e7312 100644 --- a/docs/dev/articles/FOCUS_L.html +++ b/docs/dev/articles/FOCUS_L.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 18 May 2023 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/FOCUS_L.rmd" class="external-link"><code>vignettes/FOCUS_L.rmd</code></a></small> <div class="d-none name"><code>FOCUS_L.rmd</code></div> @@ -120,15 +120,15 @@ report.</p> <span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">m.L1.SFO</span><span class="op">)</span></span></code></pre></div> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:11 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:11 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:35 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:35 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - k_parent * parent</span></span> <span><span class="co">## </span></span> <span><span class="co">## Model predictions using solution type analytical </span></span> <span><span class="co">## </span></span> -<span><span class="co">## Fitted using 133 model solutions performed in 0.01 s</span></span> +<span><span class="co">## Fitted using 133 model solutions performed in 0.011 s</span></span> <span><span class="co">## </span></span> <span><span class="co">## Error model: Constant variance </span></span> <span><span class="co">## </span></span> @@ -228,8 +228,8 @@ error level is checked.</p> <span><span class="co">## non-finite result may be dubious</span></span></code></pre> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:11 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:11 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:35 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:35 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent</span></span> @@ -386,8 +386,8 @@ error level is checked.</p> <code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">m.L2.FOMC</span>, data <span class="op">=</span> <span class="cn">FALSE</span><span class="op">)</span></span></code></pre></div> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:12 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:12 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:35 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:35 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent</span></span> @@ -473,8 +473,8 @@ error level.</p> <code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">m.L2.DFOP</span>, data <span class="op">=</span> <span class="cn">FALSE</span><span class="op">)</span></span></code></pre></div> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:12 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:12 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:36 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:36 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *</span></span> @@ -596,8 +596,8 @@ summary and plot functions working on mkinfit objects.</p> <code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">mm.L3</span><span class="op">[[</span><span class="st">"DFOP"</span>, <span class="fl">1</span><span class="op">]</span><span class="op">]</span><span class="op">)</span></span></code></pre></div> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:12 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:12 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:36 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:36 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 *</span></span> @@ -726,8 +726,8 @@ difference appears negligible.</p> <code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">mm.L4</span><span class="op">[[</span><span class="st">"SFO"</span>, <span class="fl">1</span><span class="op">]</span><span class="op">]</span>, data <span class="op">=</span> <span class="cn">FALSE</span><span class="op">)</span></span></code></pre></div> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:13 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:13 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:36 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:37 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - k_parent * parent</span></span> @@ -791,15 +791,15 @@ difference appears negligible.</p> <code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/pkg/saemix/man/summary-methods.html" class="external-link">summary</a></span><span class="op">(</span><span class="va">mm.L4</span><span class="op">[[</span><span class="st">"FOMC"</span>, <span class="fl">1</span><span class="op">]</span><span class="op">]</span>, data <span class="op">=</span> <span class="cn">FALSE</span><span class="op">)</span></span></code></pre></div> <pre><code><span><span class="co">## mkin version used for fitting: 1.2.10 </span></span> <span><span class="co">## R version used for fitting: 4.4.2 </span></span> -<span><span class="co">## Date of fit: Fri Feb 14 08:59:13 2025 </span></span> -<span><span class="co">## Date of summary: Fri Feb 14 08:59:13 2025 </span></span> +<span><span class="co">## Date of fit: Sun Feb 16 17:04:36 2025 </span></span> +<span><span class="co">## Date of summary: Sun Feb 16 17:04:37 2025 </span></span> <span><span class="co">## </span></span> <span><span class="co">## Equations:</span></span> <span><span class="co">## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent</span></span> <span><span class="co">## </span></span> <span><span class="co">## Model predictions using solution type analytical </span></span> <span><span class="co">## </span></span> -<span><span class="co">## Fitted using 224 model solutions performed in 0.013 s</span></span> +<span><span class="co">## Fitted using 224 model solutions performed in 0.014 s</span></span> <span><span class="co">## </span></span> <span><span class="co">## Error model: Constant variance </span></span> <span><span class="co">## </span></span> diff --git a/docs/dev/articles/mkin.html b/docs/dev/articles/mkin.html index 30b2182f..a1d4fd3c 100644 --- a/docs/dev/articles/mkin.html +++ b/docs/dev/articles/mkin.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 18 May 2023 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/mkin.rmd" class="external-link"><code>vignettes/mkin.rmd</code></a></small> <div class="d-none name"><code>mkin.rmd</code></div> diff --git a/docs/dev/articles/prebuilt/2022_cyan_pathway.html b/docs/dev/articles/prebuilt/2022_cyan_pathway.html index b93e5e7e..0a37915d 100644 --- a/docs/dev/articles/prebuilt/2022_cyan_pathway.html +++ b/docs/dev/articles/prebuilt/2022_cyan_pathway.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change on 13 February -2023, last compiled on 14 Februar 2025</h4> +2023, last compiled on 16 Februar 2025</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/prebuilt/2022_cyan_pathway.rmd" class="external-link"><code>vignettes/prebuilt/2022_cyan_pathway.rmd</code></a></small> <div class="d-none name"><code>2022_cyan_pathway.rmd</code></div> @@ -2254,7 +2254,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:42:26 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - k_cyan * cyan @@ -2382,7 +2382,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:42:06 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - k_cyan * cyan @@ -2512,7 +2512,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:42:57 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -2657,7 +2657,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:42:50 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -2795,7 +2795,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:43:33 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -2941,7 +2941,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:46:07 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -3087,7 +3087,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:43:36 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -3252,7 +3252,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:46:14 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -3417,7 +3417,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:43:42 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - ifelse(time <= tb, k1, k2) * cyan @@ -3563,7 +3563,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:54:36 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -3729,7 +3729,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:55:32 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -3920,7 +3920,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:57:56 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -4111,7 +4111,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:55:26 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -4307,7 +4307,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 07:58:06 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:40 2025 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -4508,7 +4508,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 08:11:01 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:41 2025 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -4651,7 +4651,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 08:12:27 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:41 2025 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -4817,7 +4817,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 08:12:54 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:41 2025 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -4983,7 +4983,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 08:12:32 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:41 2025 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -5154,7 +5154,7 @@ saemix version used for fitting: 3.3 mkin version used for pre-fitting: 1.2.10 R version used for fitting: 4.4.2 Date of fit: Fri Feb 14 08:12:36 2025 -Date of summary: Fri Feb 14 08:12:55 2025 +Date of summary: Sun Feb 16 17:03:41 2025 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -5345,25 +5345,22 @@ attached base packages: [8] base other attached packages: -[1] rmarkdown_2.29 nvimcom_0.9-167 saemix_3.3 npde_3.5 -[5] knitr_1.49 mkin_1.2.10 +[1] saemix_3.3 npde_3.5 knitr_1.49 mkin_1.2.10 loaded via a namespace (and not attached): - [1] sass_0.4.9 utf8_1.2.4 generics_0.1.3 lattice_0.22-6 - [5] digest_0.6.37 magrittr_2.0.3 evaluate_1.0.1 grid_4.4.2 - [9] fastmap_1.2.0 cellranger_1.1.0 jsonlite_1.8.9 processx_3.8.4 -[13] pkgbuild_1.4.5 deSolve_1.40 mclust_6.1.1 ps_1.8.1 -[17] gridExtra_2.3 fansi_1.0.6 scales_1.3.0 codetools_0.2-20 -[21] textshaping_0.4.1 jquerylib_0.1.4 cli_3.6.3 rlang_1.1.4 -[25] munsell_0.5.1 cachem_1.1.0 yaml_2.3.10 inline_0.3.20 -[29] tools_4.4.2 dplyr_1.1.4 colorspace_2.1-1 ggplot2_3.5.1 -[33] vctrs_0.6.5 R6_2.5.1 zoo_1.8-12 lifecycle_1.0.4 -[37] fs_1.6.5 htmlwidgets_1.6.4 MASS_7.3-61 ragg_1.3.3 -[41] callr_3.7.6 pkgconfig_2.0.3 desc_1.4.3 pkgdown_2.1.1 -[45] pillar_1.9.0 bslib_0.8.0 gtable_0.3.6 glue_1.8.0 -[49] systemfonts_1.1.0 xfun_0.49 tibble_3.2.1 lmtest_0.9-40 -[53] tidyselect_1.2.1 htmltools_0.5.8.1 nlme_3.1-166 compiler_4.4.2 -[57] readxl_1.4.3 </code></pre> + [1] gtable_0.3.6 jsonlite_1.8.9 dplyr_1.1.4 compiler_4.4.2 + [5] tidyselect_1.2.1 gridExtra_2.3 jquerylib_0.1.4 systemfonts_1.1.0 + [9] scales_1.3.0 textshaping_0.4.1 yaml_2.3.10 fastmap_1.2.0 +[13] lattice_0.22-6 ggplot2_3.5.1 R6_2.5.1 generics_0.1.3 +[17] lmtest_0.9-40 MASS_7.3-61 htmlwidgets_1.6.4 tibble_3.2.1 +[21] desc_1.4.3 munsell_0.5.1 bslib_0.8.0 pillar_1.9.0 +[25] rlang_1.1.4 utf8_1.2.4 inline_0.3.20 cachem_1.1.0 +[29] xfun_0.49 fs_1.6.5 sass_0.4.9 cli_3.6.3 +[33] pkgdown_2.1.1 magrittr_2.0.3 digest_0.6.37 grid_4.4.2 +[37] mclust_6.1.1 lifecycle_1.0.4 nlme_3.1-166 vctrs_0.6.5 +[41] evaluate_1.0.1 glue_1.8.0 ragg_1.3.3 zoo_1.8-12 +[45] fansi_1.0.6 colorspace_2.1-1 rmarkdown_2.29 pkgconfig_2.0.3 +[49] tools_4.4.2 htmltools_0.5.8.1</code></pre> </div> <div class="section level3"> <h3 id="hardware-info">Hardware info<a class="anchor" aria-label="anchor" href="#hardware-info"></a> diff --git a/docs/dev/articles/prebuilt/2022_dmta_parent.html b/docs/dev/articles/prebuilt/2022_dmta_parent.html index d900cf00..e4943574 100644 --- a/docs/dev/articles/prebuilt/2022_dmta_parent.html +++ b/docs/dev/articles/prebuilt/2022_dmta_parent.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change on 5 January -2023, last compiled on 14 Februar 2025</h4> +2023, last compiled on 16 Februar 2025</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/prebuilt/2022_dmta_parent.rmd" class="external-link"><code>vignettes/prebuilt/2022_dmta_parent.rmd</code></a></small> <div class="d-none name"><code>2022_dmta_parent.rmd</code></div> diff --git a/docs/dev/articles/prebuilt/2022_dmta_pathway.html b/docs/dev/articles/prebuilt/2022_dmta_pathway.html index 92440f1f..f7386a47 100644 --- a/docs/dev/articles/prebuilt/2022_dmta_pathway.html +++ b/docs/dev/articles/prebuilt/2022_dmta_pathway.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change on 20 April 2023, -last compiled on 14 Februar 2025</h4> +last compiled on 16 Februar 2025</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/prebuilt/2022_dmta_pathway.rmd" class="external-link"><code>vignettes/prebuilt/2022_dmta_pathway.rmd</code></a></small> <div class="d-none name"><code>2022_dmta_pathway.rmd</code></div> diff --git a/docs/dev/articles/prebuilt/2023_mesotrione_parent.html b/docs/dev/articles/prebuilt/2023_mesotrione_parent.html index 86c7c2dd..501639b6 100644 --- a/docs/dev/articles/prebuilt/2023_mesotrione_parent.html +++ b/docs/dev/articles/prebuilt/2023_mesotrione_parent.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change on 4 August 2023, -last compiled on 14 Februar 2025</h4> +last compiled on 16 Februar 2025</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/prebuilt/2023_mesotrione_parent.rmd" class="external-link"><code>vignettes/prebuilt/2023_mesotrione_parent.rmd</code></a></small> <div class="d-none name"><code>2023_mesotrione_parent.rmd</code></div> @@ -2450,23 +2450,22 @@ attached base packages: [8] base other attached packages: -[1] rmarkdown_2.29 nvimcom_0.9-167 saemix_3.3 npde_3.5 -[5] knitr_1.49 mkin_1.2.10 +[1] saemix_3.3 npde_3.5 knitr_1.49 mkin_1.2.10 loaded via a namespace (and not attached): - [1] sass_0.4.9 utf8_1.2.4 generics_0.1.3 lattice_0.22-6 - [5] digest_0.6.37 magrittr_2.0.3 evaluate_1.0.1 grid_4.4.2 - [9] fastmap_1.2.0 cellranger_1.1.0 jsonlite_1.8.9 mclust_6.1.1 -[13] gridExtra_2.3 fansi_1.0.6 scales_1.3.0 codetools_0.2-20 -[17] textshaping_0.4.1 jquerylib_0.1.4 cli_3.6.3 rlang_1.1.4 -[21] munsell_0.5.1 cachem_1.1.0 yaml_2.3.10 tools_4.4.2 -[25] dplyr_1.1.4 colorspace_2.1-1 ggplot2_3.5.1 vctrs_0.6.5 -[29] R6_2.5.1 zoo_1.8-12 lifecycle_1.0.4 fs_1.6.5 -[33] htmlwidgets_1.6.4 MASS_7.3-61 ragg_1.3.3 pkgconfig_2.0.3 -[37] desc_1.4.3 pkgdown_2.1.1 pillar_1.9.0 bslib_0.8.0 -[41] gtable_0.3.6 glue_1.8.0 systemfonts_1.1.0 xfun_0.49 -[45] tibble_3.2.1 lmtest_0.9-40 tidyselect_1.2.1 htmltools_0.5.8.1 -[49] nlme_3.1-166 compiler_4.4.2 readxl_1.4.3 </code></pre> + [1] gtable_0.3.6 jsonlite_1.8.9 dplyr_1.1.4 compiler_4.4.2 + [5] tidyselect_1.2.1 gridExtra_2.3 jquerylib_0.1.4 systemfonts_1.1.0 + [9] scales_1.3.0 textshaping_0.4.1 yaml_2.3.10 fastmap_1.2.0 +[13] lattice_0.22-6 ggplot2_3.5.1 R6_2.5.1 generics_0.1.3 +[17] lmtest_0.9-40 MASS_7.3-61 htmlwidgets_1.6.4 tibble_3.2.1 +[21] desc_1.4.3 munsell_0.5.1 bslib_0.8.0 pillar_1.9.0 +[25] rlang_1.1.4 utf8_1.2.4 cachem_1.1.0 xfun_0.49 +[29] fs_1.6.5 sass_0.4.9 cli_3.6.3 pkgdown_2.1.1 +[33] magrittr_2.0.3 digest_0.6.37 grid_4.4.2 mclust_6.1.1 +[37] lifecycle_1.0.4 nlme_3.1-166 vctrs_0.6.5 evaluate_1.0.1 +[41] glue_1.8.0 ragg_1.3.3 zoo_1.8-12 fansi_1.0.6 +[45] colorspace_2.1-1 rmarkdown_2.29 pkgconfig_2.0.3 tools_4.4.2 +[49] htmltools_0.5.8.1</code></pre> </div> <div class="section level3"> <h3 id="hardware-info">Hardware info<a class="anchor" aria-label="anchor" href="#hardware-info"></a> diff --git a/docs/dev/articles/twa.html b/docs/dev/articles/twa.html index 1dea5c51..3118a862 100644 --- a/docs/dev/articles/twa.html +++ b/docs/dev/articles/twa.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 18 September 2019 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/twa.rmd" class="external-link"><code>vignettes/twa.rmd</code></a></small> <div class="d-none name"><code>twa.rmd</code></div> diff --git a/docs/dev/articles/web_only/FOCUS_Z.html b/docs/dev/articles/web_only/FOCUS_Z.html index 40ce9e01..9db2cf7e 100644 --- a/docs/dev/articles/web_only/FOCUS_Z.html +++ b/docs/dev/articles/web_only/FOCUS_Z.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 16 January 2018 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/web_only/FOCUS_Z.rmd" class="external-link"><code>vignettes/web_only/FOCUS_Z.rmd</code></a></small> <div class="d-none name"><code>FOCUS_Z.rmd</code></div> diff --git a/docs/dev/articles/web_only/NAFTA_examples.html b/docs/dev/articles/web_only/NAFTA_examples.html index 6bf39b2c..54c45b3e 100644 --- a/docs/dev/articles/web_only/NAFTA_examples.html +++ b/docs/dev/articles/web_only/NAFTA_examples.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">26 February 2019 (rebuilt -2025-02-14)</h4> +2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/web_only/NAFTA_examples.rmd" class="external-link"><code>vignettes/web_only/NAFTA_examples.rmd</code></a></small> <div class="d-none name"><code>NAFTA_examples.rmd</code></div> diff --git a/docs/dev/articles/web_only/benchmarks.html b/docs/dev/articles/web_only/benchmarks.html index bd6a443a..bb5647d3 100644 --- a/docs/dev/articles/web_only/benchmarks.html +++ b/docs/dev/articles/web_only/benchmarks.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 17 February 2023 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/web_only/benchmarks.rmd" class="external-link"><code>vignettes/web_only/benchmarks.rmd</code></a></small> <div class="d-none name"><code>benchmarks.rmd</code></div> @@ -428,8 +428,8 @@ models fitted to two datasets, i.e. eight fits for each test.</p> <td align="left">Ryzen 9 7950X</td> <td align="left">4.4.2</td> <td align="left">1.2.10</td> -<td align="right">1.371</td> -<td align="right">1.980</td> +<td align="right">1.407</td> +<td align="right">1.990</td> </tr> </tbody> </table> @@ -717,9 +717,9 @@ for each test.</p> <td align="left">Ryzen 9 7950X</td> <td align="left">4.4.2</td> <td align="left">1.2.10</td> -<td align="right">0.762</td> -<td align="right">2.179</td> -<td align="right">1.131</td> +<td align="right">0.775</td> +<td align="right">2.199</td> +<td align="right">1.161</td> </tr> </tbody> </table> @@ -1097,12 +1097,12 @@ dataset, i.e. one fit for each test.</p> <td align="left">Ryzen 9 7950X</td> <td align="left">4.4.2</td> <td align="left">1.2.10</td> -<td align="right">0.426</td> -<td align="right">0.533</td> -<td align="right">0.565</td> -<td align="right">1.296</td> -<td align="right">0.728</td> -<td align="right">0.978</td> +<td align="right">0.433</td> +<td align="right">0.541</td> +<td align="right">0.576</td> +<td align="right">1.307</td> +<td align="right">0.744</td> +<td align="right">0.988</td> </tr> </tbody> </table> diff --git a/docs/dev/articles/web_only/compiled_models.html b/docs/dev/articles/web_only/compiled_models.html index 113f7b67..a88a19ee 100644 --- a/docs/dev/articles/web_only/compiled_models.html +++ b/docs/dev/articles/web_only/compiled_models.html @@ -84,7 +84,7 @@ <h4 data-toc-skip class="author">Johannes Ranke</h4> - <h4 data-toc-skip class="date">2025-02-14</h4> + <h4 data-toc-skip class="date">2025-02-16</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/web_only/compiled_models.rmd" class="external-link"><code>vignettes/web_only/compiled_models.rmd</code></a></small> <div class="d-none name"><code>compiled_models.rmd</code></div> @@ -162,10 +162,10 @@ solution is also implemented, which is included in the tests below.</p> <span> <span class="fu"><a href="https://rdrr.io/r/base/print.html" class="external-link">print</a></span><span class="op">(</span><span class="st">"R package rbenchmark is not available"</span><span class="op">)</span></span> <span><span class="op">}</span></span></code></pre></div> <pre><code><span><span class="co">## test replications relative elapsed</span></span> -<span><span class="co">## 4 analytical 1 1.000 0.102</span></span> -<span><span class="co">## 3 deSolve, compiled 1 1.324 0.135</span></span> -<span><span class="co">## 2 Eigenvalue based 1 1.706 0.174</span></span> -<span><span class="co">## 1 deSolve, not compiled 1 22.627 2.308</span></span></code></pre> +<span><span class="co">## 4 analytical 1 1.000 0.115</span></span> +<span><span class="co">## 3 deSolve, compiled 1 1.217 0.140</span></span> +<span><span class="co">## 2 Eigenvalue based 1 1.652 0.190</span></span> +<span><span class="co">## 1 deSolve, not compiled 1 20.522 2.360</span></span></code></pre> <p>We see that using the compiled model is by more than a factor of 10 faster than using deSolve without compiled code.</p> </div> @@ -196,8 +196,8 @@ compiled code is available.</p> <span><span class="op">}</span></span></code></pre></div> <pre><code><span><span class="co">## Temporary DLL for differentials generated and loaded</span></span></code></pre> <pre><code><span><span class="co">## test replications relative elapsed</span></span> -<span><span class="co">## 2 deSolve, compiled 1 1.000 0.170</span></span> -<span><span class="co">## 1 deSolve, not compiled 1 23.865 4.057</span></span></code></pre> +<span><span class="co">## 2 deSolve, compiled 1 1.000 0.180</span></span> +<span><span class="co">## 1 deSolve, not compiled 1 23.656 4.258</span></span></code></pre> <p>Here we get a performance benefit of a factor of 24 using the version of the differential equation model compiled from C code!</p> <p>This vignette was built with mkin 1.2.10 on</p> diff --git a/docs/dev/articles/web_only/dimethenamid_2018.html b/docs/dev/articles/web_only/dimethenamid_2018.html index 572f253d..0bbf0b73 100644 --- a/docs/dev/articles/web_only/dimethenamid_2018.html +++ b/docs/dev/articles/web_only/dimethenamid_2018.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 1 July 2022, -built on 14 Feb 2025</h4> +built on 16 Feb 2025</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/web_only/dimethenamid_2018.rmd" class="external-link"><code>vignettes/web_only/dimethenamid_2018.rmd</code></a></small> <div class="d-none name"><code>dimethenamid_2018.rmd</code></div> @@ -586,7 +586,7 @@ attached base packages: [1] stats graphics grDevices utils datasets methods base other attached packages: -[1] saemix_3.3 npde_3.5 nlme_3.1-166 mkin_1.2.10 knitr_1.49 +[1] nlme_3.1-166 mkin_1.2.10 knitr_1.49 loaded via a namespace (and not attached): [1] gtable_0.3.6 jsonlite_1.8.9 dplyr_1.1.4 compiler_4.4.2 @@ -598,10 +598,10 @@ loaded via a namespace (and not attached): [25] pillar_1.9.0 rlang_1.1.4 utf8_1.2.4 cachem_1.1.0 [29] xfun_0.49 fs_1.6.5 sass_0.4.9 cli_3.6.3 [33] pkgdown_2.1.1 magrittr_2.0.3 digest_0.6.37 grid_4.4.2 -[37] mclust_6.1.1 lifecycle_1.0.4 vctrs_0.6.5 evaluate_1.0.1 -[41] glue_1.8.0 codetools_0.2-20 ragg_1.3.3 zoo_1.8-12 -[45] fansi_1.0.6 colorspace_2.1-1 rmarkdown_2.29 pkgconfig_2.0.3 -[49] tools_4.4.2 htmltools_0.5.8.1</code></pre> +[37] npde_3.5 mclust_6.1.1 lifecycle_1.0.4 vctrs_0.6.5 +[41] evaluate_1.0.1 glue_1.8.0 ragg_1.3.3 zoo_1.8-12 +[45] saemix_3.3 fansi_1.0.6 colorspace_2.1-1 rmarkdown_2.29 +[49] pkgconfig_2.0.3 tools_4.4.2 htmltools_0.5.8.1</code></pre> </div> <div class="section level2"> <h2 id="references">References<a class="anchor" aria-label="anchor" href="#references"></a> diff --git a/docs/dev/articles/web_only/multistart.html b/docs/dev/articles/web_only/multistart.html index 83073979..39bb2947 100644 --- a/docs/dev/articles/web_only/multistart.html +++ b/docs/dev/articles/web_only/multistart.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 20 April 2023 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/web_only/multistart.rmd" class="external-link"><code>vignettes/web_only/multistart.rmd</code></a></small> <div class="d-none name"><code>multistart.rmd</code></div> diff --git a/docs/dev/articles/web_only/saem_benchmarks.html b/docs/dev/articles/web_only/saem_benchmarks.html index d4cd0d6f..b76384da 100644 --- a/docs/dev/articles/web_only/saem_benchmarks.html +++ b/docs/dev/articles/web_only/saem_benchmarks.html @@ -85,7 +85,7 @@ Ranke</h4> <h4 data-toc-skip class="date">Last change 17 February 2023 -(rebuilt 2025-02-14)</h4> +(rebuilt 2025-02-16)</h4> <small class="dont-index">Source: <a href="https://github.com/jranke/mkin/blob/HEAD/vignettes/web_only/saem_benchmarks.rmd" class="external-link"><code>vignettes/web_only/saem_benchmarks.rmd</code></a></small> <div class="d-none name"><code>saem_benchmarks.rmd</code></div> @@ -408,9 +408,9 @@ systems. All trademarks belong to their respective owners.</p> <td align="left">1.2.10</td> <td align="left">3.3</td> <td align="right">1.115</td> -<td align="right">2.277</td> -<td align="right">1.945</td> -<td align="right">2.134</td> +<td align="right">2.263</td> +<td align="right">1.991</td> +<td align="right">2.193</td> </tr> </tbody> </table> @@ -542,10 +542,10 @@ systems. All trademarks belong to their respective owners.</p> <td align="left">Linux</td> <td align="left">1.2.10</td> <td align="left">3.3</td> -<td align="right">2.372</td> -<td align="right">3.137</td> -<td align="right">3.100</td> -<td align="right">3.281</td> +<td align="right">2.380</td> +<td align="right">3.147</td> +<td align="right">3.131</td> +<td align="right">3.331</td> </tr> </tbody> </table> @@ -657,8 +657,8 @@ systems. All trademarks belong to their respective owners.</p> <td align="left">Linux</td> <td align="left">1.2.10</td> <td align="left">3.3</td> -<td align="right">11.590</td> -<td align="right">279.782</td> +<td align="right">11.581</td> +<td align="right">296.184</td> </tr> </tbody> </table> @@ -758,7 +758,7 @@ systems. All trademarks belong to their respective owners.</p> <td align="left">Linux</td> <td align="left">1.2.10</td> <td align="left">3.3</td> -<td align="right">469.036</td> +<td align="right">486.856</td> </tr> </tbody> </table> |