Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
- 'R/mhmkin.R': New method for performing multiple hierarchical mkin fits in one function call, optionally in parallel.
- 'R/saem.R': 'logLik' and 'update' methods for 'saem.mmkin' objects.
- 'R/illparms.R': Add methods for 'saem.mmkin' and 'mhmkin' objects.
tests: Use 2 cores on travis, should work according to docs
|
|
Also, support FOMC with saemix transformations
|
|
|
|
Also skip complete log directory in .Rbuildignore and reorganize that
file to improve readability
|
|
Also, add a method for gathering convergence information
and a method for gathering information on ill-defined parameters
|
|
Thanks to Tomas Kalibera for his analysis of the problem on the
r-package-devel mailing list and for the suggestion on how to
fix it. See the current benchmark vignette for the new data
on mkin 1.1.1 with R 4.2.1, with unprecedented performance.
|
|
This also adds the first benchmark results obtained on my laptop system
|
|
Documentation and test results were updated, the latter with regard
to the previous work on plot.mixed.mmkin.
|
|
- New argument 'default_log_parms' for mean_degparms()
- 'plot.mixed.mmkin': Pass the frame argument also to residual plots,
take the 'default_log_parms' argument for 'mean_degparms' used for
constructing approximate population curves, plot population curve last
to avoid that it is covered by data
|
|
Also increase the performance a bit (from about 210 s to about 140 s in
the case of DFOP with four chains and 300, 100 iterations).
|
|
|
|
|
|
|
|
I am postponing my attempts to get the nlmixr interface to CRAN, given
some problems with nlmixr using R-devel under Windows, see
https://github.com/nlmixrdevelopment/nlmixr/issues/596
and
https://github.com/r-hub/rhub/issues/512,
which is fixed by the removal of nlmixr from the testsuite.
For the tests to be more platform independent, the biphasic mixed
effects models test dataset was defined in a way that fitting
should be more robust (less ill-defined).
|
|
|
|
|
|
|
|
The EFSA URL failed on winbuilder because some cookie sets a different
domain, so I am now using \href{} with the full link as link text instead
of \url{}
|
|
|
|
|
|
|
|
- All degradation models are specified as ODE models. This appears to be
fast enough
- Error models are being translated to nlmixr as close to the mkin error
model as possible. When using the 'saem' backend, it appears not to be
possible to use the same error model for more than one observed variable
- No support yet for models with parallel formation of metabolites, where
the ilr transformation is used in mkin per default
- There is a bug in nlmixr which appears to be triggered if the data are
not balanced, see nlmixrdevelopment/nlmixr#530
- There is a print and a plot method, the summary method is not finished
|
|
|
|
|
|
In residual plots, use xlab and xlim if appropriate
|
|
|
|
- fit_with_errors for saem()
- test_log_parms for mean_degparms() and saem()
|
|
|
|
|
|
|
|
|
|
It didn't pick up the release of 1.0.3, and most of the other release
dates were duplicated.
|
|
|
|
Also bump version to 1.0.3.
|
|
|
|
Run make testcheck to regenerate logs with merge conflicts
|
|
mkinfit: Keep model names stored in mkinmod objects, avoiding their loss in gmkin
|
|
Also after the upgrade from buster to bullseye of my local system, some
test results for saemix have changed.
|
|
Platform dependence also revealed after upgrade to bullseye
|
|
Remove tests relying on non-convergence of the FOMC fit to the FOCUS A
dataset, as this is platform dependent. After the upgrade, the fit
converges on this system as well, although neither ATLAS is used, nor R
was configured disabling long doubles (these were the conditions under
which the tests failed on CRAN).
|
|
The errors in the example code were in the \dontrun sections, so they
were not caught by CRAN checks. In addition, the static help files
generated with pkgdown were cached, so I noticed the errors only
after completely regenerating the documentation for version 1.0.0.
|
|
- Improve authorship and copyright information
- Prepare pkgdown config
- Remove dependence on saemix as we need the development version which
is not ready for CRAN
- Temporarily remove saemix interface to check code coverage of the rest
|
|
|
|
See NEWS.md. Closes #12
|
|
Address release critical check and test issues
|
|
|
|
|
|
|
|
- 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()
|