Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
Thanks to Janina Wöltjen for pointing it out
|
|
The vignette illustrates pH dependent degradation (covariate modelling)
with some detail for the parent compound.
Also, a bug in the saem method of the illparms function was fixed, which
prevented to find ill-defined parameters in cases where e.g. slopes of
covariate models have a negative estimate.
|
|
|
|
It seems that we cannot use stored DLLs (for pathway fits) on clusters
when using Windows, where we use PSOCK clusters. Although it works on
winbuilder in the tests in tests/testthat/test_compiled.R.
Maybe it is something RStudio specific.
|
|
Also, using mkin analytical solutions for more than one observed
variable is not supported (but could be if out_values would be
reordered).
|
|
We still need to create a parallel processing cluster _after_ creating a
compiled model that is moved to a user defined location, at least I did
not find another way to make it work. This is not a problem with
parallel processing without a cluster, which is not available on
Windows.
|
|
|
|
|
|
|
|
Now with working pathway fits using SFORB-SFO2 (only two parallel
metabolites instead of three) as the data for compound Ia was not
sufficient for a reliable fit.
|
|
|
|
Instead of rmarkdown::pdf_document, mkin::hierarchical_kinetics is used
as a document format in the template. In this way, the template file can
be freed from some R code and yaml options that the average user does
not have to be aware of.
|
|
The template only shows parent data evaluation without covariate models
for now. The spreadsheet will also be useful for unit testing of the
read_spreadsheet function.
|
|
To ensure that tests on different platforms work on the same data, the
mixed modelling test data previosly generated in
tests/testthat/setup_script.R were generated once using the script in
inst/dataset/generation/ds_mixed.R, and are now distributed with the
package.
|
|
The data given in previous mkin versions for "Borstel 2" (Staudenmaier
2013) are in fact a subset of the "Borstel 1" data, with the "Borstel 2"
data simply being further analysed for isomer composition by
Staudenmaier (2013).
While correcting this, the URL of the RAR published by EFSA was
updated, as the EFSA Register of Questions was replaced by the
Open EFSA portal.
This also affects the recent publication in "Environments" [1], where
these two datasets were pooled. However, the influence on the final
results can be expected to be minimal. Out of the 16 observations for
the Borstel soil, five were erroneously duplicated which just changes
the weight of the different sampling points and modifies the variance.
The conclusions of the publication are qualitative and are not
considered to be affected.
[1] https://doi.org/10.3390/environments8080071
|
|
|
|
|
|
|
|
- D24_2014 dataset on aerobic soil degradation of 2,4-D from the EU
assessment as mkindsg object with metadata
- f_time_norm_focus() to do time-step normalisation using the FOCUS
method
- focus_soil_moisture data with default moisture contents at pF1,
pF 2 and pF 2.5 for USDA soil types from FOCUS GW guidance
- Dataset generation scripts in inst/dataset_generation
- Depend on R >= 2.15.1 in order to facilitate the use of
utils::globalVariables()
|
|
|
|
generated with mkin < 0.9.49.5
|
|
- Skip long running tests on CRAN as well to avoid timeout on winbuilder
- Don't install benchmark results in the package, they are only needed
in the git repository
- Don't run example in man/add_err.Rd as it takes > 10 s on winbuilder
- Rebuild docs
|
|
- Also make it possible to specify initial values for error model
parameters.
- Run tests
- Rebuild docs
|
|
- Write the NEWS
- Static documentation rebuilt by pkgdown
- Adapt mkinerrmin
- Fix (hopefully all) remaining problems in mkinfit
|
|
which was accidentally overwritten by pkgdown -> roxygen
|
|
- Use https for canonical R URLs
- Update CAKE URL to one giving a valid SSL certificate
|
|
|
|
Using hadley/staticdocs commit #8c1069d from 8 days ago
|
|
|
|
The test test_FOMC_ill-defined leads to errors on several
architectures/distributions, as apparent from CRAN checks,
so we need a new release.
Static documentation rebuilt by staticdocs::build_site()
|
|
|
|
|
|
|
|
Also a small fix to the FOCUS Z vignette, and an update
of the static documentation generated by staticdocs.
|
|
|
|
- Put the CRAN URL that the badge points to into canonical form. I had
missed the requirement to use the canonical form before, as the R CMD
check message complained about a (possibily) invalid URL, so I
overlooked the explanation later in the check log. Thanks to Uwe for
his patience. Fix checked with winbuilder.
- Slightly reduced the build time for the compiled_models vignette by
skipping the warm-up. 3 repetitions are necessary for the autoplot
method to work
|
|
|
|
- Now it is easier to do decline kinetics from the maximum occurrence
- Static documentation rebuilt by staticdocs::build_site()
- Fixed an URL in the README, thanks to the win-builder check with
R-devel
|
|
|
|
|
|
|
|
r-forge
|
|
|
|
|
|
This long-standing issue finally got fixed in
2f56137fc9ba60bfea54e575d233f4e696bb8a5a
|
|
|
|
|
|
See NEWS.md for details
|
|
|