Merge 9e6891a into ad001b9

markvanderloo · Jun 12, 2017 · bb1fc0e · bb1fc0e
2 parents ad001b9 + 9e6891a
commit bb1fc0e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/R/gower.R b/pkg/R/gower.R
@@ -111,6 +111,14 @@ gower_work <- function(x, y, pair_x, pair_y, n, eps, nthread){
   }
 
   factor_pair <- as.integer(sapply(x,is.factor))
+  # check factor levels
+  for (i in seq_along(pair)) {
+    if (factor_pair[i] && 
+        !isTRUE(all.equal(levels(x[[i]]), levels(y[[pair[i]]]))))
+      stop("Levels in column ", i, " of x do  not match those of column ", 
+        pair[i], " in y.")
+  }
+
   eps <- as.double(eps)
   # translate to C-indices (base-0).
   pair <- as.integer(pair-1L)

diff --git a/pkg/tests/testthat/test_gower.R b/pkg/tests/testthat/test_gower.R
@@ -62,9 +62,16 @@ test_that("exceptions",{
   ))
 
   expect_warning(gower_dist(data.frame(x=rep(1,100)), data.frame(x=1,100)))
+
+  expect_error(gower_dist(
+    data.frame(a = letters[1:3], stringsAsFactors = TRUE),
+    data.frame(a = letters[2:4], stringsAsFactors = TRUE)
+  ))
 })
 
 
+
+
 context("Top-n")
 
 test_that("gower_topn",{