[Returnanalytics-commits] r3112 - pkg/PortfolioAnalytics/demo

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

Author: rossbennett34
Date: 2013-09-15 23:18:08 +0200 (Sun, 15 Sep 2013)
New Revision: 3112

Modified:
   pkg/PortfolioAnalytics/demo/demo_efficient_frontier.R
   pkg/PortfolioAnalytics/demo/demo_group_ROI.R
   pkg/PortfolioAnalytics/demo/demo_random_portfolios.R
Log:
Minor cleanup of some demo scripts.

Modified: pkg/PortfolioAnalytics/demo/demo_efficient_frontier.R
===================================================================
--- pkg/PortfolioAnalytics/demo/demo_efficient_frontier.R	2013-09-15 18:50:30 UTC (rev 3111)
+++ pkg/PortfolioAnalytics/demo/demo_efficient_frontier.R	2013-09-15 21:18:08 UTC (rev 3112)
@@ -10,8 +10,6 @@
 require(ROI.plugin.quadprog)
 require(ROI.plugin.glpk)
 
-rm(list=ls())
-
 data(edhec)
 R <- edhec[, 1:5]
 # change the column names for better legends in plotting

Modified: pkg/PortfolioAnalytics/demo/demo_group_ROI.R
===================================================================
--- pkg/PortfolioAnalytics/demo/demo_group_ROI.R	2013-09-15 18:50:30 UTC (rev 3111)
+++ pkg/PortfolioAnalytics/demo/demo_group_ROI.R	2013-09-15 21:18:08 UTC (rev 3112)
@@ -2,7 +2,7 @@
 library(PortfolioAnalytics)
 library(ROI)
 library(ROI.plugin.quadprog)
-library(ROI.plugin.quadprog)
+library(ROI.plugin.glpk)
 
 
 data(edhec)

Modified: pkg/PortfolioAnalytics/demo/demo_random_portfolios.R
===================================================================
--- pkg/PortfolioAnalytics/demo/demo_random_portfolios.R	2013-09-15 18:50:30 UTC (rev 3111)
+++ pkg/PortfolioAnalytics/demo/demo_random_portfolios.R	2013-09-15 21:18:08 UTC (rev 3112)
@@ -24,8 +24,8 @@
 # The multicore package, and therefore registerDoMC, should not be used in a
 # GUI environment, because multiple processes then share the same GUI. Only use
 # when running from the command line
-require(doMC)
-registerDoMC(3)
+# require(doMC)
+# registerDoMC(3)
 
 data(edhec)