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

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

Author: bodanker
Date: 2015-01-14 00:03:12 +0100 (Wed, 14 Jan 2015)
New Revision: 1669

Modified:
   pkg/quantstrat/DESCRIPTION
   pkg/quantstrat/R/paramsets.R
Log:
- Fix bug #5776 (again); thanks to Aylon for the report
  http://stackoverflow.com/q/27912302/271616


Modified: pkg/quantstrat/DESCRIPTION
===================================================================
--- pkg/quantstrat/DESCRIPTION	2015-01-13 18:28:06 UTC (rev 1668)
+++ pkg/quantstrat/DESCRIPTION	2015-01-13 23:03:12 UTC (rev 1669)
@@ -1,7 +1,7 @@
 Package: quantstrat
 Type: Package
 Title: Quantitative Strategy Model Framework
-Version: 0.9.1665
+Version: 0.9.1669
 Date: $Date$
 Author: Peter Carl, Brian G. Peterson, Joshua Ulrich, Jan Humme
 Depends:

Modified: pkg/quantstrat/R/paramsets.R
===================================================================
--- pkg/quantstrat/R/paramsets.R	2015-01-13 18:28:06 UTC (rev 1668)
+++ pkg/quantstrat/R/paramsets.R	2015-01-13 23:03:12 UTC (rev 1669)
@@ -198,9 +198,9 @@
                     if(strategy$rules[[component.type]][[index]]$label == component.label)
                     {
                         if(variable.name %in% c('timespan'))
-                            strategy$rules[[component.type]][[index]][[variable.name]] <- as.character(param.combo[[param.label]])
+                            strategy$rules[[component.type]][[index]][[variable.name]] <- as.character(param.combo[,param.label])
                         else
-                            strategy$rules[[component.type]][[index]]$arguments[[variable.name]] <- param.combo[[param.label]]
+                            strategy$rules[[component.type]][[index]]$arguments[[variable.name]] <- param.combo[,param.label]
 
                         found <- TRUE
                         break