bug fixes pass CRAN check

christophergandrud · Nov 18, 2014 · 9a73d79 · 9a73d79
1 parent e41aba8
commit 9a73d79
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -3,7 +3,7 @@ Title: R tools for making it easier to combine and clean data sets.
 Description: R tools for combining and cleaning data sets, including filling in
     missing observations with data from another data frame and creating
     lag/lead variables.
-Version: 0.2.6
+Version: 0.2.7
 Date: 2014-11-08
 Author: Christopher Gandrud
 Maintainer: Christopher Gandrud <[email protected]>

diff --git a/NAMESPACE b/NAMESPACE
@@ -22,6 +22,7 @@ export(slide)
 export(slideMA)
 import(data.table)
 importFrom(dplyr,group_by)
+importFrom(dplyr,group_by_)
 importFrom(dplyr,mutate)
 importFrom(dplyr,summarize)
 importFrom(dplyr,ungroup)
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+## Version 0.2.7
+
+Fixed a bug in `slide` when there are invalid sliding values.
+
 ### Version 0.2.6
 
 - Fixed a misspelling in the `CountSpell` documentation. Thanks to

diff --git a/R/slide.R b/R/slide.R
@@ -61,7 +61,7 @@
 #' \url{http://ctszkin.com/2012/03/11/generating-a-laglead-variables/}
 #'
 #'
-#' @importFrom dplyr group_by summarize mutate ungroup
+#' @importFrom dplyr group_by group_by_ summarize mutate ungroup
 #' @export
 
 slide <- function(data, Var, GroupVar = NULL, NewVar = NULL, slideBy = -1,
@@ -111,22 +111,29 @@ slide <- function(data, Var, GroupVar = NULL, NewVar = NULL, slideBy = -1,
 
     # Drop if there are not enough observations per group to slide
     if (!is.null(GroupVar)){
-        data <- group_by_(data, .dots = GroupVar) 
+        data <- group_by_(data, .dots = GroupVar)
         data$fake <- 1
         Minimum <- abs(slideBy) - 1
         Summed <- dplyr::mutate(data, total = sum(fake))
         SubSummed <- subset(Summed, total <= Minimum)
         data <- VarDrop(data, 'fake')
-        FullData <- NULL
-        if (nrow(SubSummed) > 0){
+        if (nrow(SubSummed) == 0) {
+            FullData <- NULL
+        }
+        else if (nrow(SubSummed) > 0){
+            ## Hack
+            FullData <- data
+            class(FullData) <- 'data.frame'
+            ## End Hack
+
             Dropping <- unique(SubSummed[, GroupVar])
-            
+
             ## Hack
             class(data) <- 'data.frame'
             data <- data[!(data[, GroupVar] %in% Dropping), ]
             data <- group_by_(data, .dots = GroupVar)
             ## End Hack
-            
+
             if (!isTRUE(keepInvalid)){
                 message(paste0('\nWarning: the following groups have ', Minimum,
                         ' or fewer observations.',

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ DataCombine
 
 Christopher Gandrud
 
-Version 0.2.6
+Version 0.2.7
 [![Build Status](https://travis-ci.org/christophergandrud/DataCombine.png)](https://travis-ci.org/christophergandrud/DataCombine)
 
 Please report any **bugs** or **suggestions** at: