[Returnanalytics-commits] r2267 - in pkg/PortfolioAnalytics: . R

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

Author: braverock
Date: 2012-09-01 21:42:17 +0200 (Sat, 01 Sep 2012)
New Revision: 2267

Modified:
   pkg/PortfolioAnalytics/DESCRIPTION
   pkg/PortfolioAnalytics/R/optimize.portfolio.R
Log:
- fixes o the DEoptim optimization solver code to work with new DEoptim arguments


Modified: pkg/PortfolioAnalytics/DESCRIPTION
===================================================================
--- pkg/PortfolioAnalytics/DESCRIPTION	2012-09-01 17:18:39 UTC (rev 2266)
+++ pkg/PortfolioAnalytics/DESCRIPTION	2012-09-01 19:42:17 UTC (rev 2267)
@@ -2,7 +2,7 @@
 Type: Package
 Title: Portfolio Analysis, including Numeric Methods for Optimization
     of Portfolios
-Version: 0.8.1
+Version: 0.8.2
 Date: $Date$
 Author: Kris Boudt, Peter Carl, Brian G. Peterson
 Contributors: Hezky Varon, Guy Yollin

Modified: pkg/PortfolioAnalytics/R/optimize.portfolio.R
===================================================================
--- pkg/PortfolioAnalytics/R/optimize.portfolio.R	2012-09-01 17:18:39 UTC (rev 2266)
+++ pkg/PortfolioAnalytics/R/optimize.portfolio.R	2012-09-01 19:42:17 UTC (rev 2267)
@@ -168,7 +168,7 @@
 		if(!hasArg(c)) DEcformals$c=.4 # JADE mutation parameter, this could maybe use some adjustment
         if(!hasArg(storepopfrom)) DEcformals$storepopfrom=1
         if(isTRUE(parallel) && 'package:foreach' %in% search()){
-            if(!hasArg(parallelType) ) DEcformals$parallelType=1 #use all cores
+            if(!hasArg(parallelType) ) DEcformals$parallelType='auto' #use all cores
             if(!hasArg(packages) ) DEcformals$packages <- names(sessionInfo()$otherPkgs) #use all packages
         }