[Deoptim-commits] r109 - in pkg/DEoptim: . R

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

Author: braverock
Date: 2012-09-01 21:38:30 +0200 (Sat, 01 Sep 2012)
New Revision: 109

Modified:
   pkg/DEoptim/DESCRIPTION
   pkg/DEoptim/R/DEoptim.R
Log:
- update argument handling in DEoptim.control to avoid missing argument errors


Modified: pkg/DEoptim/DESCRIPTION
===================================================================
--- pkg/DEoptim/DESCRIPTION	2012-07-05 01:19:54 UTC (rev 108)
+++ pkg/DEoptim/DESCRIPTION	2012-09-01 19:38:30 UTC (rev 109)
@@ -1,5 +1,5 @@
 Package: DEoptim
-Version: 2.3
+Version: 2.3.1
 Date: $Date$
 Title: Global optimization by Differential Evolution
 Author: David Ardia, Katharine Mullen, Brian Peterson, Joshua Ulrich

Modified: pkg/DEoptim/R/DEoptim.R
===================================================================
--- pkg/DEoptim/R/DEoptim.R	2012-07-05 01:19:54 UTC (rev 108)
+++ pkg/DEoptim/R/DEoptim.R	2012-09-01 19:38:30 UTC (rev 109)
@@ -89,9 +89,9 @@
               if(missing(parallelArgs) && hasArg(foreachArgs)){
                   parallelArgs<-match.call(expand.dots=TRUE)$foreachArgs
               }   
-              if(is.null(parallelArgs$.packages) && hasArg(packages)){
-                  parallelArgs$.packages<-packages
-              }
+              if(is.null(parallelArgs$.packages) ){
+                  if(hasArg(packages)) parallelArgs$.packages<-match.call(expand.dots=TRUE)$packages
+              } 
           },
           parallel = {
               if(missing(packages) || !hasArg(packages)){
@@ -107,7 +107,7 @@
        = CR, F = F, bs = bs, trace = trace, initialpop = initialpop,
        storepopfrom = storepopfrom, storepopfreq = storepopfreq, p =
        p, c = c, reltol = reltol, steptol = steptol, 
-       parallelType = parallelType, parallelArgs = parallelArgs, ...)
+       parallelType = parallelType, parallelArgs = parallelArgs, ...=match.call(expand.dots = TRUE)$...)
 }
 
 DEoptim <- function(fn, lower, upper, control = DEoptim.control(), ...,