Merge branch 'nlmixr'

1 files changed, 27 insertions, 0 deletions

diff --git a/NAMESPACE b/NAMESPACE
index 9776d2f3..aa3899ac 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -8,6 +8,8 @@ S3method(aw,mmkin)
 S3method(confint,mkinfit)
 S3method(f_time_norm_focus,mkindsg)
 S3method(f_time_norm_focus,numeric)
+S3method(intervals,nlmixr.mmkin)
+S3method(intervals,saem.mmkin)
 S3method(loftest,mkinfit)
 S3method(logLik,mkinfit)
 S3method(lrtest,mkinfit)
@@ -16,6 +18,7 @@ S3method(mixed,mmkin)
 S3method(mkinpredict,mkinfit)
 S3method(mkinpredict,mkinmod)
 S3method(nlme,mmkin)
+S3method(nlmixr,mmkin)
 S3method(nobs,mkinfit)
 S3method(parms,mkinfit)
 S3method(parms,mmkin)
@@ -30,11 +33,18 @@ S3method(print,mkinmod)
 S3method(print,mmkin)
 S3method(print,nafta)
 S3method(print,nlme.mmkin)
+S3method(print,nlmixr.mmkin)
+S3method(print,saem.mmkin)
 S3method(print,summary.mkinfit)
 S3method(print,summary.nlme.mmkin)
+S3method(print,summary.nlmixr.mmkin)
+S3method(print,summary.saem.mmkin)
 S3method(residuals,mkinfit)
+S3method(saem,mmkin)
 S3method(summary,mkinfit)
 S3method(summary,nlme.mmkin)
+S3method(summary,nlmixr.mmkin)
+S3method(summary,saem.mmkin)
 S3method(update,mkinfit)
 S3method(update,mmkin)
 S3method(update,nlme.mmkin)
@@ -53,7 +63,9 @@ export(endpoints)
 export(f_time_norm_focus)
 export(get_deg_func)
 export(ilr)
+export(intervals)
 export(invilr)
+export(invtffm0)
 export(loftest)
 export(logistic.solution)
 export(lrtest)
@@ -82,19 +94,30 @@ export(nafta)
 export(nlme)
 export(nlme_data)
 export(nlme_function)
+export(nlmixr)
+export(nlmixr_data)
+export(nlmixr_model)
 export(parms)
 export(plot_err)
 export(plot_res)
 export(plot_sep)
+export(saem)
+export(saemix_data)
+export(saemix_model)
 export(sigma_twocomp)
+export(tffm0)
 export(transform_odeparms)
 import(deSolve)
 import(graphics)
 import(nlme)
 importFrom(R6,R6Class)
+importFrom(dplyr,"%>%")
 importFrom(grDevices,dev.cur)
 importFrom(lmtest,lrtest)
 importFrom(methods,signature)
+importFrom(nlme,intervals)
+importFrom(nlmixr,nlmixr)
+importFrom(nlmixr,tableControl)
 importFrom(parallel,detectCores)
 importFrom(parallel,mclapply)
 importFrom(parallel,parLapply)
@@ -105,6 +128,7 @@ importFrom(stats,aggregate)
 importFrom(stats,as.formula)
 importFrom(stats,coef)
 importFrom(stats,coefficients)
+importFrom(stats,confint)
 importFrom(stats,cov2cor)
 importFrom(stats,dist)
 importFrom(stats,dnorm)
@@ -124,7 +148,10 @@ importFrom(stats,qnorm)
 importFrom(stats,qt)
 importFrom(stats,residuals)
 importFrom(stats,rnorm)
+importFrom(stats,sd)
 importFrom(stats,shapiro.test)
 importFrom(stats,update)
+importFrom(stats,vcov)
 importFrom(utils,getFromNamespace)
+importFrom(utils,packageVersion)
 importFrom(utils,write.table)