ns_to_percents works on a data.frame with just one numeric col

closes #89
sfirke · Mar 22, 2017 · bf9b39f · bf9b39f
1 parent c79e6cb
commit bf9b39f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/R/ns_to_percents.R b/R/ns_to_percents.R
@@ -38,13 +38,13 @@ ns_to_percents <- function(dat, denom = "row", na.rm = TRUE, total_n = NULL){
 
 
   if(denom == "row"){
-    row_sum <- rowSums(dat[, numeric_cols], na.rm = na.rm)
-    dat[, numeric_cols] <- dat[, numeric_cols] / row_sum 
+    row_sum <- rowSums(dat[numeric_cols], na.rm = na.rm)
+    dat[, numeric_cols] <- dat[numeric_cols] / row_sum 
   } else if(denom == "col"){
-    col_sum <- colSums(dat[, numeric_cols], na.rm = na.rm)
-    dat[, numeric_cols] <- sweep(dat[, numeric_cols], 2, col_sum,`/`) # from http://stackoverflow.com/questions/9447801/dividing-columns-by-colsums-in-r
+    col_sum <- colSums(dat[numeric_cols], na.rm = na.rm)
+    dat[, numeric_cols] <- sweep(dat[numeric_cols], 2, col_sum,`/`) # from http://stackoverflow.com/questions/9447801/dividing-columns-by-colsums-in-r
   } else if(denom == "all"){
-    dat[, numeric_cols] <- dat[, numeric_cols] / complete_n 
+    dat[numeric_cols] <- dat[numeric_cols] / complete_n 
   }
 
   dat 

diff --git a/tests/testthat/test-ns-to-percents.R b/tests/testthat/test-ns-to-percents.R
@@ -87,4 +87,13 @@ test_that("override value total_n functions correctly", {
                cbind(data.frame(cyl = c(4, 6, 8)),
                      ns_to_percents(source1, denom = "all")[, -1] / 10) # divide by 10 because the mtcars n = 32
   )
+})
+
+test_that("works with a single numeric column per #89", {
+  dat <- data.frame(Operation = c("Login", "Posted", "Deleted"), `Total Count` = c(5, 25, 40), check.names = FALSE)
+  expect_equal(dat %>% ns_to_percents("col"),
+               data.frame(Operation = c("Login", "Posted", "Deleted"),
+                          `Total Count` = c(5/70, 25/70, 40/70),
+                          check.names = FALSE)
+  )
 })