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/AIC.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/AIC.mmkin.html')
| -rw-r--r-- | docs/reference/AIC.mmkin.html | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/reference/AIC.mmkin.html b/docs/reference/AIC.mmkin.html index a53a2735..15df31b6 100644 --- a/docs/reference/AIC.mmkin.html +++ b/docs/reference/AIC.mmkin.html @@ -18,7 +18,7 @@ same dataset."><!-- mathjax --><script src="https://cdnjs.cloudflare.com/ajax/li </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> @@ -153,6 +153,8 @@ dataframe if there are several fits in the column).</p> <span class="r-in"><span> <span class="va">f</span> <span class="op"><-</span> <span class="fu"><a href="mmkin.html">mmkin</a></span><span class="op">(</span><span class="fu"><a href="https://rdrr.io/r/base/c.html" class="external-link">c</a></span><span class="op">(</span><span class="st">"SFO"</span>, <span class="st">"FOMC"</span>, <span class="st">"DFOP"</span><span class="op">)</span>,</span></span> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/r/base/list.html" class="external-link">list</a></span><span class="op">(</span><span class="st">"FOCUS A"</span> <span class="op">=</span> <span class="va">FOCUS_2006_A</span>,</span></span> <span class="r-in"><span> <span class="st">"FOCUS C"</span> <span class="op">=</span> <span class="va">FOCUS_2006_C</span><span class="op">)</span>, cores <span class="op">=</span> <span class="fl">1</span>, quiet <span class="op">=</span> <span class="cn">TRUE</span><span class="op">)</span></span></span> +<span class="r-wrn co"><span class="r-pr">#></span> <span class="warning">Warning: </span>Optimisation did not converge:</span> +<span class="r-wrn co"><span class="r-pr">#></span> false convergence (8)</span> <span class="r-in"><span> <span class="co"># We get a warning because the FOMC model does not converge for the</span></span></span> <span class="r-in"><span> <span class="co"># FOCUS A dataset, as it is well described by SFO</span></span></span> <span class="r-in"><span></span></span> @@ -166,17 +168,17 @@ dataframe if there are several fits in the column).</p> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/r/stats/AIC.html" class="external-link">AIC</a></span><span class="op">(</span><span class="va">f</span><span class="op">[</span>, <span class="st">"FOCUS A"</span><span class="op">]</span><span class="op">)</span></span></span> <span class="r-out co"><span class="r-pr">#></span> df AIC</span> <span class="r-out co"><span class="r-pr">#></span> SFO 3 55.28197</span> -<span class="r-out co"><span class="r-pr">#></span> FOMC 4 57.28222</span> +<span class="r-out co"><span class="r-pr">#></span> FOMC 4 57.28198</span> <span class="r-out co"><span class="r-pr">#></span> DFOP 5 59.28197</span> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/r/stats/AIC.html" class="external-link">AIC</a></span><span class="op">(</span><span class="va">f</span><span class="op">[</span>, <span class="st">"FOCUS A"</span><span class="op">]</span>, k <span class="op">=</span> <span class="fl">0</span><span class="op">)</span> <span class="co"># If we do not penalize additional parameters, we get nearly the same</span></span></span> <span class="r-out co"><span class="r-pr">#></span> df AIC</span> <span class="r-out co"><span class="r-pr">#></span> SFO 3 49.28197</span> -<span class="r-out co"><span class="r-pr">#></span> FOMC 4 49.28222</span> +<span class="r-out co"><span class="r-pr">#></span> FOMC 4 49.28198</span> <span class="r-out co"><span class="r-pr">#></span> DFOP 5 49.28197</span> <span class="r-in"><span> <span class="fu"><a href="https://rdrr.io/r/stats/AIC.html" class="external-link">BIC</a></span><span class="op">(</span><span class="va">f</span><span class="op">[</span>, <span class="st">"FOCUS A"</span><span class="op">]</span><span class="op">)</span> <span class="co"># Comparing the BIC gives a very similar picture</span></span></span> <span class="r-out co"><span class="r-pr">#></span> df BIC</span> <span class="r-out co"><span class="r-pr">#></span> SFO 3 55.52030</span> -<span class="r-out co"><span class="r-pr">#></span> FOMC 4 57.59999</span> +<span class="r-out co"><span class="r-pr">#></span> FOMC 4 57.59974</span> <span class="r-out co"><span class="r-pr">#></span> DFOP 5 59.67918</span> <span class="r-in"><span></span></span> <span class="r-in"><span> <span class="co"># For FOCUS C, the more complex models fit better</span></span></span> |