[Lme4-commits] r1493 - pkg/lme4Eigen/R

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

Author: dmbates
Date: 2011-12-28 21:08:35 +0100 (Wed, 28 Dec 2011)
New Revision: 1493

Modified:
   pkg/lme4Eigen/R/lmer.R
Log:
Change maximum iterations error to a warning.


Modified: pkg/lme4Eigen/R/lmer.R
===================================================================
--- pkg/lme4Eigen/R/lmer.R	2011-12-28 19:00:15 UTC (rev 1492)
+++ pkg/lme4Eigen/R/lmer.R	2011-12-28 20:08:35 UTC (rev 1493)
@@ -216,8 +216,12 @@
                           nM$setMaxeval(1000L)
                           nM$setFtolAbs(1e-5)
                           while ((nMres <- nM$newf(devfun(nM$xeval()))) == 0L) {}
-                          if (nMres < 0L)
-                              stop("convergence failure, code ", nMres, " in NelderMead")
+                          if (nMres < 0L) {
+                              if (nMres > -4L)
+                                  stop("convergence failure, code ", nMres, " in NelderMead")
+                              else
+                                  warning("failure to converge in 1000 evaluations")
+                          }
                           list(fval=nM$value(), pars=nM$xpos(), code=nMres)
                       })
     }