[Rcsi-commits] r22 - in pkg: . R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Dec 27 20:51:27 CET 2008
Author: alexios1175
Date: 2008-12-27 20:51:26 +0100 (Sat, 27 Dec 2008)
New Revision: 22
Added:
pkg/man/as.data.frame-methods.Rd
Removed:
pkg/man/Data-methods.Rd
Modified:
pkg/DESCRIPTION
pkg/NAMESPACE
pkg/R/futureSpecs.R
pkg/R/futuresData.R
pkg/R/stockData.R
pkg/man/contractList-class.Rd
pkg/man/contractList-methods.Rd
pkg/man/futureSurface-methods.Rd
pkg/man/futuresData-class.Rd
pkg/man/futuresData-methods.Rd
pkg/man/stockData-class.Rd
pkg/man/stockData-methods.Rd
Log:
as.data.frame coercion method replaces Data
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/DESCRIPTION 2008-12-27 19:51:26 UTC (rev 22)
@@ -1,8 +1,8 @@
Package: RCSI
Type: Package
Title: An S4 interface to the CSI UA API
-Version: 1.21
-Date: 2008-08-14
+Version: 1.20
+Date: 2008-12-27
Author: Alexios Ghalanos <alexios at 4dscape.com>
Maintainer: Alexios Ghalanos <alexios at 4dscape.com>
Description: Provides methods and functions to access the CSI UA API for data retrieval
Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/NAMESPACE 2008-12-27 19:51:26 UTC (rev 22)
@@ -19,7 +19,7 @@
export("stockData","stockFundamentals")
export("marketProfile")
export("futureSurface")
-exportMethods("show","Data")
+exportMethods("show","as.data.frame")
export(startUA,stopUA)
exportMethods(
"accumulationMethod<-",
Modified: pkg/R/futureSpecs.R
===================================================================
--- pkg/R/futureSpecs.R 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/R/futureSpecs.R 2008-12-27 19:51:26 UTC (rev 22)
@@ -47,7 +47,7 @@
cat(paste("\nApply Commodity Adjustments :",as.logical(object at ApplyCommodityAdjustments)))
cat(paste("\nUse Alternate BackAdjuster :",as.logical(object at UseAlternateBackAdjuster)))
cat(paste("\nRaise Neg BackAdjust Series :",as.logical(object at RaiseNegBackAdjustSeries)))
- cat(paste("\nNo. Days Confirmation :",object at NumDaysConfirmation))
+ cat(paste("\nNo. Days Confirmation :",object at RaiseNegBackAdjustSeries))
cat(paste("\nClose Out Of Range Adjustment Method :",object at CloseOutOfRangeAdjustment))
cat(paste("\nRound To Tick :",as.logical(object at RoundToTick)))
cat(paste("\nUse Tradeable Tick :",as.logical(object at UseTradeableTick)))
Modified: pkg/R/futuresData.R
===================================================================
--- pkg/R/futuresData.R 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/R/futuresData.R 2008-12-27 19:51:26 UTC (rev 22)
@@ -12,10 +12,10 @@
UseMethod("Data")
}
-setMethod("Data",
- signature(object="FUTURESDATA"),
- function(object){
- object at data
+setMethod("as.data.frame",
+ signature(x="FUTURESDATA"),
+ function(x, row.names = NULL, optional = FALSE, ...){
+ x at data
})
setMethod("show",
@@ -282,10 +282,10 @@
cat(paste("\nNo. of Contracts:",object at numContracts,"\n\n"))
})
-setMethod("Data",
- signature(object="CONTRACTLIST"),
- function(object){
- object at contracts
+setMethod("as.data.frame",
+ signature(x="CONTRACTLIST"),
+ function(x, row.names = NULL, optional = FALSE, ...){
+ as.data.frame(x at contracts)
})
contractList<-function(symbol, csinum, stock=TRUE, option=FALSE)
Modified: pkg/R/stockData.R
===================================================================
--- pkg/R/stockData.R 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/R/stockData.R 2008-12-27 19:51:26 UTC (rev 22)
@@ -6,10 +6,10 @@
data = "data.frame")
)
-setMethod("Data",
- signature(object="STOCKDATA"),
- function(object){
- object at data
+setMethod("as.data.frame",
+ signature(x="STOCKDATA"),
+ function(x, row.names = NULL, optional = FALSE, ...){
+ x at data
})
setMethod("show",
Deleted: pkg/man/Data-methods.Rd
===================================================================
--- pkg/man/Data-methods.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/Data-methods.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -1,20 +0,0 @@
-\name{Data-methods}
-\docType{methods}
-\alias{Data-methods}
-\alias{Data}
-\alias{Data,CONTRACTLIST-method}
-\alias{Data,FUTURESDATA-method}
-\alias{Data,STOCKDATA-method}
-\title{Data Extraction}
-\description{
-Extracts data from objects.
-}
-\section{Methods}{
-\describe{
-\item{object = \code{\linkS4class{CONTRACTLIST}}:}{Extracts the contract list from the object}
-\item{object = \code{\linkS4class{FUTURESDATA}}:}{Extracts the future series}
-\item{object = \code{\linkS4class{STOCKDATA}}:}{Extracts the stock/mutual fund series}
-}}
-\keyword{methods}
-
-
Added: pkg/man/as.data.frame-methods.Rd
===================================================================
--- pkg/man/as.data.frame-methods.Rd (rev 0)
+++ pkg/man/as.data.frame-methods.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -0,0 +1,20 @@
+\name{as.data.frame-methods}
+\docType{methods}
+\alias{as.data.frame-methods}
+\alias{as.data.frame}
+\alias{as.data.frame,CONTRACTLIST-method}
+\alias{as.data.frame,FUTURESDATA-method}
+\alias{as.data.frame,STOCKDATA-method}
+\title{Data Extraction}
+\description{
+Coercion of object to data.frame.
+}
+\section{Methods}{
+\describe{
+\item{x = \code{\linkS4class{CONTRACTLIST}}:}{Extracts the contract list from the object}
+\item{x = \code{\linkS4class{FUTURESDATA}}:}{Extracts the future series}
+\item{x = \code{\linkS4class{STOCKDATA}}:}{Extracts the stock/mutual fund series}
+}}
+\keyword{methods}
+
+
Modified: pkg/man/contractList-class.Rd
===================================================================
--- pkg/man/contractList-class.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/contractList-class.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -17,14 +17,17 @@
}
}
\section{Methods}{
-Methods for summary (show) and extraction (Data) from the object.
+Methods for summary (show) and extraction (as.data.frame) from the object.
}
\references{Unfair Advantage API-2 Functional Specification, Commodity Systems Incorporated 1998}
\author{Alexios Ghalanos}
\examples{
\dontrun{
-ans = contractList(symbol = "SP", stock = FALSE, option = FALSE)
-show(ans)
-Data(ans)}
+#get S&P 500 futures contract list
+sp.list <- contractList(symbol = "SP", stock = FALSE,option = FALSE)
+show(sp.list)
+#extract contracts available
+spcontracts.df<-as.data.frame(sp.list)
+head(spcontracts.df)
}
\keyword{classes}
Modified: pkg/man/contractList-methods.Rd
===================================================================
--- pkg/man/contractList-methods.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/contractList-methods.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -26,6 +26,8 @@
#get S&P 500 futures contract list
sp.list <- contractList(symbol = "SP", stock = FALSE,option = FALSE)
show(sp.list)
-#get contracts available
-Data(sp.list)}
+#extract contracts available
+spcontracts.df<-as.data.frame(sp.list)
+head(spcontracts.df)
+}
}
\ No newline at end of file
Modified: pkg/man/futureSurface-methods.Rd
===================================================================
--- pkg/man/futureSurface-methods.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/futureSurface-methods.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -52,6 +52,6 @@
fspec <- futureSpecs()
sp.surface <- futureSurface(symbol = "SP", futureSpecs=fspec, freq="d", startYear=1990, value="Close")
show(sp.surface)
-head(Data(sp.surface)})
+head(as.data.frame(sp.surface)})
}
\keyword{methods}
\ No newline at end of file
Modified: pkg/man/futuresData-class.Rd
===================================================================
--- pkg/man/futuresData-class.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/futuresData-class.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -29,9 +29,10 @@
\dontrun{
fspec <- futureSpecs()
mspec <- methodSpecs(method = "BackAdjusted")
-# using -1 for first and last date returns complete availavle history
-sp.obj<-futuresData(symbol = "SP", firstDate= -1, lastDate= -1, methodSpecs = mspec, futureSpecs = fspec, freq = "d")
+sp.obj <- futuresData(symbol = "SP", firstDate= -1, lastDate= -1, methodSpecs = mspec, futureSpecs = fspec, freq = "w")
show(sp.obj)
-sp.data<-Data(sp.obj)}
+# extract data
+sp.df<-as.data.frame(sp.obj)
+head(sp.df)}
}
\keyword{classes}
Modified: pkg/man/futuresData-methods.Rd
===================================================================
--- pkg/man/futuresData-methods.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/futuresData-methods.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -44,5 +44,7 @@
mspec <- methodSpecs(method = "BackAdjusted")
sp.obj <- futuresData(symbol = "SP", firstDate= -1, lastDate= -1, methodSpecs = mspec, futureSpecs = fspec, freq = "w")
show(sp.obj)
-Data(sp.obj)}
+# extract data
+sp.df<-as.data.frame(sp.obj)
+head(sp.df)}
}
\ No newline at end of file
Modified: pkg/man/stockData-class.Rd
===================================================================
--- pkg/man/stockData-class.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/stockData-class.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -26,8 +26,9 @@
\examples{
\dontrun{
spec <- stockSpecs()
-ibm.obj<-stockData(symbol="IBM", firstDate=-1, lastDate=-1, stockSpecs=spec, freq ="d")
-ibm.obj
-ibm.data<-Data(ibm.obj)}
+ans <- stockData(symbol="IBM",firstDate = -1, lastDate = -1, stockSpecs = spec, freq ="d")
+# extract data
+ibm.df<-as.data.frame(ans)
+head(ibm.df)}
}
\keyword{classes}
\ No newline at end of file
Modified: pkg/man/stockData-methods.Rd
===================================================================
--- pkg/man/stockData-methods.Rd 2008-09-09 20:06:46 UTC (rev 21)
+++ pkg/man/stockData-methods.Rd 2008-12-27 19:51:26 UTC (rev 22)
@@ -39,5 +39,8 @@
\dontrun{
spec <- stockSpecs()
ans <- stockData(symbol="IBM",firstDate = -1, lastDate = -1, stockSpecs = spec, freq ="d")
-ans}
+# extract data
+ibm.df<-as.data.frame(ans)
+head(ibm.df)
+}
}
\ No newline at end of file
More information about the Rcsi-commits
mailing list