[Uwgarp-commits] r80 - pkg/GARPFRM/R

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

Author: tfillebeen
Date: 2014-02-09 01:15:07 +0100 (Sun, 09 Feb 2014)
New Revision: 80

Modified:
   pkg/GARPFRM/R/EWMA.R
Log:
ignore commits resolved conflicting issues.

Modified: pkg/GARPFRM/R/EWMA.R
===================================================================
--- pkg/GARPFRM/R/EWMA.R	2014-02-08 23:08:01 UTC (rev 79)
+++ pkg/GARPFRM/R/EWMA.R	2014-02-09 00:15:07 UTC (rev 80)
@@ -127,9 +127,9 @@
 
 #' @method getCov EWMAVar
 #' @S3method getCov EWMAVar
-getCov.EWMAVar <- function(object, asset1, asset2){
-  if(!inherits(object, "EWMAVar")) stop("object must be of class EWMAVar")
-  if (is.null(asset2) == FALSE) {warning("Running univariate EWMA leave asset2 unspecified")}
+getCov.EWMAVar <- function(object, asset1, asset2=NULL){
+  if(!inherits(object, "EWMAVar")) stop("Object must be of class EWMAVar")
+  if (is.null(asset2) == FALSE) {warning("Running univariate no need to specify asset2")}
   # Manipulate object for feasible use  
   # object[[length(object)]] = NULL
   
@@ -190,7 +190,7 @@
 
 # EWMA plotting for covar
 #' @export
-plot.EWMACovar <- function(object, asset1, asset2){
+plot.EWMACovar <- function(object,..., asset1, asset2){
   # Check if asset is a character 
   if(is.character(asset1) & is.character(asset2)){
     idx1 = grep(asset1, colnames(object[[1]]))
@@ -223,7 +223,7 @@
 
 # EWMA plotting for correlation
 #' @export
-plot.EWMACor <- function(object, ...,asset1, asset2){
+plot.EWMACor <- function(object,...,asset1, asset2){
   # Check if asset is a character 
   if(is.character(asset1) & is.character(asset2)){
     idx1 = grep(asset1, colnames(object[[1]]))