Age | Commit message (Collapse) | Author | Files | Lines |
|
I do not know why the formulae for b1 and b2 on page 64 of FOCUS
kinetics (2014) were not simplified. Clearly, the term
k12 * k21 - (k12 + k1output) * k21)
can be simplified to
- k1output * k21
The test for equivalence of DFOP and SFORB fits verifies that the change
is OK. I also removed trailing whitespaces, substituted tab characters
by two whitespaces and removed indenting of text in paragraphs
describing parameters in roxygen comments to unify formatting.
|
|
Based on parameters in the separate fits that fail the t-test.
|
|
The hope was to be more successful in saemix fits, but I did not notice
an improvement (e.g. for a failing likelihood calculation with importance
sampling, where the error message suggested to increase maxsteps).
|
|
I think it is always preferable to be able to investigate the
saemix object returned.
|
|
|
|
|
|
|
|
|
|
|
|
For the case of single fits and no ill-defined parameters found
|
|
|
|
|
|
That parhist name was not the brightest idea, as it does
not show histograms.
|
|
|
|
The reason is that it is misleading in the case of saem.mmkin objects,
because convergence is not really checked there.
|
|
|
|
|
|
The bug was introduced by the changes in summary.saem.mmkin.R and
surfaced in the tests when using saemix transformations.
|
|
Update docs
|
|
- Add 'best' and 'which.best' generics with methods for multistart
objects
- Per default, scale the parameters in parhist plots using the fit with
the highest log likelihood.
|
|
This is achieved by introducing the argument 'no_random_effect' to the
saem function.
|
|
pfm depends on mkin anyways, so reexporting set_nd_nq and
set_nd_nq_focus in pfm should provide reasonable continuity.
|
|
|
|
|
|
In particular, adapt the display of parameter boxplots
for saem fits using mkin transformations to the way
used for saem fits using saemix transformations, i.e.
always show parameters on the natural scale, and normalised them by
dividing by the median from the multiple runs.
|
|
- Split out llhist and parhist documentation
- Add example code for multistart
- Create a multistart vignette, because the example code fails when run
by pkgdown
- Fix multistart for the case of mkin transformations in the saem fit
|
|
|
|
|
|
|
|
|
|
|
|
- '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
|
|
This cleans up the startup message. Loading parallel is not
that important, users wanting to use it will know what to do.
Also, add codemeta.json to .Rbuildignore
|
|
Also, add a method for gathering convergence information
and a method for gathering information on ill-defined parameters
|
|
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
|
|
|
|
|
|
|
|
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).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|