More work on multistart

5 files changed, 18 insertions, 2 deletions

diff --git a/NAMESPACE b/NAMESPACE
index 39588dea..90e69221 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -32,6 +32,7 @@ S3method(nlme,mmkin)
 S3method(nobs,mkinfit)
 S3method(parms,mkinfit)
 S3method(parms,mmkin)
+S3method(parms,saem.mmkin)
 S3method(plot,mixed.mmkin)
 S3method(plot,mkinfit)
 S3method(plot,mmkin)
@@ -46,6 +47,7 @@ S3method(print,mkinds)
 S3method(print,mkindsg)
 S3method(print,mkinmod)
 S3method(print,mmkin)
+S3method(print,multistart)
 S3method(print,nafta)
 S3method(print,nlme.mmkin)
 S3method(print,saem.mmkin)
@@ -57,6 +59,7 @@ S3method(residuals,mkinfit)
 S3method(saem,mmkin)
 S3method(summary,mkinfit)
 S3method(summary,mmkin)
+S3method(summary,multistart.saem.mmkin)
 S3method(summary,nlme.mmkin)
 S3method(summary,saem.mmkin)
 S3method(update,mkinfit)
diff --git a/R/multistart.R b/R/multistart.R
index fb31d002..a3afa08b 100644
--- a/R/multistart.R
+++ b/R/multistart.R
@@ -39,6 +39,7 @@ multistart.saem.mmkin <- function(object, n = 50, cores = 1, ...) {
   res <- parallel::mclapply(1:n, function(x) {
     update(object, degparms_start = start_parms[x, ], ...)
   }, mc.cores = cores)
+  attr(res, "start_parms") <- start_parms
   class(res) <- c("multistart.saem.mmkin", "multistart")
   return(res)
 }
diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd
index b5b24449..f96b4d22 100644
--- a/man/mkinfit.Rd
+++ b/man/mkinfit.Rd
@@ -23,8 +23,8 @@ mkinfit(
   atol = 1e-08,
   rtol = 1e-10,
   error_model = c("const", "obs", "tc"),
-  error_model_algorithm = c("auto", "d_3", "direct", "twostep", "threestep",
-    "fourstep", "IRLS", "OLS"),
+  error_model_algorithm = c("auto", "d_3", "direct", "twostep", "threestep", "fourstep",
+    "IRLS", "OLS"),
   reweight.tol = 1e-08,
   reweight.max.iter = 10,
   trace_parms = FALSE,
diff --git a/man/multistart.Rd b/man/multistart.Rd
index ff60b01d..347b12fb 100644
--- a/man/multistart.Rd
+++ b/man/multistart.Rd
@@ -3,11 +3,17 @@
 \name{multistart}
 \alias{multistart}
 \alias{multistart.saem.mmkin}
+\alias{print.multistart}
+\alias{summary.multistart.saem.mmkin}
 \title{Perform a hierarchical model fit with multiple starting values}
 \usage{
 multistart(object, n = 50, cores = 1, ...)
 
 \method{multistart}{saem.mmkin}(object, n = 50, cores = 1, ...)
+
+\method{print}{multistart}(x, ...)
+
+\method{summary}{multistart.saem.mmkin}(object)
 }
 \arguments{
 \item{object}{The fit object to work with}
diff --git a/man/saem.Rd b/man/saem.Rd
index a202f52f..dfb652b6 100644
--- a/man/saem.Rd
+++ b/man/saem.Rd
@@ -6,6 +6,7 @@
 \alias{print.saem.mmkin}
 \alias{saemix_model}
 \alias{saemix_data}
+\alias{parms.saem.mmkin}
 \title{Fit nonlinear mixed models with SAEM}
 \usage{
 saem(object, ...)
@@ -40,6 +41,8 @@ saemix_model(
 )
 
 saemix_data(object, verbose = FALSE, ...)
+
+\method{parms}{saem.mmkin}(x, ci = FALSE, ...)
 }
 \arguments{
 \item{object}{An \link{mmkin} row object containing several fits of the same
@@ -84,6 +87,9 @@ and the end of the optimisation process?}
 \item{x}{An saem.mmkin object to print}
 
 \item{digits}{Number of digits to use for printing}
+
+\item{ci}{Should a matrix with estimates and confidence interval boundaries
+be returned? If FALSE (default), a vector of estimates is returned.}
 }
 \value{
 An S3 object of class 'saem.mmkin', containing the fitted