Age | Commit message (Collapse) | Author | Files | Lines |
|
The method is no longer necessary, now that Bug 17761 is fixed upstream
https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17761
|
|
This revealed a bug in the data returned in mkinfit$data in the case
of the d_3 algorithm, which also affected the residual plot - the
data from the direct fitting was not returned even if this was
the better method.
|
|
Also, use more intelligent starting values for the variance of the
random effects for saemix. While this does not appear to speed up
the convergence, it shows where this variance is greatly reduced
by using mixed-effects models as opposed to the separate independent
fits.
|
|
|
|
saemix_data depends on a development version of saemix, see
pull request saemixdevelopment/saemixextension#2
|
|
|
|
|
|
|
|
- mean_degparms() now optionally returns starting values for fixed and
random effects, which makes it possible to obtain acceptable fits
also in more difficult cases (with more parameters)
- Fix the anova method, as it is currently not enough to inherit from
lme: https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17761
- Show fit information, and per default also errmin information
in plot.nlme.mmkin()
- Examples for nlme.mmkin: Decrease tolerance and increase the number of
iterations in the PNLS step in order to be able to fit FOMC-SFO and
DFOP-SFO
|
|
|
|
|
|
|
|
Merge DESCRIPTION manually to combine dependencies and rerun check to
update check.log
|
|
|
|
|
|
|
|
|
|
- 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
|
|
|
|
|
|
The likelihood ratio test method is lrtest, in addition,
methods for update and residuals were added.
|
|
Static documentation rebuilt by pkgdown
|
|
The confint method can do profile likelihood based confidence intervals!
|
|
|
|
- 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
|
|
|
|
which was accidentally overwritten by pkgdown -> roxygen
|
|
|
|
|
|
Static documentation rebuilt by pkgdown
|
|
|
|
|
|
with respect to accuracy and robustness.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Including documentation and documentation improvements for mmkin().
|
|
|
|
As it is unclear if and when ccSolve will be published on CRAN,
the generation, compilation and use of the C version of the
system of differential equations was developed for mkin, inspired and
guided by the code from the ccSolve package. Many thanks again to
Karline Soetaert for all of her work on this and other R packages.
Now all model types, including the Hockey-Stick model for the parent
compund and the IORE model for parent and/or metabolites can be compiled.
|
|
|
|
If the ccSolve package is available, and time is not in the right hand
side of the equations (i.e. if only SFO and SFORB models are used),
the differential equation model is compiled from auto-generated C code.
Currently, one test (FOCUS 2006 D SFO_SFO) fails
|
|
- Export S3 methods
- Avoid using undeclared variable names
|
|
|
|
Candidate for publication on CRAN
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@97 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
|
|
it is
less stable than the way of fitting used in mkin 0.8. Presumably this is due
to the frequent presence of products of two parameters (formation fractions and kinetic
rate constants) in the differential equations.
- mkinmod documentation was adapted to the new version
- Introduce vim fold markers to the mkinmod source for convenience
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@24 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
|
|
- The SFORB models with metabolites is broken (see TODO)
- Moved the vignette to the location recommended since R 2.14
- Added the missing documentation
- Commented out the schaefer_complex_case test, as this version of
mkin is not able to fit a model without sink and therefore
mkin estimated parameters are quite different
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@22 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
|