From 20b9c584e7c43ecbb708459e531c24a1a4751e17 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sat, 9 Nov 2019 01:05:51 +0100 Subject: Add a lack-of-fit test - Switch an example dataset in the test setup to a dataset with replicates, adapt tests - Skip the test for lrtest with an update specification as it does not only fail when pkgdown generates static help pages, but also in testthat --- docs/news/index.html | 1 + docs/reference/index.html | 6 + docs/reference/loftest-1.png | Bin 0 -> 27354 bytes docs/reference/loftest-2.png | Bin 0 -> 27721 bytes docs/reference/loftest-3.png | Bin 0 -> 65409 bytes docs/reference/loftest-4.png | Bin 0 -> 64457 bytes docs/reference/loftest-5.png | Bin 0 -> 63057 bytes docs/reference/loftest.html | 343 +++++++++++++++++++++++++++++++++++++++++++ docs/sitemap.xml | 3 + 9 files changed, 353 insertions(+) create mode 100644 docs/reference/loftest-1.png create mode 100644 docs/reference/loftest-2.png create mode 100644 docs/reference/loftest-3.png create mode 100644 docs/reference/loftest-4.png create mode 100644 docs/reference/loftest-5.png create mode 100644 docs/reference/loftest.html (limited to 'docs') diff --git a/docs/news/index.html b/docs/news/index.html index 48ba25e5..9aa2e18b 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -134,6 +134,7 @@ mkin 0.9.49.8 (unreleased) Unreleased @@ -163,7 +163,7 @@

Development

-

Contributions are welcome! Your mkin fork is just a mouse click away… The master branch on github should always be in good shape, I implement new features in separate branches now. If you prefer subversion, project members for the r-forge project are welcome as well. Generally, the source code of the latest CRAN version should be available there. You can also browse the source code at cgit.jrwb.de/mkin.

+

Contributions are welcome!

-- cgit v1.2.1 From 51535c943d2846bc73ad69a11909aac606996b7d Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 13 Nov 2019 22:16:43 +0100 Subject: Improve formatting using markdown --- docs/reference/aw.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/reference/aw.html b/docs/reference/aw.html index b6f3ce48..22201229 100644 --- a/docs/reference/aw.html +++ b/docs/reference/aw.html @@ -153,24 +153,24 @@ by Burnham and Anderson (2004).

object -

An mmkin column object, containing two or more -mkinfit models that have been fitted to the same data, +

An mmkin column object, containing two or more +mkinfit models that have been fitted to the same data, or an mkinfit object. In the latter case, further mkinfit objects fitted to the same data should be specified as dots arguments.

... -

Not used in the method for mmkin column objects, -further mkinfit objects in the method for mkinfit objects.

+

Not used in the method for mmkin column objects, +further mkinfit objects in the method for mkinfit objects.

References

Burnham KP and Anderson DR (2004) Multimodel - Inference: Understanding AIC and BIC in Model Selection - Sociological Methods & Research 33(2) 261-304

+Inference: Understanding AIC and BIC in Model Selection. +Sociological Methods & Research 33(2) 261-304

Examples

# \dontrun{ -- cgit v1.2.1 From 7ea467e0e0ba5bf51540b26e197869a58ed1a092 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 9 Dec 2019 15:21:11 +0100 Subject: Consistently use "two-component error model" instead of "two component error model" --- docs/reference/index.html | 2 +- docs/reference/sigma_twocomp.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/reference/index.html b/docs/reference/index.html index 3d417267..73dfbe4c 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -444,7 +444,7 @@ kinetic models fitted with mkinfit

sigma_twocomp()

-

Two component error model

+

Two-component error model

