tests

Author: CollinErickson

R/gcf_grid.R

@@ -73,30 +73,31 @@ gcf_grid <-  function (x = seq(0, 1, length.out = nrow(z)),
                        mainminmax=!bar, mainminmax_minmax=TRUE,
                        afterplotfunc=NULL,
                        cex.main=par()$cex.main,
-                       ...) {#browser()
+                       ...) {
   if (missing(z)) {
     if (!missing(x)) {
       if (is.list(x)) {
         z <- x$z
         y <- x$y
         x <- x$x
-      }
-      else {
+      } else {
         z <- x
         x <- seq.int(0, 1, length.out = nrow(z))
       }
+    } else {
+      stop("no 'z' matrix specified")
     }
-    else stop("no 'z' matrix specified")
-  }
-  else if (is.list(x)) {
+  } else if (is.list(x)) {
     y <- x$y
     x <- x$x
   }
-  if (any(diff(x) <= 0) || any(diff(y) <= 0))
+  if (any(diff(x) <= 0) || any(diff(y) <= 0)) {
     stop("increasing 'x' and 'y' values expected")
+  }
 
-  if (any(diff(x) <= 0) || any(diff(y) <= 0)) 
+  if (any(diff(x) <= 0) || any(diff(y) <= 0)) {
     stop("increasing 'x' and 'y' values expected")
+  }
 
 
   t2 <- cbind(expand.grid(x, y), tz=c(z))

tests/testthat/test-gcf_grid.R

@@ -18,8 +18,55 @@ test_that("gcf_grid works", {
   expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), bar=T), NA)
   # pts
   expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), pts=matrix(c(.1,.2,.3,.4),2,2)), NA)
+  expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), pts=c(.1,.2,.3,.4)), NA)
   # Can't reset.par
   expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), reset.par = F))
   # afterplotfunc, not useful, maybe should remove
-  expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), afterplotfunc = function(){print("after")}), NA)
+  expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), afterplotfunc = function(){("after")}), NA)
+  
+  # Lines
+  expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), lines_only = T), NA)
+  expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), with_lines = T), NA)
+  expect_error(gcf_grid(cos(r^2)*exp(-r/(2*pi)), with_lines = T, lines_only = T), NA)
+  
+  # Errors
+  expect_error(gcf_grid()) # No z given
+  expect_error(gcf_grid(x)) # No z given
+  expect_error(gcf_grid(rev(x), y, cos(r^2)*exp(-r/(2*pi))))
+  expect_error(gcf_grid(x, rev(y), cos(r^2)*exp(-r/(2*pi))))
+  
 })
+
+test_that("gcf_func", {
+  p1 <- gcf_func(function(xx){exp(-sum((xx-.5)^2/.1))})
+  p2 <- cf_func(function(xx){exp(-sum((xx-.5)^2/.1))}, gg=T)
+  expect_is(p1, "gg")
+  expect_is(p2, "gg")
+})
+
+test_that("gcf_data", {
+  x <- runif(20)
+  y <- runif(20)
+  z <- exp(-(x-.5)^2-5*(y-.5)^2)# + rnorm(20,0,.05)
+  p1 <- gcf_data(x,y,z)
+  p2 <- cf_data(x,y,z, gg=T)
+  expect_is(p1, "gg")
+  expect_is(p2, "gg")
+})
+
+test_that("gcf", {
+  # Func
+  p1 <- gcf(function(xx){exp(-sum((xx-.5)^2/.1))})
+  p2 <- cf(function(xx){exp(-sum((xx-.5)^2/.1))}, gg=T)
+  expect_is(p1, "gg")
+  expect_is(p2, "gg")
+  
+  # Data
+  x <- runif(20)
+  y <- runif(20)
+  z <- exp(-(x-.5)^2-5*(y-.5)^2)# + rnorm(20,0,.05)
+  p3 <- gcf_data(x,y,z)
+  p4 <- cf_data(x,y,z, gg=T)
+  expect_is(p3, "gg")
+  expect_is(p4, "gg")
+})