diff options
| -rw-r--r-- | docs/dev/news/index.html | 8 | ||||
| -rw-r--r-- | docs/dev/pkgdown.yml | 2 | ||||
| -rw-r--r-- | docs/dev/reference/read_spreadsheet.html | 7 | ||||
| -rw-r--r-- | man/read_spreadsheet.Rd | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/docs/dev/news/index.html b/docs/dev/news/index.html index 8448ebc8..3353922b 100644 --- a/docs/dev/news/index.html +++ b/docs/dev/news/index.html @@ -89,13 +89,13 @@ <div class="section level2"> <h2 class="page-header" data-toc-text="1.2.0" id="mkin-120-unreleased">mkin 1.2.0 (unreleased)<a class="anchor" aria-label="anchor" href="#mkin-120-unreleased"></a></h2> -<ul><li><p>‘R/mhmkin.R’: New method for performing multiple hierarchical mkin fits in one function call, optionally in parallel.</p></li> +<ul><li><p>‘R/saem.R’: ‘logLik’, ‘update’ and ‘anova’ methods for ‘saem.mmkin’ objects.</p></li> +<li><p>‘R/saem.R’: Automatic estimation of start parameters for random effects for the case of mkin transformations, nicely improving convergence and reducing problems with iterative ODE solutions.</p></li> +<li><p>‘R/status.R’: New generic to show status information for fit array objects with methods for ‘mmkin’, ‘mhmkin’ and ‘multistart’ objects.</p></li> +<li><p>‘R/mhmkin.R’: New method for performing multiple hierarchical mkin fits in one function call, optionally in parallel.</p></li> <li><p>‘R/mhmkin.R’: ‘anova.mhmkin’ for conveniently comparing the resulting fits.</p></li> <li><p>‘R/illparms.R’: New generic to show ill-defined parameters with methods for ‘mkinfit’, ‘mmkin’, ‘saem.mmkin’ and ‘mhmkin’ objects.</p></li> <li><p>‘R/multistart.R’: New method for testing multiple start parameters for hierarchical model fits, with function ‘llhist’ and new generic ‘parplot’ for diagnostics, and new generics ‘which.best’ and ‘best’ for extracting the fit with the highest likelihood</p></li> -<li><p>‘R/saem.R’: ‘logLik’, ‘update’ and ‘anova’ methods for ‘saem.mmkin’ objects.</p></li> -<li><p>‘R/saem.R’: Automatic estimation of start parameters for random effects for the case of mkin transformations, nicely improving convergence and reducing problems with iterative ODE solutions.</p></li> -<li><p>‘R/status.R’: New generic to show status information for fit array objects with methods for ‘mmkin’, ‘mhmkin’ and ‘multistart’ objects.</p></li> <li><p>‘R/summary.mmkin.R’: Summary method for mmkin objects.</p></li> <li><p>‘R/saem.R’: Implement and test saemix transformations for FOMC and HS. Also, error out if saemix transformations are requested but not supported.</p></li> <li><p>‘R/read_spreadsheet.R’: Conveniently read in data from a spreadsheet file.</p></li> diff --git a/docs/dev/pkgdown.yml b/docs/dev/pkgdown.yml index 85be66c4..44bd60f5 100644 --- a/docs/dev/pkgdown.yml +++ b/docs/dev/pkgdown.yml @@ -13,7 +13,7 @@ articles: dimethenamid_2018: web_only/dimethenamid_2018.html multistart: web_only/multistart.html saem_benchmarks: web_only/saem_benchmarks.html -last_built: 2022-11-16T09:48Z +last_built: 2022-11-16T14:17Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles diff --git a/docs/dev/reference/read_spreadsheet.html b/docs/dev/reference/read_spreadsheet.html index 70828765..efba012b 100644 --- a/docs/dev/reference/read_spreadsheet.html +++ b/docs/dev/reference/read_spreadsheet.html @@ -64,7 +64,10 @@ factors can be given in columns named 'Temperature' and 'Moisture'."><meta name= <a href="../articles/web_only/NAFTA_examples.html">Example evaluation of NAFTA SOP Attachment examples</a> </li> <li> - <a href="../articles/web_only/benchmarks.html">Some benchmark timings</a> + <a href="../articles/web_only/benchmarks.html">Benchmark timings for mkin</a> + </li> + <li> + <a href="../articles/web_only/saem_benchmarks.html">Benchmark timings for saem.mmkin</a> </li> </ul></li> <li> @@ -103,7 +106,7 @@ factors can be given in columns named 'Temperature' and 'Moisture'.</p> <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="fu">read_spreadsheet</span><span class="op">(</span></span> <span> <span class="va">path</span>,</span> <span> valid_datasets <span class="op">=</span> <span class="st">"all"</span>,</span> -<span> parent_only <span class="op">=</span> <span class="cn">TRUE</span>,</span> +<span> parent_only <span class="op">=</span> <span class="cn">FALSE</span>,</span> <span> normalize <span class="op">=</span> <span class="cn">TRUE</span></span> <span><span class="op">)</span></span></code></pre></div> </div> diff --git a/man/read_spreadsheet.Rd b/man/read_spreadsheet.Rd index 147d09bf..41c32108 100644 --- a/man/read_spreadsheet.Rd +++ b/man/read_spreadsheet.Rd @@ -7,7 +7,7 @@ read_spreadsheet( path, valid_datasets = "all", - parent_only = TRUE, + parent_only = FALSE, normalize = TRUE ) } |