Skip to content

Commit

Permalink
Merge pull request #403 from nlmixr2/402-nlm
Browse files Browse the repository at this point in the history
402 nlm
  • Loading branch information
mattfidler committed Oct 14, 2023
2 parents 5d52ed0 + 2205e35 commit 6cea1de
Show file tree
Hide file tree
Showing 11 changed files with 883 additions and 12 deletions.
12 changes: 12 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ S3method(getValidNlmixrCtl,fo)
S3method(getValidNlmixrCtl,foce)
S3method(getValidNlmixrCtl,focei)
S3method(getValidNlmixrCtl,foi)
S3method(getValidNlmixrCtl,nlm)
S3method(getValidNlmixrCtl,nlme)
S3method(getValidNlmixrCtl,posthoc)
S3method(getValidNlmixrCtl,rxSolve)
Expand Down Expand Up @@ -57,6 +58,7 @@ S3method(nlmixr2Est,fo)
S3method(nlmixr2Est,foce)
S3method(nlmixr2Est,focei)
S3method(nlmixr2Est,foi)
S3method(nlmixr2Est,nlm)
S3method(nlmixr2Est,nlme)
S3method(nlmixr2Est,output)
S3method(nlmixr2Est,posthoc)
Expand Down Expand Up @@ -130,6 +132,7 @@ S3method(nmObjGetControl,fo)
S3method(nmObjGetControl,foce)
S3method(nmObjGetControl,focei)
S3method(nmObjGetControl,foi)
S3method(nmObjGetControl,nlm)
S3method(nmObjGetControl,nlme)
S3method(nmObjGetControl,posthoc)
S3method(nmObjGetControl,saem)
Expand Down Expand Up @@ -157,6 +160,7 @@ S3method(nmObjGetPredOnly,saem)
S3method(nmObjGetRxSolve,default)
S3method(nmObjHandleControlObject,default)
S3method(nmObjHandleControlObject,foceiControl)
S3method(nmObjHandleControlObject,nlmControl)
S3method(nmObjHandleControlObject,nlmeControl)
S3method(nmObjHandleControlObject,saemControl)
S3method(nmObjHandleModelObject,default)
Expand Down Expand Up @@ -209,9 +213,15 @@ S3method(rxUiGet,foceiThetaS)
S3method(rxUiGet,getEBEEnv)
S3method(rxUiGet,getSplitMuModel)
S3method(rxUiGet,loadPrune)
S3method(rxUiGet,loadPruneNlm)
S3method(rxUiGet,loadPruneSaem)
S3method(rxUiGet,loadPruneSaemPred)
S3method(rxUiGet,loadPruneSens)
S3method(rxUiGet,nlmModel0)
S3method(rxUiGet,nlmParIni)
S3method(rxUiGet,nlmParName)
S3method(rxUiGet,nlmParNameFun)
S3method(rxUiGet,nlmRxModel)
S3method(rxUiGet,nlmeFD)
S3method(rxUiGet,nlmeFixedFormula)
S3method(rxUiGet,nlmeFunction)
Expand Down Expand Up @@ -286,6 +296,7 @@ export("%>%")
export(.foceiPreProcessData)
export(.nlmixr2estLastPredSimulationInfo)
export(.nlmixr2objectNameAssign)
export(.nlmixrNlmFun)
export(.nlmixrNlmeFun)
export(.rxGetDVFTransform)
export(.saemDropMuRefFromModel)
Expand Down Expand Up @@ -327,6 +338,7 @@ export(ini)
export(logit)
export(lotri)
export(model)
export(nlmControl)
export(nlme)
export(nlmeControl)
export(nlmixr)
Expand Down
11 changes: 8 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# nlmixr2est (development version)

## New Features

- Algebraic mu referencing has been implemented in `nlme` and `saem`.

- New estimation method "nlm" has been added to estimate population
only likelihoods using `stats::nlm` and possibly return a
standardized `nlmixr2` fit.

## Breaking changes

- Removed `fit$saemTransformedData` since it isn't actually used in
Expand All @@ -10,9 +18,6 @@
lag features need to translate the data differently based on
`rxControl()` options.

## mu referencing

- Algebraic mu referencing has been implemented in `nlme` and `saem`.

## Bug fixes

Expand Down

0 comments on commit 6cea1de

Please sign in to comment.