Merge branch 'release-0.1.3'

NAMESPACE

@@ -3,8 +3,8 @@
 export("%>%")
 export(check_missing)
 export(check_missing_)
-export(ifelse_routine)
-export(ifelse_routine_)
+export(grp_routine)
+export(grp_routine_)
 export(ind_to_char)
 export(ind_to_char_)
 export(pct_routine)

R/ifelse_routine.R → R/grp_routine.R

@@ -1,6 +1,6 @@
 #' Mutate a character/factor based on conditions.
 #'
-#' \code{ifelse_routine} functions like a serious of nested \code{ifelse} where
+#' \code{grp_routine} functions like a serious of nested \code{ifelse} where
 #' a series of conditions are evaluated and different values are assigned based
 #' on those conditions.
 #'
@@ -11,15 +11,15 @@
 #' @inheritParams ind_to_char
 #'
 #' @export
-#' @example /examples/ifelse_routine_ex.R
-ifelse_routine <- function(data, col, ..., ret_factor = FALSE) {
-  ifelse_routine_(data, col, .dots = lazyeval::lazy_dots(...),
+#' @example /examples/grp_routine_ex.R
+grp_routine <- function(data, col, ..., ret_factor = FALSE) {
+  grp_routine_(data, col, .dots = lazyeval::lazy_dots(...),
                   ret_factor = ret_factor)
 }
 
-#' @describeIn ifelse_routine SE version of ifelse_routine.
+#' @describeIn grp_routine SE version of grp_routine.
 #' @export
-ifelse_routine_ <- function(data, col, ..., .dots,
+grp_routine_ <- function(data, col, ..., .dots,
                             ret_factor = FALSE) {
   conds <- lazyeval::all_dots(.dots, ..., all_named = TRUE)
 

examples/ifelse_routine_ex.R → examples/grp_routine_ex.R

@@ -2,20 +2,20 @@ df <- data.frame(v1 = letters[1:5], v2 = 1:5)
 df
 
 # By default, it creates new groups
-ifelse_routine(df, "group",
+grp_routine(df, "group",
                first = v1 %in% c("a", "b"),
                second = v2 == 3,
                third = v2 >= 4)
 
 # Gives a warning when the groups are not collectively exhaustive
-ifelse_routine(df, "group",
+grp_routine(df, "group",
                first = v1 %in% c("a", "b"),
                second = v2 == 3,
                third = v2 > 4)
 
 
 # SE version
-ifelse_routine_(df, "group",
+grp_routine_(df, "group",
                "first" = ~ v1 %in% c("a", "b"),
                "second" = ~ v2 == 3,
                .dots = setNames(list(~ v2 > 4), "third"))