Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
Depends on inline >= 0.16.2 (including the bug fixes from
eddelbuettel/inline#18), which provides 'moveDLL' to store the DLL for a
compiled function in a safe place in case the argument 'dll_dir' is
specified in the call to 'mkinmod'.
Huge thanks to Dirk @eddelbuettel for his review and support
for the work on the inline package.
|
|
With automatic reloading in mkinfit and mkinpredict in case the
DLL is not loaded and the original DLL path has been cleaned up.
Depends on jranke/inline@974bdea04fcedfafaab231e6f359c88270b56cb9
See inline#13
|
|
By depending on parallel instead of importing it, functions to set up
and stop a cluster are always available when mkin is loaded.
The use of multicore processing in mmkin on Windows is now documented in
the help file, which brings mkin closer to a version 1.0 #9.
|
|
- 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()
|
|
The experimental nlme version in my drat repository contains the
variance function structure varConstProp which makes it possible to use
the two-component error model in generalized nonlinear models using
nlme::gnls() and in mixed effects models using nlme::nlme().
|
|
|
|
|
|
|
|
|
|
|
|
The method is no longer necessary, now that Bug 17761 is fixed upstream
https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17761
|
|
|
|
|
|
saemix_data depends on a development version of saemix, see
pull request saemixdevelopment/saemixextension#2
|
|
|
|
|
|
|
|
This is about twice as fast as deSolve compiled in the case of FOCUS D
|
|
Still in preparation for analytical solutions of coupled models
|
|
Preparing for symbolic solutions for more than one compound
|
|
|
|
|
|
|
|
According to the hint of @jimhester received in the Travis Forum -
thanks!
|
|
|
|
Merge DESCRIPTION manually to combine dependencies and rerun check to
update check.log
|
|
|
|
|
|
Roxygen update -> formatting changes in Rd files
|
|
|
|
|
|
|
|
|
|
Also the documentation was improved here and there
|
|
|
|
- Update DESCRIPTION for release
|
|
The likelihood ratio test method is lrtest, in addition,
methods for update and residuals were added.
|
|
The cutoff now matches what is given by Venzon and Moolgavkar (1988).
Also, confidence intervals closely match intervals obtained with
stats4::confint in the test case where an stats4::mle object
is created from the likelihood function in one test case.
Static documentation rebuilt by pkgdown
|
|
Static documentation rebuilt by pkgdown
|
|
mkinfit objects now include an ll() function to calculate the
log-likelihood. Part of the code was refactored, hopefully making it
easier to read and maintain. IRLS is currently the default algorithm for
the error model "obs", for no particular reason. This may be subject
to change when I get around to investigate.
Slow tests are now in a separate subdirectory and will probably
only be run by my own Makefile target.
Formatting of test logs is improved.
Roundtripping error model parameters works with a precision of 10% when
we use lots of replicates in the synthetic data (see slow tests). This
is not new in this commit, but as I think it is reasonable this
closes #7.
|
|
|
|
|
|
Static documentation rebuilt by pkgdown
|
|
Static documentation rebuilt by pkgdown
|
|
The new algorithm tries direct optimization of the likelihood, as well
as a three step procedure. In this way, we consistently get the
model with the highest likelihood for SFO, DFOP and HS for all 12
new test datasets.
|
|
|
|
- Fix the respective error in the code
- Static documentation rebuilt by pkgdown
|
|
- Write the NEWS
- Static documentation rebuilt by pkgdown
- Adapt mkinerrmin
- Fix (hopefully all) remaining problems in mkinfit
|
|
- No IRLS required
- Removed optimization algorithms other than Port
- Removed the dependency on FME
- Fitting the error model 'obs' is much faster for the FOCUS_2006_D
dataset and the FOMC_SFO model (1 second versus 3.4 seconds)
- Vignettes build slower. Compiled models needs 3 minutes instead of 1.5
- For other vignettes, the trend is less clear. Some fits are faster,
even for error_model = "const". FOCUS_Z is faster (34.9 s versus
44.1 s)
- Standard errors and confidence intervals are slightly smaller
- Removed code for plotting during the fit, as I hardly ever used it
- Merged the two cost functions (using transformed and untransformed
parameters) into one log-likelihood function
|