%>% aliases fix

tbates · Oct 6, 2013 · bcc20a1 · bcc20a1
1 parent bda8e61
commit bcc20a1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/R/build_run_modify.r b/R/build_run_modify.r
@@ -1,13 +1,12 @@
 # https://r-forge.r-project.org/project/admin/?group_id=1745
 # http://adv-r.had.co.nz/Philosophy.html
 # https://github.com/hadley/devtools
-# setwd("~/bin/umx"); devtools::document(); devtools::install(); 
+# setwd("~/bin/umx"); devtools::document("~/bin/umx"); devtools::install("~/bin/umx"); 
 # require(OpenMx); require(umx); ?umx
 # setwd("~/bin/umx"); devtools::check()
 # devtools::load_all()
 # devtools::dev_help("umxX")
 # show_news()
-
 # =================================
 # = Speed  and Efficiency Helpers =
 # =================================

diff --git a/R/misc_and_utility.r b/R/misc_and_utility.r
@@ -737,14 +737,14 @@ grepSPSS_labels <- function(df, grepString, output="both", ignore.case=T, useNam
 #'
 #' A version of less-than which returns FALSE for NAs (rather than NA)
 #'
-#' \alias "\%<\%"
+#' @aliases %%<%%
 #'
 #' @export
-#' @seealso - \code{\link{umxGreaterThan}}, 
+#' @seealso - \code{\link{umx_greater_than}}, 
 #' @examples
 #' c(1:3, NA, 5) = %<% 2
 
-umxLessThan <- function(table, x){
+umx_less_than <- function(table, x){
 	lessThan = table < x
 	lessThan[is.na(lessThan)] = FALSE
 	return(lessThan)
@@ -754,14 +754,14 @@ umxLessThan <- function(table, x){
 #'
 #' A version of greater-than that excludes NA as a match
 #'
-#' \alias "\%>\%" 
+#' @aliases %%>%%
 #'
 #' @export
-#' @seealso - \code{\link{umxLessThan}}, 
+#' @seealso - \code{\link{umx_less_than}}, 
 #' @examples
 #' c(1:3,NA,5) = %>% 2 
 
-umxGreaterThan <- function(table, x){
+umx_greater_than <- function(table, x){
 	moreThan = table > x
 	moreThan[is.na(moreThan)] = FALSE
 	return(moreThan)

diff --git a/man/umxGreaterThan.Rd b/man/umxGreaterThan.Rd
@@ -1,4 +1,5 @@
 \name{umxGreaterThan}
+\alias{\%\%>\%\%}
 \alias{umxGreaterThan}
 \title{umxGreaterThan}
 \usage{
@@ -7,9 +8,6 @@
 \description{
   A version of greater-than that excludes NA as a match
 }
-\details{
-  \alias "\%>\%"
-}
 \examples{
 c(1:3,NA,5) = \%>\% 2
 }

diff --git a/man/umxLessThan.Rd b/man/umxLessThan.Rd
@@ -1,4 +1,5 @@
 \name{umxLessThan}
+\alias{\%\%<\%\%}
 \alias{umxLessThan}
 \title{umxLessThan}
 \usage{
@@ -8,9 +9,6 @@
   A version of less-than which returns FALSE for NAs
   (rather than NA)
 }
-\details{
-  \alias "\%<\%"
-}
 \examples{
 c(1:3, NA, 5) = \%<\% 2
 }