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

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

Author: dmbates
Date: 2011-12-28 19:57:58 +0100 (Wed, 28 Dec 2011)
New Revision: 1490

Modified:
   pkg/lme4Eigen/R/AllClass.R
Log:
Extended and exported the NelderMead class


Modified: pkg/lme4Eigen/R/AllClass.R
===================================================================
--- pkg/lme4Eigen/R/AllClass.R	2011-12-28 18:57:03 UTC (rev 1489)
+++ pkg/lme4Eigen/R/AllClass.R	2011-12-28 18:57:58 UTC (rev 1490)
@@ -487,19 +487,24 @@
                          xtol    <<- xt
                          Ptr <<- .Call(NelderMead_Create, lowerbd, upperbd, xstep, x0, xtol)
                      },
-                     ptr        =  function() {
+                     ptr          = function() {
                          if (length(lowerbd)) 
                              if (.Call(isNullExtPtr, Ptr))
                                  Ptr <<- .Call(NelderMead_Create, lowerbd, upperbd, xstep, x0, xtol)
                          Ptr
                      },
-                     newf       = function(value) {
+                     newf         = function(value) {
                          stopifnot(length(value <- as.numeric(value)) == 1L)
                          .Call(NelderMead_newf, ptr(), value)
                      },
-                     value      = function() .Call(NelderMead_value, ptr()),
-                     xeval      = function() .Call(NelderMead_xeval, ptr()),
-                     xpos       = function() .Call(NelderMead_xpos, ptr())
+                     setForceStop = function(stp=TRUE) .Call(NelderMead_setForce_stop, ptr(), stp),
+                     setFtolAbs   = function(fta)      .Call(NelderMead_setFtol_abs, ptr(), fta),
+                     setFtolRel   = function(ftr)      .Call(NelderMead_setFtol_rel, ptr(), ftr),
+                     setMaxeval   = function(mxev)     .Call(NelderMead_setMaxeval, ptr(), mxev),
+                     setMinfMax   = function(minf)     .Call(NelderMead_setMinf_max, ptr(), minf),                     
+                     value        = function()         .Call(NelderMead_value, ptr()),
+                     xeval        = function()         .Call(NelderMead_xeval, ptr()),
+                     xpos         = function()         .Call(NelderMead_xpos, ptr())
                      )
             )