diff --git a/docs/reference/sigma_twocomp.html b/docs/reference/sigma_twocomp.html index d95e1c28..1795e6c3 100644 --- a/docs/reference/sigma_twocomp.html +++ b/docs/reference/sigma_twocomp.html @@ -6,7 +6,7 @@ -Two component error model — sigma_twocomp • mkin +Two-component error model — sigma_twocomp • mkin @@ -35,7 +35,7 @@ - + @@ -70,7 +70,7 @@ dependence of the measured value \(y\):" /> mkin - 0.9.49.6 + 0.9.49.8
@@ -128,7 +128,7 @@ dependence of the measured value \(y\):" />
-- cgit v1.2.1 From 49d80b149ec36eb967cb6da3a8b6726e48bf0ecc Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 10 Dec 2019 20:46:05 +0100 Subject: Update and amend the README --- docs/index.html | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index c89fc122..2e960df1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -151,8 +151,8 @@

Credits and historical remarks

-

mkin would not be possible without the underlying software stack consisting of R and the packages deSolve and FME, to say the least.

-

It could not have been written without me being introduced to regulatory fate modelling of pesticides by Adrian Gurney during my time at Harlan Laboratories Ltd (formerly RCC Ltd). mkin greatly profits from and largely follows the work done by the FOCUS Degradation Kinetics Workgroup, as detailed in their guidance document from 2006, slightly updated in 2011 and in 2014.

+

mkin would not be possible without the underlying software stack consisting of R and the package deSolve. In previous version, mkin was also using the functionality of the FME package.

+

mkin could not have been written without me being introduced to regulatory fate modelling of pesticides by Adrian Gurney during my time at Harlan Laboratories Ltd (formerly RCC Ltd). mkin greatly profits from and largely follows the work done by the FOCUS Degradation Kinetics Workgroup, as detailed in their guidance document from 2006, slightly updated in 2011 and in 2014.

Also, it was inspired by the first version of KinGUI developed by BayerCropScience, which is based on the MatLab runtime environment.

The companion package kinfit (now deprecated) was started in 2008 and first published on CRAN on 01 May 2010.

The first mkin code was published on 11 May 2010 and the first CRAN version on 18 May 2010.

@@ -160,6 +160,24 @@

Somewhat in parallel, Syngenta has sponsored the development of an mkin and KinGUII based GUI application called CAKE, which also adds IRLS and MCMC, is more limited in the model formulation, but puts more weight on usability. CAKE is available for download from the CAKE website, where you can also find a zip archive of the R scripts derived from mkin, published under the GPL license.

Finally, there is KineticEval, which contains a further development of the scripts used for KinGUII, so the different tools will hopefully be able to learn from each other in the future as well.

+
+

+References

+ + + +
Ranke J, Meinecke S (2019) + Error Models for the Kinetic Evaluation of Chemical Degradation Data + Environments + 6 (12) 124 + doi:10.3390/environments6120124 +
Ranke J, Wöltjen J, Meinecke S (2018) + Comparison of software tools for kinetic evaluation of chemical degradation data + Environmental Sciences Europe + 30 17 + doi:10.1186/s12302-018-0145-1 +
+

Development

-- cgit v1.2.1 From 7c8e06d4bae9ec80574147005b7e933937447220 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 10 Dec 2019 20:56:10 +0100 Subject: More additions to the README --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 2e960df1..fcb9c90b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -151,7 +151,7 @@

Credits and historical remarks

-

mkin would not be possible without the underlying software stack consisting of R and the package deSolve. In previous version, mkin was also using the functionality of the FME package.

+

mkin would not be possible without the underlying software stack consisting of, among others, R and the package deSolve. In previous version, mkin was also using the functionality of the FME package. Please refer to the package page on CRAN for the full list of imported and suggested R packages. Also, Debian Linux, the vim editor and the Nvim-R plugin have been invaluable in its development.

mkin could not have been written without me being introduced to regulatory fate modelling of pesticides by Adrian Gurney during my time at Harlan Laboratories Ltd (formerly RCC Ltd). mkin greatly profits from and largely follows the work done by the FOCUS Degradation Kinetics Workgroup, as detailed in their guidance document from 2006, slightly updated in 2011 and in 2014.

