Merge pull request #181 from kgoldfeld/genSpline_error_fix

Fixing genSpline error checking

Author: kgoldfeld

R/generate_data.R

@@ -888,33 +888,27 @@ genSpline <- function(dt, newvar, predictor, theta,
 
   # Check arguments
 
-  if (!exists(deparse(substitute(dt)), envir = parent.frame())) {
-    stop("Data table does not exist.")
-  }
-
-  if (!predictor %in% names(dt)) {
-    stop(paste0("Variable ", predictor, " not in data.table"))
-  }
-
-
-  if (!is.character(newvar)) {
-    stop("newvar must be a string")
-  }
+  assertNotMissing(
+    dt = missing(dt), 
+    newvar = missing(newvar), 
+    predictor = missing(predictor), 
+    theta = missing(theta)
+  )
+  
+  assertClass(dt = dt, class = "data.table")
+  assertInDataTable(predictor, dt)
+  assertClass(newvar = newvar, class = "character")
 
   if (!(is.null(newrange))) {
-    rangestr <- unlist(strsplit(as.character(newrange), split = ";", fixed = TRUE))
-    rangenum <- as.numeric(rangestr)
-
-    if (length(rangenum) != 2) {
-      stop("Range not specified as two values")
-    }
-
-    if (!(all(!is.na(rangenum)))) {
-      stop("Non-numbers entered in range")
-    }
+    
+    newrange <- unlist(strsplit(as.character(newrange), split = ";", fixed = TRUE))
+    
+    assertLength(newrange = newrange, length = 2)
+    newrange <- tryCatch(as.numeric(newrange), warning = function(x) NULL)
+    assertClass(newrange = newrange, class = "numeric")
 
-    newmin <- min(rangenum)
-    newmax <- max(rangenum)
+    newmin <- min(newrange)
+    newmax <- max(newrange)
   }
 
   ### All checks passed

tests/testthat/test-generate_data.R

@@ -783,22 +783,22 @@ test_that("genSpline throws errors", {
   expect_error(genSpline( dt = ddd, newvar = "weight",
                            predictor = "x1", theta = theta1,
                            knots = knots, degree = 3,
-                           noise.var = .025), regexp = "Data table does not exist.")
+                           noise.var = .025), regexp = "object 'ddd' not found")
   expect_error(genSpline( dt = dt, newvar = "weight",
                           predictor = "x2", theta = theta1,
                           knots = knots, degree = 3,
-                          noise.var = .025), regexp = "not in data.table")
+                          noise.var = .025), regexp = "Variable x2 not previously defined!")
   expect_error(genSpline( dt = dt, newvar = 5,
                           predictor = "x1", theta = theta1,
                           knots = knots, degree = 3,
-                          noise.var = .025), regexp = "newvar must be a string")
+                          noise.var = .025), regexp = "newvar should be a character")
   expect_error(genSpline( dt = dt, newvar = "weight",
                           predictor = "x1", theta = theta1,
                           knots = knots, degree = 3, newrange = "4;3;2",
-                          noise.var = .025), regexp = "Range not specified as two values")
-  # expect_error(genSpline( dt = dt, newvar = "weight",
-  #                         predictor = "x1", theta = theta1,
-  #                         knots = knots, degree = 3, newrange = "1;a",
-  #                         noise.var = .025), regexp = "Non-numbers entered in range")
+                          noise.var = .025), regexp = "newrange should be of length 2!")
+  expect_error(genSpline( dt = dt, newvar = "weight",
+                          predictor = "x1", theta = theta1,
+                          knots = knots, degree = 3, newrange = "1;a",
+                          noise.var = .025), regexp = "newrange should be a numeric!")
 })