add further tests

GeoBosh · Feb 29, 2020 · b359c9a · b359c9a
1 parent 7d0e8f7
commit b359c9a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/R/autocovariances.R b/R/autocovariances.R
@@ -773,21 +773,32 @@ setMethod("modelCoef", c("Autocorrelations", "ComboAutocorrelations", "missing")
 
 setMethod("modelCoef", c("ComboAutocovariances", "Autocovariances", "missing"),
           function(object, convention){
-              object@data["acvf", ]
+              ## 2020-02-29 changing this (here and at similar places) with temporary patch
+              ##     since Lagged2d objects don't have method for "character" (also "logical")
+              ## 
+              ## TODO: UPDATE PACKAGE "lagged" with such methods, if sensible!
+              ##
+              ##      object@data["acvf", ]
+              tmp <- which(rownames(object@data[]) == "acvf")
+              object@data[tmp, ]
           }
           )
 
 ## TODO: to AR model (or filter) using $ar
 
 setMethod("modelCoef", c("ComboAutocovariances", "PartialAutocovariances", "missing"),
           function(object, convention){
-              object@data["pacvf", ]
+              ## object@data["pacvf", ]
+              tmp <- which(rownames(object@data[]) == "pacvf")
+              object@data[tmp, ]
           }
           )
 
 setMethod("modelCoef", c("ComboAutocovariances", "PartialVariances", "missing"),
           function(object, convention){
-              object@data["sigma2", ]
+              ## object@data["sigma2", ]
+              tmp <- which(rownames(object@data[]) == "sigma2")
+              object@data[tmp, ]
           }
           )
 
@@ -802,15 +813,19 @@ setMethod("modelCoef", c("ComboAutocovariances", "VirtualAutocovariances", "miss
 
 setMethod("modelCoef", c("ComboAutocorrelations", "Autocorrelations", "missing"),
           function(object, convention){
-              object@data["acf", ]
+              ## object@data["acf", ]
+              tmp <- which(rownames(object@data[]) == "acf")
+              object@data[tmp, ]
           }
           )
 
 ## TODO: to AR model (or filter) using $ar
 
 setMethod("modelCoef", c("ComboAutocorrelations", "PartialAutocorrelations", "missing"),
           function(object, convention){
-              object@data["pacf", ]
+              ## object@data["pacf", ]
+              tmp <- which(rownames(object@data[]) == "pacf")
+              object@data[tmp, ]
           }
           )
 

diff --git a/tests/testthat/test-autocovariances.R b/tests/testthat/test-autocovariances.R
@@ -5,6 +5,9 @@ test_that("functions in autocorrelations.org work ok", {
     autocovariances(acv1, maxlag = 3)
     autocorrelations(acv1, maxlag = 3)
     autocorrelations(acv1, maxlag = 3, lag_0 = TRUE)
+    partialAutocovariances(acv1, maxlag = 3)
+    partialAutocovariances(as(acv1, "Autocovariances"))
+    partialVariances(as(acv1, "Autocovariances"))
 
     v1 <- rnorm(100)
     autocorrelations(v1)
@@ -34,12 +37,16 @@ test_that("functions in autocorrelations.org work ok", {
     as(v1.acf, "Autocovariances")
     as(v1.acf, "SampleAutocovariances")
 
+    as(v1.acvf, "ComboAutocorrelations")
+    modelCoef(as(v1.acvf, "ComboAutocovariances"), "Autocovariances")
+
     modelCoef(v1.acvf)
     expect_error(modelCoef(v1.acf, "Autocovariances"), 
        "Can.t obtain autocovariances from object from class SampleAutocorrelations")
     modelCoef(v1.acvf, "ComboAutocovariances")
 
     modelCoef(v1.acf, "ComboAutocorrelations")
+    combo_acr <- as(v1.acvf, "ComboAutocorrelations")
     modelCoef(v1.acvf, "ComboAutocorrelations")
 
     modelCoef(v1.acvf, "Autocorrelations")
@@ -48,6 +55,12 @@ test_that("functions in autocorrelations.org work ok", {
     ## modelCoef(v1.acf, "Autocorrelations")
     modelCoef(v1.acf, "PartialAutocorrelations")
 
+    modelCoef(as(v1.acvf, "ComboAutocovariances"), "Autocovariances")
+    modelCoef(as(v1.acvf, "ComboAutocovariances"), "PartialAutocovariances")
+    modelCoef(as(v1.acvf, "ComboAutocovariances"), "PartialVariances")
+    modelCoef(combo_acr, new("Autocorrelations"))
+    modelCoef(combo_acr, new("PartialAutocorrelations"))
+
     v1.acf[1:10] # drop lag zero value (and the class)
     autocorrelations(v1, maxlag = 10, lag_0 = FALSE) # same