[Blotter-commits] r1715 - in pkg/quantstrat: . R

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

Author: bodanker
Date: 2015-11-15 00:36:49 +0100 (Sun, 15 Nov 2015)
New Revision: 1715

Modified:
   pkg/quantstrat/DESCRIPTION
   pkg/quantstrat/NAMESPACE
   pkg/quantstrat/R/paramsets.R
Log:
Import iterators::iter

And remove now-unnecessary require() calls. See R-Forge issue #5795.


Modified: pkg/quantstrat/DESCRIPTION
===================================================================
--- pkg/quantstrat/DESCRIPTION	2015-11-14 15:57:10 UTC (rev 1714)
+++ pkg/quantstrat/DESCRIPTION	2015-11-14 23:36:49 UTC (rev 1715)
@@ -11,6 +11,7 @@
     FinancialInstrument(>= 0.12.5),
     foreach(>= 1.4.0)
 Imports:
+    iterators,
     zoo
 Suggests:
     PerformanceAnalytics,

Modified: pkg/quantstrat/NAMESPACE
===================================================================
--- pkg/quantstrat/NAMESPACE	2015-11-14 15:57:10 UTC (rev 1714)
+++ pkg/quantstrat/NAMESPACE	2015-11-14 23:36:49 UTC (rev 1715)
@@ -67,4 +67,5 @@
 import(quantmod)
 import(xts)
 import(zoo)
+importFrom(iterators,iter)
 useDynLib(quantstrat)

Modified: pkg/quantstrat/R/paramsets.R
===================================================================
--- pkg/quantstrat/R/paramsets.R	2015-11-14 15:57:10 UTC (rev 1714)
+++ pkg/quantstrat/R/paramsets.R	2015-11-14 23:36:49 UTC (rev 1715)
@@ -40,12 +40,6 @@
 # TODO: fix expand.grid
 # TODO: "and" multiple constraints i.o. "or"
 
-
-#require(foreach, quietly=TRUE)
-require('foreach')
-#require(iterators, quietly=TRUE)
-require('iterators')
-
 # creates a copy of a portfolio, stripping all history (transactions etc)
 
 clone.portfolio <- function(portfolio.st, cloned.portfolio.st, strip.history=TRUE)
@@ -367,6 +361,7 @@
 #' @author Jan Humme
 #' @export
 #' @seealso \code{\link{add.distribution.constraint}}, \code{\link{add.distribution.constraint}}, \code{\link{delete.paramset}}
+#' @importFrom iterators iter
 
 apply.paramset <- function(strategy.st, paramset.label, portfolio.st, account.st, mktdata=NULL, nsamples=0, user.func=NULL, user.args=NULL, calc='slave', audit=NULL, packages=NULL, verbose=FALSE, paramsets, ...)
 {