[Blotter-commits] r249 - in pkg/FinancialInstrument: . R

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

Author: braverock
Date: 2010-02-23 13:34:08 +0100 (Tue, 23 Feb 2010)
New Revision: 249

Modified:
   pkg/FinancialInstrument/NAMESPACE
   pkg/FinancialInstrument/R/instrument.R
   pkg/FinancialInstrument/R/synthetic.R
Log:
- re-export functions not exported by @alias, props to Josh Ulrich for spotting

Modified: pkg/FinancialInstrument/NAMESPACE
===================================================================
--- pkg/FinancialInstrument/NAMESPACE	2010-02-17 19:07:31 UTC (rev 248)
+++ pkg/FinancialInstrument/NAMESPACE	2010-02-23 12:34:08 UTC (rev 249)
@@ -1,9 +1,15 @@
 export(buildSpread)
+export(currency)
+export(exchange_rate)
+export(future)
+export(future_series)
+export(getInstrument)
+export(is.currency)
 export(is.instrument)
 export(instrument)
-export(future_series)
-export(is.currency)
-export(exchange_rate)
-export(getInstrument)
+export(option)
+export(option_series)
+export(spread)
+export(synthetic)
 export(synthetic.ratio)
 export(volep)

Modified: pkg/FinancialInstrument/R/instrument.R
===================================================================
--- pkg/FinancialInstrument/R/instrument.R	2010-02-17 19:07:31 UTC (rev 248)
+++ pkg/FinancialInstrument/R/instrument.R	2010-02-23 12:34:08 UTC (rev 249)
@@ -73,6 +73,7 @@
           )
 }
 
+#' @export
 stock <- function(primary_id , currency , multiplier, identifiers = NULL, ...){
   stock_temp = instrument(primary_id , currency , multiplier , identifiers = identifiers, ..., type="stock" )
   ## now structure and return
@@ -87,6 +88,7 @@
   )
 }
 
+#' @export
 future <- function(primary_id , currency , multiplier , identifiers = NULL, ..., underlying_id=NULL){
   future_temp = instrument(primary_id , currency , multiplier , identifiers = identifiers, ... , type="future" )
 
@@ -149,6 +151,7 @@
   assign(paste(primary_id, suffix_id, sep="_"), temp_series, envir=as.environment(.instrument))
 }
 
+#' @export
 option <- function(primary_id , currency , multiplier , identifiers = NULL, ..., underlying_id=NULL){
   option_temp = instrument(primary_id , currency , multiplier, identifiers = identifiers, ..., type="option")
 
@@ -170,6 +173,7 @@
   )
 }
 
+#' @export
 option_series <- function(primary_id , suffix_id, first_traded=NULL, expires=NULL, callput=c("call","put"), identifiers = NULL, ...){
   contract<-try(getInstrument(primary_id))
   if(!inherits(contract,"option")) stop("options contract spec must be defined first")
@@ -199,6 +203,7 @@
   assign(paste(primary_id, suffix_id,sep="_"), temp_series, envir=as.environment(.instrument))
 }
 
+#' @export
 currency <- function(primary_id , currency=NULL , multiplier=1 , identifiers = NULL, ...){
   ## now structure and return
   assign(primary_id, structure( list(primary_id = primary_id,

Modified: pkg/FinancialInstrument/R/synthetic.R
===================================================================
--- pkg/FinancialInstrument/R/synthetic.R	2010-02-17 19:07:31 UTC (rev 248)
+++ pkg/FinancialInstrument/R/synthetic.R	2010-02-23 12:34:08 UTC (rev 249)
@@ -11,6 +11,7 @@
 #
 ###############################################################################
 
+#' @export
 synthetic <- function(primary_id , currency , multiplier=1, identifiers = NULL, ..., members=NULL, cl=c("synthetic", "instrument"))
 {
 
@@ -82,6 +83,7 @@
     )
 }
 
+#' @export
 spread <- function(primary_id , currency , members, memberratio, ..., multiplier=1, identifiers = NULL)
 {
     synthetic.ratio(primary_id , currency , multiplier=multiplier, identifiers = NULL, cl=c("spread","synthetic.ratio","synthetic","instrument"), members=members, memberratio=memberratio, ...=...)