[Lme4-commits] r1751 - in pkg/lme4: . R man

[noreply at r-forge.r-project.org]

Author: dmbates
Date: 2012-05-18 23:37:31 +0200 (Fri, 18 May 2012)
New Revision: 1751

Modified:
   pkg/lme4/NAMESPACE
   pkg/lme4/R/profile.R
   pkg/lme4/man/profile-methods.Rd
Log:
Document an argument in profile.  Create and export an S3 method family.nlsResp


Modified: pkg/lme4/NAMESPACE
===================================================================
--- pkg/lme4/NAMESPACE	2012-05-18 21:35:30 UTC (rev 1750)
+++ pkg/lme4/NAMESPACE	2012-05-18 21:37:31 UTC (rev 1751)
@@ -109,6 +109,7 @@
 S3method(family,glmResp)
 S3method(family,lmResp)
 S3method(family,merMod)
+S3method(family,nlsResp)
 S3method(fitted,merMod)
 S3method(fixef,merMod)
 S3method(formula,lmList)

Modified: pkg/lme4/R/profile.R
===================================================================
--- pkg/lme4/R/profile.R	2012-05-18 21:35:30 UTC (rev 1750)
+++ pkg/lme4/R/profile.R	2012-05-18 21:37:31 UTC (rev 1751)
@@ -14,6 +14,7 @@
 ##' @param delta stepping scale for deciding on next point to profile
 ##' @param verbose level of output from internal calculations
 ##' @param devtol tolerance for fitted deviances less than baseline (supposedly minimum) deviance
+##' @param maxmult maximum multiplier of the original step size allowed, defaults to 10.
 ##' @param startmethod method for picking starting conditions for optimization (STUB)
 ##' @param optimizer (character or function) optimizer to use (see \code{\link{lmer}} for details)
 ##' @param \dots potential further arguments for \code{profile} methods.
@@ -151,7 +152,7 @@
             ns <- nextstart(mat, cc-1, i, startmethod)
             mat[i + 1L, ] <- zetafun(np,ns)
             if (verbose>0) {
-                cat(i,cc,np,mat[i+1L,],"\n")
+                cat(i,cc,mat[i+1L,],"\n")
             }
             i <- i + 1L
         }
@@ -216,7 +217,7 @@
 ### be determined from recent starting values, not always the global
 ### optimum values.
 
-### Can do this most easily by taking the most recent by taking the change in the other parameter values at
+### Can do this most easily by taking the change in the other parameter values at
 ### the two last points and extrapolating.
 
 

Modified: pkg/lme4/man/profile-methods.Rd
===================================================================
--- pkg/lme4/man/profile-methods.Rd	2012-05-18 21:35:30 UTC (rev 1750)
+++ pkg/lme4/man/profile-methods.Rd	2012-05-18 21:37:31 UTC (rev 1751)
@@ -40,6 +40,9 @@
   \item{devtol}{tolerance for fitted deviances less than
   baseline (supposedly minimum) deviance}
 
+  \item{maxmult}{maximum multiplier of the original step
+  size allowed, defaults to 10.}
+
   \item{startmethod}{method for picking starting conditions
   for optimization (STUB)}