[Blotter-commits] r767 - pkg/FinancialInstrument/R

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

Author: gsee
Date: 2011-09-11 04:58:43 +0200 (Sun, 11 Sep 2011)
New Revision: 767

Modified:
   pkg/FinancialInstrument/R/synthetic.R
Log:
use getInstrument instead of deprecated getRoot

Modified: pkg/FinancialInstrument/R/synthetic.R
===================================================================
--- pkg/FinancialInstrument/R/synthetic.R	2011-09-09 19:22:50 UTC (rev 766)
+++ pkg/FinancialInstrument/R/synthetic.R	2011-09-11 02:58:43 UTC (rev 767)
@@ -210,8 +210,8 @@
 	
 	# go get other instrument quantities from the root contract
 	root_contract<-try(getInstrument(root_id,silent=TRUE))
-    if (!is.instrument(root_contract)) root_contract <- try(getRoot(root_id,'future'),silent=TRUE)
-    if (!is.instrument(root_contract)) root_contract <- try(getRoot(root_id,'option'),silent=TRUE)
+    if (!is.instrument(root_contract)) root_contract <- try(getInstrument(root_id,type='future'),silent=TRUE)
+    if (!is.instrument(root_contract)) root_contract <- try(getInstrument(root_id,type='option'),silent=TRUE)
 	if(is.instrument(root_contract)){
 		if(is.null(currency)) currency <- root_contract$currency
 		if(is.null(multiplier)) multiplier <- root_contract$multiplier