Also, it was inspired by the first version of KinGUI developed by BayerCropScience, which is based on the MatLab runtime environment.

The companion package kinfit (now deprecated) was started in 2008 and first published on CRAN on 01 May 2010.

-- cgit v1.2.1 From 1868c1c6b98afa4c8a11b7c065d717bfb4ec1a8e Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 16 Dec 2019 02:51:19 +0100 Subject: Argument ymax for plot.mmkin --- docs/reference/plot.mmkin.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/reference/plot.mmkin.html b/docs/reference/plot.mmkin.html index 8b68cfae..18907aa2 100644 --- a/docs/reference/plot.mmkin.html +++ b/docs/reference/plot.mmkin.html @@ -73,7 +73,7 @@ the fit of at least one model to the same dataset is shown." /> mkin - 0.9.49.6 + 0.9.49.8
@@ -147,7 +147,7 @@ the fit of at least one model to the same dataset is shown.

plot(x, main = "auto", legends = 1, resplot = c("time", "errmod"), show_errmin = TRUE, errmin_var = "All data", errmin_digits = 3, cex = 0.7, - rel.height.middle = 0.9, ...)
+ rel.height.middle = 0.9, ymax = "auto", ...)

Arguments

@@ -195,6 +195,10 @@ chi2 error percentage.

+ + + +

The relative height of the middle plot, if more than two rows of plots are shown.

ymax

Maximum y axis value for plot.mkinfit.

...

Further arguments passed to plot.mkinfit and -- cgit v1.2.1 From bc42b66fab81afaf4fd90aeb24cdf2b0c2d44202 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 8 Jan 2020 15:06:49 +0100 Subject: Typos in NEWS, update static docs --- docs/news/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/news/index.html b/docs/news/index.html index 6b0b89fa..00257521 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -147,7 +147,7 @@

  • Fix a bug introduced in 0.9.49.6 that occurred if the direct optimisation yielded a higher likelihood than the three-step optimisation in the d_3 algorithm, which caused the fitted parameters of the three-step optimisation to be returned instead of the parameters of the direct optimisation

  • -
  • Add an ‘nobs’ method for mkinfit methods, enabling the default ‘BIC’ method from the stats package. Also, add a ‘BIC’ method for mmkin column objects.

  • +
  • Add a ‘nobs’ method for mkinfit objects, enabling the default ‘BIC’ method from the stats package. Also, add a ‘BIC’ method for mmkin column objects.

-- cgit v1.2.1 From 70fe6d14e27fa8fb0634856ecc45a27f4f689d88 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 9 Jan 2020 17:50:23 +0100 Subject: Remove unused FME package from DESCRIPTION text --- docs/404.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 11 +++++------ docs/news/index.html | 2 +- docs/reference/index.html | 2 +- docs/reference/parms.html | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) (limited to 'docs') diff --git a/docs/404.html b/docs/404.html index 2a71e496..3658a137 100644 --- a/docs/404.html +++ b/docs/404.html @@ -67,7 +67,7 @@ mkin - 0.9.49.8 + 0.9.49.9
diff --git a/docs/articles/index.html b/docs/articles/index.html index ac5f5df1..3e181a2c 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -67,7 +67,7 @@ mkin - 0.9.49.8 + 0.9.49.9 diff --git a/docs/authors.html b/docs/authors.html index fb50f268..2bb2557a 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -67,7 +67,7 @@ mkin - 0.9.49.8 + 0.9.49.9 diff --git a/docs/index.html b/docs/index.html index fcb9c90b..fe334eb8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -14,11 +14,10 @@ + solvers. If a C compiler (on windows: Rtools) is installed, differential + equation models are solved using automatically generated C functions. Please + note that no warranty is implied for correctness of results or fitness for a + particular purpose.">