Merge branch 'nicolas95870-develop'

DESCRIPTION

@@ -28,11 +28,12 @@ Depends:
 Imports: 
     assertthat,
     devtools,
-    dplyr (>= 0.8.0),
+    dplyr,
     ggplot2,
     lazyeval,
     lubridate,
     magrittr,
+    methods,
     officer,
     rvg,
     stats,

NAMESPACE

@@ -39,6 +39,7 @@ importFrom(ggplot2,is.ggplot)
 importFrom(lazyeval,interp)
 importFrom(lubridate,is.POSIXt)
 importFrom(magrittr,"%>%")
+importFrom(methods,is)
 importFrom(officer,add_slide)
 importFrom(officer,ph_location_type)
 importFrom(officer,ph_with)

R/as_numeric.R

@@ -1,35 +1,42 @@
-
-#' transform a vector into numeric
+#' Transform a vector into numeric if meaningful, even with bad decimal, space or \%
 #'
 #' @param vec a vector
 #'
 #' @return a numeric vector
+#' @details Note that text and factors are not transformed as numeric (except FALSE, TRUE, F, T),
+#' contrary to R default behavior with `as.numeric(factor())`
+#' @importFrom methods is
 #' @export
-#'
-
-as_mon_numeric<-function(vec){
-  if (is.character(vec)){
-    vec<-as.factor(vec)
+#' @examples
+#' as_mon_numeric(c("1", "0", "1"))
+#' as_mon_numeric(c("1.3", "1,5", "1;6", "16%", "17 87 "))
+#' as_mon_numeric(c(TRUE, "A", "F"))
+#' as_mon_numeric(c(TRUE, TRUE, FALSE))
+#' as_mon_numeric(factor(c("toto", "tata", "toto")))
+as_mon_numeric <- function(vec) {
+  assertthat::assert_that(not_empty(vec))
+  assertthat::assert_that("vector" %in% is(vec))
+
+  if (is.character(vec)) {
+    vec <- as.factor(vec)
   }
 
-  if (is.factor(vec)){
-    levels(vec)<-gsub("^FALSE$",0,levels(vec))
-    levels(vec)<-gsub("^TRUE$",1,levels(vec))
-    levels(vec)<-gsub("^F$",0,levels(vec))
-    levels(vec)<-gsub("^T$",1,levels(vec))
+  if (is.factor(vec)) {
+    levels(vec) <- gsub("^FALSE$", 0, levels(vec))
+    levels(vec) <- gsub("^TRUE$", 1, levels(vec))
+    levels(vec) <- gsub("^F$", 0, levels(vec))
+    levels(vec) <- gsub("^T$", 1, levels(vec))
   }
 
-  if (is.logical(vec)){
+  if (is.logical(vec)) {
     return(as.numeric(vec))
   }
 
-  out<-gsub("%","",vec)
-  out<-gsub(" ","",out)
-  out <-gsub(",",".",out)
-  out <-gsub(";",".",out)
-  out<-as.numeric(as.character(out))
+  out <- gsub("%", "", vec)
+  out <- gsub(" ", "", out)
+  out <- gsub(",", ".", out)
+  out <- gsub(";", ".", out)
+  out <- as.numeric(as.character(out))
 
   return(out)
 }
-
-

devstuff_history.R

@@ -33,3 +33,8 @@ usethis::pr_fetch(15)
 
 # Development
 devtools::check()
+
+# test unitaire
+
+usethis::use_test("as_numeric.R")
+devtools::test()

tests/testthat/test-as_numeric.R

@@ -0,0 +1,14 @@
+test_that("Output is a vector and numeric", {
+  expect_true(is.vector(as_mon_numeric(c(FALSE, 0, "0"))))
+  expect_true(is.numeric(as_mon_numeric(c(FALSE, 0, "0"))))
+  expect_true(is.numeric(as_mon_numeric(c("1.3", "1,5", "1;6", "16%", "17 87 "))))
+  expect_equal(as_mon_numeric(c("1.3", "1,5", "1;6", "16%", "17 87 ")),
+               c(1.3, 1.5, 1.6, 16, 1787))
+  expect_equal(as_mon_numeric(c(TRUE, "A", "F")), c(1, NA, 0))
+  expect_equal(as_mon_numeric(c(TRUE, T, F)), c(1, 1, 0))
+  expect_true(all(is.na(as_mon_numeric(factor(c("toto", "tata", "toto"))))))
+})
+
+test_that("Output and input has same length", {
+  expect_equal(length(c(FALSE, 0, "0")), length((as_mon_numeric(c(FALSE, 0, "0")))))
+})