diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2023-02-17 22:48:18 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2023-02-17 22:48:18 +0100 |
commit | bcd98a1fa3cd2fb4b7105b7ec6c129ca18f872e8 (patch) | |
tree | 80ce30d68fb33fe92a0939e1f5be9790263909c1 /docs/dev/articles | |
parent | 5811ab93d856bb339a35eef2d23266fcb781cbe7 (diff) |
Update online docs, fix bug that surfaced
Diffstat (limited to 'docs/dev/articles')
-rw-r--r-- | docs/dev/articles/index.html | 2 | ||||
-rw-r--r-- | docs/dev/articles/prebuilt/2022_cyan_pathway.html | 116 | ||||
-rw-r--r-- | docs/dev/articles/prebuilt/2022_dmta_parent.html | 41 | ||||
-rw-r--r-- | docs/dev/articles/prebuilt/2022_dmta_pathway.html | 41 | ||||
-rw-r--r-- | docs/dev/articles/web_only/benchmarks.html | 173 | ||||
-rw-r--r-- | docs/dev/articles/web_only/saem_benchmarks.html | 140 |
6 files changed, 375 insertions, 138 deletions
diff --git a/docs/dev/articles/index.html b/docs/dev/articles/index.html index b9571a60..2aacc53a 100644 --- a/docs/dev/articles/index.html +++ b/docs/dev/articles/index.html @@ -17,7 +17,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.2</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.3</span> </span> </div> diff --git a/docs/dev/articles/prebuilt/2022_cyan_pathway.html b/docs/dev/articles/prebuilt/2022_cyan_pathway.html index 87d4ca4a..1095dd28 100644 --- a/docs/dev/articles/prebuilt/2022_cyan_pathway.html +++ b/docs/dev/articles/prebuilt/2022_cyan_pathway.html @@ -34,14 +34,14 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.2</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.3</span> </span> </div> <div id="navbar" class="navbar-collapse collapse"> <ul class="nav navbar-nav"> <li> - <a href="../../reference/index.html">Functions and data</a> + <a href="../../reference/index.html">Reference</a> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false"> @@ -53,6 +53,9 @@ <li> <a href="../../articles/mkin.html">Introduction to mkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Example evaluations with (generalised) nonlinear least squares</li> <li> <a href="../../articles/FOCUS_D.html">Example evaluation of FOCUS Example Dataset D</a> </li> @@ -60,22 +63,31 @@ <a href="../../articles/FOCUS_L.html">Example evaluation of FOCUS Laboratory Data L1 to L3</a> </li> <li> - <a href="../../articles/web_only/dimethenamid_2018.html">Example evaluations of dimethenamid data from 2018 with nonlinear mixed-effects models</a> + <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> + </li> + <li class="divider"> </li> +<li class="dropdown-header">Example evaluations with hierarchical models (nonlinear mixed-effects models)</li> <li> - <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + <a href="../../articles/prebuilt/2022_dmta_parent.html">Testing hierarchical parent degradation kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> + <a href="../../articles/prebuilt/2022_dmta_pathway.html">Testing hierarchical pathway kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> + <a href="../../articles/prebuilt/2022_cyan_pathway.html">Testing hierarchical pathway kinetics with residue data on cyantraniliprole</a> </li> <li> - <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + <a href="../../articles/web_only/dimethenamid_2018.html">Comparison of saemix and nlme evaluations of dimethenamid data from 2018</a> </li> <li> - <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + </li> + <li class="divider"> + </li> +<li class="dropdown-header">Performance</li> + <li> + <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> </li> <li> <a href="../../articles/web_only/benchmarks.html">Benchmark timings for mkin</a> @@ -83,6 +95,15 @@ <li> <a href="../../articles/web_only/saem_benchmarks.html">Benchmark timings for saem.mmkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Miscellaneous</li> + <li> + <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + </li> + <li> + <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + </li> </ul> </li> <li> @@ -115,7 +136,7 @@ residue data on cyantraniliprole</h1> Ranke</h4> <h4 data-toc-skip class="date">Last change on 6 January -2023, last compiled on 28 Januar 2023</h4> +2023, last compiled on 17 Februar 2023</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="hidden name"><code>2022_cyan_pathway.rmd</code></div> @@ -135,7 +156,7 @@ be fitted with the mkin package.</p> 173340 (Application of nonlinear hierarchical models to the kinetic evaluation of chemical degradation data) of the German Environment Agency carried out in 2022 and 2023.</p> -<p>The mkin package is used in version 1.2.2 which is currently under +<p>The mkin package is used in version 1.2.3 which is currently under development. The newly introduced functionality that is used here is a simplification of excluding random effects for a set of fits based on a related set of fits with a reduced model, and the documentation of the @@ -2185,7 +2206,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:07:38 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - k_cyan * cyan @@ -2313,7 +2334,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:08:17 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - k_cyan * cyan @@ -2443,7 +2464,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:09:12 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -2588,7 +2609,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:09:18 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -2726,7 +2747,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:10:30 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -2872,7 +2893,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:16:28 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -3018,7 +3039,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:10:49 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -3183,7 +3204,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:17:00 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -3348,7 +3369,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:11:04 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ifelse(time <= tb, k1, k2) * cyan @@ -3490,7 +3511,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:11:24 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ifelse(time <= tb, k1, k2) * cyan @@ -3638,7 +3659,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:34:28 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -3802,7 +3823,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:37:36 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -3948,7 +3969,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:38:34 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -4139,7 +4160,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:45:32 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -4330,7 +4351,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:38:37 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -4526,7 +4547,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 10:46:02 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -4727,7 +4748,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 11:18:41 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - (alpha/beta) * 1/((time/beta) + 1) * cyan @@ -4870,7 +4891,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 11:16:32 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -5036,7 +5057,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 11:22:28 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -5202,7 +5223,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 11:17:37 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -5373,7 +5394,7 @@ saemix version used for fitting: 3.2 mkin version used for pre-fitting: 1.2.2 R version used for fitting: 4.2.2 Date of fit: Sat Jan 28 11:21:01 2023 -Date of summary: Sat Jan 28 11:22:29 2023 +Date of summary: Fri Feb 17 22:24:33 2023 Equations: d_cyan_free/dt = - k_cyan_free * cyan_free - k_cyan_free_bound * @@ -5561,26 +5582,23 @@ attached base packages: [8] base other attached packages: -[1] saemix_3.2 npde_3.3 knitr_1.41 mkin_1.2.2 +[1] saemix_3.2 npde_3.3 knitr_1.41 mkin_1.2.3 loaded via a namespace (and not attached): - [1] mclust_6.0.0 lattice_0.20-45 prettyunits_1.1.1 ps_1.7.2 - [5] zoo_1.8-11 assertthat_0.2.1 rprojroot_2.0.3 digest_0.6.31 - [9] lmtest_0.9-40 utf8_1.2.2 R6_2.5.1 cellranger_1.1.0 -[13] evaluate_0.19 ggplot2_3.4.0 highr_0.9 pillar_1.8.1 -[17] rlang_1.0.6 readxl_1.4.1 callr_3.7.3 jquerylib_0.1.4 -[21] rmarkdown_2.19 pkgdown_2.0.7 textshaping_0.3.6 desc_1.4.2 -[25] stringr_1.5.0 munsell_0.5.0 compiler_4.2.2 xfun_0.35 -[29] pkgconfig_2.0.3 systemfonts_1.0.4 pkgbuild_1.4.0 htmltools_0.5.4 -[33] tidyselect_1.2.0 tibble_3.1.8 gridExtra_2.3 codetools_0.2-18 -[37] fansi_1.0.3 crayon_1.5.2 dplyr_1.0.10 grid_4.2.2 -[41] nlme_3.1-161 jsonlite_1.8.4 gtable_0.3.1 lifecycle_1.0.3 -[45] DBI_1.1.3 magrittr_2.0.3 scales_1.2.1 cli_3.5.0 -[49] stringi_1.7.8 cachem_1.0.6 fs_1.5.2 bslib_0.4.2 -[53] ragg_1.2.4 generics_0.1.3 vctrs_0.5.1 deSolve_1.34 -[57] tools_4.2.2 glue_1.6.2 purrr_1.0.0 processx_3.8.0 -[61] fastmap_1.1.0 yaml_2.3.6 inline_0.3.19 colorspace_2.0-3 -[65] memoise_2.0.1 sass_0.4.4 </code></pre> + [1] pillar_1.8.1 bslib_0.4.2 compiler_4.2.2 jquerylib_0.1.4 + [5] tools_4.2.2 mclust_6.0.0 digest_0.6.31 tibble_3.1.8 + [9] jsonlite_1.8.4 evaluate_0.19 memoise_2.0.1 lifecycle_1.0.3 +[13] nlme_3.1-162 gtable_0.3.1 lattice_0.20-45 pkgconfig_2.0.3 +[17] rlang_1.0.6 DBI_1.1.3 cli_3.5.0 yaml_2.3.6 +[21] pkgdown_2.0.7 xfun_0.35 fastmap_1.1.0 gridExtra_2.3 +[25] dplyr_1.0.10 stringr_1.5.0 generics_0.1.3 desc_1.4.2 +[29] fs_1.5.2 vctrs_0.5.1 sass_0.4.4 systemfonts_1.0.4 +[33] tidyselect_1.2.0 rprojroot_2.0.3 lmtest_0.9-40 grid_4.2.2 +[37] inline_0.3.19 glue_1.6.2 R6_2.5.1 textshaping_0.3.6 +[41] fansi_1.0.3 rmarkdown_2.19 purrr_1.0.0 ggplot2_3.4.0 +[45] magrittr_2.0.3 scales_1.2.1 htmltools_0.5.4 assertthat_0.2.1 +[49] colorspace_2.0-3 ragg_1.2.4 utf8_1.2.2 stringi_1.7.8 +[53] munsell_0.5.0 cachem_1.0.6 zoo_1.8-11 </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 89c9bfd8..2ff966b4 100644 --- a/docs/dev/articles/prebuilt/2022_dmta_parent.html +++ b/docs/dev/articles/prebuilt/2022_dmta_parent.html @@ -34,14 +34,14 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.2</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.3</span> </span> </div> <div id="navbar" class="navbar-collapse collapse"> <ul class="nav navbar-nav"> <li> - <a href="../../reference/index.html">Functions and data</a> + <a href="../../reference/index.html">Reference</a> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false"> @@ -53,6 +53,9 @@ <li> <a href="../../articles/mkin.html">Introduction to mkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Example evaluations with (generalised) nonlinear least squares</li> <li> <a href="../../articles/FOCUS_D.html">Example evaluation of FOCUS Example Dataset D</a> </li> @@ -60,22 +63,31 @@ <a href="../../articles/FOCUS_L.html">Example evaluation of FOCUS Laboratory Data L1 to L3</a> </li> <li> - <a href="../../articles/web_only/dimethenamid_2018.html">Example evaluations of dimethenamid data from 2018 with nonlinear mixed-effects models</a> + <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> + </li> + <li class="divider"> </li> +<li class="dropdown-header">Example evaluations with hierarchical models (nonlinear mixed-effects models)</li> <li> - <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + <a href="../../articles/prebuilt/2022_dmta_parent.html">Testing hierarchical parent degradation kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> + <a href="../../articles/prebuilt/2022_dmta_pathway.html">Testing hierarchical pathway kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> + <a href="../../articles/prebuilt/2022_cyan_pathway.html">Testing hierarchical pathway kinetics with residue data on cyantraniliprole</a> </li> <li> - <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + <a href="../../articles/web_only/dimethenamid_2018.html">Comparison of saemix and nlme evaluations of dimethenamid data from 2018</a> </li> <li> - <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + </li> + <li class="divider"> + </li> +<li class="dropdown-header">Performance</li> + <li> + <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> </li> <li> <a href="../../articles/web_only/benchmarks.html">Benchmark timings for mkin</a> @@ -83,6 +95,15 @@ <li> <a href="../../articles/web_only/saem_benchmarks.html">Benchmark timings for saem.mmkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Miscellaneous</li> + <li> + <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + </li> + <li> + <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + </li> </ul> </li> <li> @@ -115,7 +136,7 @@ with residue data on dimethenamid and dimethenamid-P</h1> Ranke</h4> <h4 data-toc-skip class="date">Last change on 5 January -2023, last compiled on 28 Januar 2023</h4> +2023, last compiled on 17 Februar 2023</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="hidden name"><code>2022_dmta_parent.rmd</code></div> @@ -134,7 +155,7 @@ FOMC, DFOP and HS can be fitted with the mkin package.</p> 173340 (Application of nonlinear hierarchical models to the kinetic evaluation of chemical degradation data) of the German Environment Agency carried out in 2022 and 2023.</p> -<p>The mkin package is used in version 1.2.2. It contains the test data +<p>The mkin package is used in version 1.2.3. It contains the test data and the functions used in the evaluations. The <code>saemix</code> package is used as a backend for fitting the NLHM, but is also loaded to make the convergence plot function available.</p> diff --git a/docs/dev/articles/prebuilt/2022_dmta_pathway.html b/docs/dev/articles/prebuilt/2022_dmta_pathway.html index 2e89fb9d..4a6f224e 100644 --- a/docs/dev/articles/prebuilt/2022_dmta_pathway.html +++ b/docs/dev/articles/prebuilt/2022_dmta_pathway.html @@ -34,14 +34,14 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.2</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.3</span> </span> </div> <div id="navbar" class="navbar-collapse collapse"> <ul class="nav navbar-nav"> <li> - <a href="../../reference/index.html">Functions and data</a> + <a href="../../reference/index.html">Reference</a> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false"> @@ -53,6 +53,9 @@ <li> <a href="../../articles/mkin.html">Introduction to mkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Example evaluations with (generalised) nonlinear least squares</li> <li> <a href="../../articles/FOCUS_D.html">Example evaluation of FOCUS Example Dataset D</a> </li> @@ -60,22 +63,31 @@ <a href="../../articles/FOCUS_L.html">Example evaluation of FOCUS Laboratory Data L1 to L3</a> </li> <li> - <a href="../../articles/web_only/dimethenamid_2018.html">Example evaluations of dimethenamid data from 2018 with nonlinear mixed-effects models</a> + <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> + </li> + <li class="divider"> </li> +<li class="dropdown-header">Example evaluations with hierarchical models (nonlinear mixed-effects models)</li> <li> - <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + <a href="../../articles/prebuilt/2022_dmta_parent.html">Testing hierarchical parent degradation kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> + <a href="../../articles/prebuilt/2022_dmta_pathway.html">Testing hierarchical pathway kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> + <a href="../../articles/prebuilt/2022_cyan_pathway.html">Testing hierarchical pathway kinetics with residue data on cyantraniliprole</a> </li> <li> - <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + <a href="../../articles/web_only/dimethenamid_2018.html">Comparison of saemix and nlme evaluations of dimethenamid data from 2018</a> </li> <li> - <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + </li> + <li class="divider"> + </li> +<li class="dropdown-header">Performance</li> + <li> + <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> </li> <li> <a href="../../articles/web_only/benchmarks.html">Benchmark timings for mkin</a> @@ -83,6 +95,15 @@ <li> <a href="../../articles/web_only/saem_benchmarks.html">Benchmark timings for saem.mmkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Miscellaneous</li> + <li> + <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + </li> + <li> + <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + </li> </ul> </li> <li> @@ -115,7 +136,7 @@ residue data on dimethenamid and dimethenamid-P</h1> Ranke</h4> <h4 data-toc-skip class="date">Last change on 8 January -2023, last compiled on 28 Januar 2023</h4> +2023, last compiled on 17 Februar 2023</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="hidden name"><code>2022_dmta_pathway.rmd</code></div> @@ -135,7 +156,7 @@ can be fitted with the mkin package.</p> 173340 (Application of nonlinear hierarchical models to the kinetic evaluation of chemical degradation data) of the German Environment Agency carried out in 2022 and 2023.</p> -<p>The mkin package is used in version 1.2.2, which is currently under +<p>The mkin package is used in version 1.2.3, which is currently under development. It contains the test data, and the functions used in the evaluations. The <code>saemix</code> package is used as a backend for fitting the NLHM, but is also loaded to make the convergence plot diff --git a/docs/dev/articles/web_only/benchmarks.html b/docs/dev/articles/web_only/benchmarks.html index b37ac926..a2d9f7e8 100644 --- a/docs/dev/articles/web_only/benchmarks.html +++ b/docs/dev/articles/web_only/benchmarks.html @@ -34,14 +34,14 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.2</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.3</span> </span> </div> <div id="navbar" class="navbar-collapse collapse"> <ul class="nav navbar-nav"> <li> - <a href="../../reference/index.html">Functions and data</a> + <a href="../../reference/index.html">Reference</a> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false"> @@ -53,6 +53,9 @@ <li> <a href="../../articles/mkin.html">Introduction to mkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Example evaluations with (generalised) nonlinear least squares</li> <li> <a href="../../articles/FOCUS_D.html">Example evaluation of FOCUS Example Dataset D</a> </li> @@ -60,22 +63,31 @@ <a href="../../articles/FOCUS_L.html">Example evaluation of FOCUS Laboratory Data L1 to L3</a> </li> <li> - <a href="../../articles/web_only/dimethenamid_2018.html">Example evaluations of dimethenamid data from 2018 with nonlinear mixed-effects models</a> + <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Example evaluations with hierarchical models (nonlinear mixed-effects models)</li> <li> - <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + <a href="../../articles/prebuilt/2022_dmta_parent.html">Testing hierarchical parent degradation kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> + <a href="../../articles/prebuilt/2022_dmta_pathway.html">Testing hierarchical pathway kinetics with residue data on dimethenamid and dimethenamid-P</a> </li> <li> - <a href="../../articles/web_only/FOCUS_Z.html">Example evaluation of FOCUS Example Dataset Z</a> + <a href="../../articles/prebuilt/2022_cyan_pathway.html">Testing hierarchical pathway kinetics with residue data on cyantraniliprole</a> </li> <li> - <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + <a href="../../articles/web_only/dimethenamid_2018.html">Comparison of saemix and nlme evaluations of dimethenamid data from 2018</a> </li> <li> - <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + <a href="../../articles/web_only/multistart.html">Short demo of the multistart method</a> + </li> + <li class="divider"> + </li> +<li class="dropdown-header">Performance</li> + <li> + <a href="../../articles/web_only/compiled_models.html">Performance benefit by using compiled model definitions in mkin</a> </li> <li> <a href="../../articles/web_only/benchmarks.html">Benchmark timings for mkin</a> @@ -83,6 +95,15 @@ <li> <a href="../../articles/web_only/saem_benchmarks.html">Benchmark timings for saem.mmkin</a> </li> + <li class="divider"> + </li> +<li class="dropdown-header">Miscellaneous</li> + <li> + <a href="../../articles/twa.html">Calculation of time weighted average concentrations with mkin</a> + </li> + <li> + <a href="../../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> + </li> </ul> </li> <li> @@ -106,13 +127,15 @@ - </header><script src="benchmarks_files/accessible-code-block-0.0.1/empty-anchor.js"></script><div class="row"> + </header><div class="row"> <div class="col-md-9 contents"> <div class="page-header toc-ignore"> <h1 data-toc-skip>Benchmark timings for mkin</h1> - <h4 data-toc-skip class="author">Johannes Ranke</h4> + <h4 data-toc-skip class="author">Johannes +Ranke</h4> - <h4 data-toc-skip class="date">Last change 14 July 2022 (rebuilt 2022-11-24)</h4> + <h4 data-toc-skip class="date">Last change 17 February 2023 +(rebuilt 2023-02-17)</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="hidden name"><code>benchmarks.rmd</code></div> @@ -121,9 +144,15 @@ -<p>Each system is characterized by the operating system type, the CPU type, the mkin version, and, as in June 2022 the current R version lead to worse performance, the R version. A compiler was available, so if no analytical solution was available, compiled ODE models are used.</p> -<p>Every fit is only performed once, so the accuracy of the benchmarks is limited.</p> -<p>The following wrapper function for <code>mmkin</code> is used because the way the error model is specified was changed in mkin version 0.9.49.1.</p> +<p>Each system is characterized by the operating system type, the CPU +type, the mkin version, and, as in June 2022 the current R version lead +to worse performance, the R version. A compiler was available, so if no +analytical solution was available, compiled ODE models are used.</p> +<p>Every fit is only performed once, so the accuracy of the benchmarks +is limited.</p> +<p>The following wrapper function for <code>mmkin</code> is used because +the way the error model is specified was changed in mkin version +0.9.49.1.</p> <div class="sourceCode" id="cb1"><pre class="downlit sourceCode r"> <code class="sourceCode R"><span><span class="kw">if</span> <span class="op">(</span><span class="fu"><a href="https://rdrr.io/r/utils/packageDescription.html" class="external-link">packageVersion</a></span><span class="op">(</span><span class="st">"mkin"</span><span class="op">)</span> <span class="op">></span> <span class="st">"0.9.48.1"</span><span class="op">)</span> <span class="op">{</span></span> <span> <span class="va">mmkin_bench</span> <span class="op"><-</span> <span class="kw">function</span><span class="op">(</span><span class="va">models</span>, <span class="va">datasets</span>, <span class="va">error_model</span> <span class="op">=</span> <span class="st">"const"</span><span class="op">)</span> <span class="op">{</span></span> @@ -195,11 +224,14 @@ <div class="section level2"> <h2 id="results">Results<a class="anchor" aria-label="anchor" href="#results"></a> </h2> -<p>Benchmarks for all available error models are shown. They are intended for improving mkin, not for comparing CPUs or operating systems. All trademarks belong to their respective owners.</p> +<p>Benchmarks for all available error models are shown. They are +intended for improving mkin, not for comparing CPUs or operating +systems. All trademarks belong to their respective owners.</p> <div class="section level3"> <h3 id="parent-only">Parent only<a class="anchor" aria-label="anchor" href="#parent-only"></a> </h3> -<p>Constant variance (t1) and two-component error model (t2) for four models fitted to two datasets, i.e. eight fits for each test.</p> +<p>Constant variance (t1) and two-component error model (t2) for four +models fitted to two datasets, i.e. eight fits for each test.</p> <table class="table"> <thead><tr class="header"> <th align="left">OS</th> @@ -362,13 +394,39 @@ <td align="right">2.187</td> <td align="right">3.851</td> </tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.0</td> +<td align="right">1.288</td> +<td align="right">1.794</td> +</tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.2</td> +<td align="right">1.276</td> +<td align="right">1.804</td> +</tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.3</td> +<td align="right">1.370</td> +<td align="right">1.883</td> +</tr> </tbody> </table> </div> <div class="section level3"> <h3 id="one-metabolite">One metabolite<a class="anchor" aria-label="anchor" href="#one-metabolite"></a> </h3> -<p>Constant variance (t3), two-component error model (t4), and variance by variable (t5) for three models fitted to one dataset, i.e. three fits for each test.</p> +<p>Constant variance (t3), two-component error model (t4), and variance +by variable (t5) for three models fitted to one dataset, i.e. three fits +for each test.</p> <table class="table"> <thead><tr class="header"> <th align="left">OS</th> @@ -551,14 +609,55 @@ <td align="right">6.335</td> <td align="right">3.003</td> </tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.0</td> +<td align="right">0.792</td> +<td align="right">2.378</td> +<td align="right">1.245</td> +</tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.2</td> +<td align="right">0.784</td> +<td align="right">2.355</td> +<td align="right">1.233</td> +</tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.3</td> +<td align="right">0.770</td> +<td align="right">2.011</td> +<td align="right">1.123</td> +</tr> </tbody> </table> </div> <div class="section level3"> <h3 id="two-metabolites">Two metabolites<a class="anchor" aria-label="anchor" href="#two-metabolites"></a> </h3> -<p>Constant variance (t6 and t7), two-component error model (t8 and t9), and variance by variable (t10 and t11) for one model fitted to one dataset, i.e. one fit for each test.</p> +<p>Constant variance (t6 and t7), two-component error model (t8 and t9), +and variance by variable (t10 and t11) for one model fitted to one +dataset, i.e. one fit for each test.</p> <table class="table"> +<colgroup> +<col width="8%"> +<col width="19%"> +<col width="8%"> +<col width="12%"> +<col width="8%"> +<col width="8%"> +<col width="8%"> +<col width="9%"> +<col width="8%"> +<col width="9%"> +</colgroup> <thead><tr class="header"> <th align="left">OS</th> <th align="left">CPU</th> @@ -800,6 +899,42 @@ <td align="right">1.976</td> <td align="right">3.013</td> </tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.0</td> +<td align="right">0.445</td> +<td align="right">0.591</td> +<td align="right">0.660</td> +<td align="right">1.190</td> +<td align="right">0.814</td> +<td align="right">1.100</td> +</tr> +<tr class="odd"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.2</td> +<td align="right">0.443</td> +<td align="right">0.586</td> +<td align="right">0.661</td> +<td align="right">1.176</td> +<td align="right">0.803</td> +<td align="right">1.097</td> +</tr> +<tr class="even"> +<td align="left">Linux</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">4.2.2</td> +<td align="left">1.2.3</td> +<td align="right">0.418</td> +<td align="right">0.530</td> +<td align="right">0.591</td> +<td align="right">1.006</td> +<td align="right">0.716</td> +<td align="right">0.949</td> +</tr> </tbody> </table> </div> @@ -823,7 +958,7 @@ <div class="pkgdown"> <p></p> -<p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.0.6.</p> +<p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.0.7.</p> </div> </footer> diff --git a/docs/dev/articles/web_only/saem_benchmarks.html b/docs/dev/articles/web_only/saem_benchmarks.html index 4fe648c6..551b34d4 100644 --- a/docs/dev/articles/web_only/saem_benchmarks.html +++ b/docs/dev/articles/web_only/saem_benchmarks.html @@ -34,7 +34,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../../index.html">mkin</a> - <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.2</span> + <span class="version label label-info" data-toggle="tooltip" data-placement="bottom" title="In-development version">1.2.3</span> </span> </div> @@ -134,8 +134,8 @@ <h4 data-toc-skip class="author">Johannes Ranke</h4> - <h4 data-toc-skip class="date">Last change 14 November 2022 -(rebuilt 2023-01-28)</h4> + <h4 data-toc-skip class="date">Last change 17 February 2023 +(rebuilt 2023-02-17)</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="hidden name"><code>saem_benchmarks.rmd</code></div> @@ -191,7 +191,7 @@ explanation of the following preprocessing.</p> <div class="sourceCode" id="cb4"><pre class="downlit sourceCode r"> <code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/r/stats/anova.html" class="external-link">anova</a></span><span class="op">(</span></span> <span> <span class="va">sfo_const</span>, <span class="va">dfop_const</span>, <span class="va">sforb_const</span>, <span class="va">hs_const</span>,</span> -<span> <span class="va">sfo_tc</span>, <span class="va">dfop_tc</span>, <span class="va">sforb_tc</span>, <span class="va">hs_tc</span><span class="op">)</span> <span class="op">|></span> <span class="fu">kable</span><span class="op">(</span>, digits <span class="op">=</span> <span class="fl">1</span><span class="op">)</span></span></code></pre></div> +<span> <span class="va">sfo_tc</span>, <span class="va">dfop_tc</span>, <span class="va">sforb_tc</span>, <span class="va">hs_tc</span><span class="op">)</span> <span class="op">|></span> <span class="fu"><a href="https://rdrr.io/pkg/knitr/man/kable.html" class="external-link">kable</a></span><span class="op">(</span>, digits <span class="op">=</span> <span class="fl">1</span><span class="op">)</span></span></code></pre></div> <table class="table"> <thead><tr class="header"> <th align="left"></th> @@ -331,17 +331,7 @@ systems. All trademarks belong to their respective owners.</p> <h3 id="parent-only-1">Parent only<a class="anchor" aria-label="anchor" href="#parent-only-1"></a> </h3> <p>Constant variance for SFO, DFOP, SFORB and HS.</p> -<table style="width:100%;" class="table"> -<colgroup> -<col width="42%"> -<col width="8%"> -<col width="8%"> -<col width="9%"> -<col width="8%"> -<col width="8%"> -<col width="8%"> -<col width="8%"> -</colgroup> +<table class="table"> <thead><tr class="header"> <th align="left">CPU</th> <th align="left">OS</th> @@ -374,29 +364,39 @@ systems. All trademarks belong to their respective owners.</p> <td align="right">4.851</td> </tr> <tr class="odd"> -<td align="left">Ryzen 9 7950X 16-Core Processor</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.1</td> +<td align="left">3.2</td> +<td align="right">1.352</td> +<td align="right">2.813</td> +<td align="right">2.401</td> +<td align="right">2.074</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 9 7950X</td> <td align="left">Linux</td> <td align="left">1.2.2</td> <td align="left">3.2</td> -<td align="right">1.470</td> -<td align="right">2.263</td> -<td align="right">1.840</td> -<td align="right">2.299</td> +<td align="right">1.328</td> +<td align="right">2.738</td> +<td align="right">2.336</td> +<td align="right">2.023</td> +</tr> +<tr class="odd"> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.3</td> +<td align="left">3.2</td> +<td align="right">1.118</td> +<td align="right">2.036</td> +<td align="right">2.010</td> +<td align="right">2.088</td> </tr> </tbody> </table> <p>Two-component error fits for SFO, DFOP, SFORB and HS.</p> -<table style="width:100%;" class="table"> -<colgroup> -<col width="42%"> -<col width="8%"> -<col width="8%"> -<col width="9%"> -<col width="8%"> -<col width="8%"> -<col width="8%"> -<col width="8%"> -</colgroup> +<table class="table"> <thead><tr class="header"> <th align="left">CPU</th> <th align="left">OS</th> @@ -429,14 +429,34 @@ systems. All trademarks belong to their respective owners.</p> <td align="right">8.401</td> </tr> <tr class="odd"> -<td align="left">Ryzen 9 7950X 16-Core Processor</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.1</td> +<td align="left">3.2</td> +<td align="right">2.388</td> +<td align="right">3.033</td> +<td align="right">3.532</td> +<td align="right">3.310</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 9 7950X</td> <td align="left">Linux</td> <td align="left">1.2.2</td> <td align="left">3.2</td> -<td align="right">2.118</td> -<td align="right">3.528</td> -<td align="right">3.295</td> -<td align="right">3.157</td> +<td align="right">2.341</td> +<td align="right">2.968</td> +<td align="right">3.465</td> +<td align="right">3.341</td> +</tr> +<tr class="odd"> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.3</td> +<td align="left">3.2</td> +<td align="right">2.159</td> +<td align="right">3.584</td> +<td align="right">3.307</td> +<td align="right">3.460</td> </tr> </tbody> </table> @@ -446,14 +466,6 @@ systems. All trademarks belong to their respective owners.</p> </h3> <p>Two-component error for DFOP-SFO and SFORB-SFO.</p> <table class="table"> -<colgroup> -<col width="48%"> -<col width="9%"> -<col width="9%"> -<col width="10%"> -<col width="10%"> -<col width="12%"> -</colgroup> <thead><tr class="header"> <th align="left">CPU</th> <th align="left">OS</th> @@ -480,12 +492,28 @@ systems. All trademarks belong to their respective owners.</p> <td align="right">798.580</td> </tr> <tr class="odd"> -<td align="left">Ryzen 9 7950X 16-Core Processor</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.1</td> +<td align="left">3.2</td> +<td align="right">11.247</td> +<td align="right">285.216</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 9 7950X</td> <td align="left">Linux</td> <td align="left">1.2.2</td> <td align="left">3.2</td> -<td align="right">12.336</td> -<td align="right">277.666</td> +<td align="right">11.242</td> +<td align="right">284.258</td> +</tr> +<tr class="odd"> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.3</td> +<td align="left">3.2</td> +<td align="right">11.796</td> +<td align="right">216.012</td> </tr> </tbody> </table> @@ -518,11 +546,25 @@ systems. All trademarks belong to their respective owners.</p> <td align="right">1312.445</td> </tr> <tr class="odd"> -<td align="left">Ryzen 9 7950X 16-Core Processor</td> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.1</td> +<td align="left">3.2</td> +<td align="right">489.939</td> +</tr> +<tr class="even"> +<td align="left">Ryzen 9 7950X</td> <td align="left">Linux</td> <td align="left">1.2.2</td> <td align="left">3.2</td> -<td align="right">459.051</td> +<td align="right">482.970</td> +</tr> +<tr class="odd"> +<td align="left">Ryzen 9 7950X</td> +<td align="left">Linux</td> +<td align="left">1.2.3</td> +<td align="left">3.2</td> +<td align="right">392.364</td> </tr> </tbody> </table> |