diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2023-05-19 17:08:43 +0200 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2023-05-19 17:10:16 +0200 |
commit | cf54ccca37d27480dbf8d59eb027300518f7ad75 (patch) | |
tree | 81a9d5955f716a74822ecb65dc83daeeb7efbba6 /docs/reference/mmkin.html | |
parent | c931057ce8f05d3a0dfefea72b73903efb82e900 (diff) |
Prepare release of v1.2.4v1.2.4
- Update DESCRIPTION
- Update Makefile to document how to use R-patched
- Remove markup from two URLs to avoid CRAN NOTE
- Switch two vignettes from html_document to html_vignette to save space
in the docs directory, also avoiding a CRAN NOTE
- Complete rebuild of pkgdown docs for release
Diffstat (limited to 'docs/reference/mmkin.html')
-rw-r--r-- | docs/reference/mmkin.html | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/docs/reference/mmkin.html b/docs/reference/mmkin.html index 6c09f0de..e09dc469 100644 --- a/docs/reference/mmkin.html +++ b/docs/reference/mmkin.html @@ -20,7 +20,7 @@ datasets specified in its first two arguments."><!-- mathjax --><script src="htt </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.3</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.2.4</span> </span> </div> @@ -206,21 +206,21 @@ plotting.</p></div> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="va">time_default</span></span></span> <span class="r-out co"><span class="r-pr">#></span> user system elapsed </span> -<span class="r-out co"><span class="r-pr">#></span> 1.596 0.611 0.715 </span> +<span class="r-out co"><span class="r-pr">#></span> 1.502 0.665 0.624 </span> <span class="r-in"><span><span class="va">time_1</span></span></span> <span class="r-out co"><span class="r-pr">#></span> user system elapsed </span> -<span class="r-out co"><span class="r-pr">#></span> 2.060 0.016 2.076 </span> +<span class="r-out co"><span class="r-pr">#></span> 1.824 0.028 1.852 </span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="fu"><a href="endpoints.html">endpoints</a></span><span class="op">(</span><span class="va">fits.0</span><span class="op">[[</span><span class="st">"SFO_lin"</span>, <span class="fl">2</span><span class="op">]</span><span class="op">]</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> $ff</span> <span class="r-out co"><span class="r-pr">#></span> parent_M1 parent_sink M1_M2 M1_sink </span> -<span class="r-out co"><span class="r-pr">#></span> 0.7340481 0.2659519 0.7505683 0.2494317 </span> +<span class="r-out co"><span class="r-pr">#></span> 0.7340481 0.2659519 0.7505690 0.2494310 </span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-out co"><span class="r-pr">#></span> $distimes</span> -<span class="r-out co"><span class="r-pr">#></span> DT50 DT90</span> -<span class="r-out co"><span class="r-pr">#></span> parent 0.877769 2.915885</span> -<span class="r-out co"><span class="r-pr">#></span> M1 2.325744 7.725956</span> -<span class="r-out co"><span class="r-pr">#></span> M2 33.720100 112.015749</span> +<span class="r-out co"><span class="r-pr">#></span> DT50 DT90</span> +<span class="r-out co"><span class="r-pr">#></span> parent 0.8777689 2.915885</span> +<span class="r-out co"><span class="r-pr">#></span> M1 2.3257403 7.725942</span> +<span class="r-out co"><span class="r-pr">#></span> M2 33.7201060 112.015767</span> <span class="r-out co"><span class="r-pr">#></span> </span> <span class="r-in"><span></span></span> <span class="r-in"><span><span class="co"># plot.mkinfit handles rows or columns of mmkin result objects</span></span></span> @@ -252,9 +252,11 @@ plotting.</p></div> <span class="r-out co"><span class="r-pr">#></span> dataset</span> <span class="r-out co"><span class="r-pr">#></span> model A B C D </span> <span class="r-out co"><span class="r-pr">#></span> SFO OK OK OK OK</span> -<span class="r-out co"><span class="r-pr">#></span> FOMC OK OK OK OK</span> +<span class="r-out co"><span class="r-pr">#></span> FOMC C OK OK OK</span> <span class="r-out co"><span class="r-pr">#></span> DFOP OK OK OK OK</span> <span class="r-out co"><span class="r-pr">#></span> </span> +<span class="r-out co"><span class="r-pr">#></span> C: Optimisation did not converge:</span> +<span class="r-out co"><span class="r-pr">#></span> false convergence (8)</span> <span class="r-out co"><span class="r-pr">#></span> OK: No warnings</span> <span class="r-in"><span><span class="co"># We get false convergence for the FOMC fit to FOCUS_2006_A because this</span></span></span> <span class="r-in"><span><span class="co"># dataset is really SFO, and the FOMC fit is overparameterised</span></span></span> |