Added decreasing parameter to sort_unique() to address #950. (#958)

* Added decreasing parameter to sort_unique() to address #950.

* Allow the travis build to run for 20 minutes.

* Travis wait doesn't play nicely with docker without a workaround.

c.f. travis-ci/travis-ci#6934 (comment)

* Add type...

* Use `na.last = FALSE` to disable changing orders.

Note: `unique()`'s unit test use `na.last = TRUE` because sorting was done at the R level instead of the C++ level.

* Remove travis debug setup and enable only one `na.last`

Author: coatless

ChangeLog

@@ -1,3 +1,9 @@
+2019-03-20  James J Balamuta  <balamut2@illinois.edu>
+
+  * inst/include/Rcpp/sugar/functions/unique.h: Added decreasing parameter to control sort.
+	* inst/unitTests/runit.sugar.R: Added sort_unique() tests
+	* inst/unitTests/cpp/sugar.cpp: Ditto
+
 2019-03-20  Dirk Eddelbuettel  <edd@debian.org>
 
 	* src/date.cpp: Renamed from Date.cpp

inst/NEWS.Rd

@@ -11,6 +11,11 @@
       a variable reference suppressing compiler warnings (Dirk in
       \ghpr{953}) fixing \ghit{951}).
     }
+    \item Changes in Rcpp Sugar:
+    \itemize{
+      \item Added decreasing parameter to \code{sort_unique()}
+      (James Balamuta in \ghpr{958} addressing \ghit{950}).
+    }
   }
 }
 

inst/include/Rcpp/sugar/functions/unique.h

@@ -69,8 +69,8 @@ inline Vector<RTYPE> unique( const VectorBase<RTYPE,NA,T>& t ){
 	return hash.keys() ;
 }
 template <int RTYPE, bool NA, typename T>
-inline Vector<RTYPE> sort_unique( const VectorBase<RTYPE,NA,T>& t ){
-	return unique<RTYPE,NA,T>( t ).sort() ;
+inline Vector<RTYPE> sort_unique( const VectorBase<RTYPE,NA,T>& t , bool decreasing = false){
+	return unique<RTYPE,NA,T>( t ).sort(decreasing) ;
 }
 
 template <int RTYPE, bool NA, typename T, bool RHS_NA, typename RHS_T>

inst/unitTests/cpp/sugar.cpp

@@ -611,6 +611,12 @@ Rcpp::CharacterVector runit_unique_ch(Rcpp::CharacterVector x) {
     return Rcpp::unique(x);
 }
 
+// [[Rcpp::export]]
+Rcpp::CharacterVector runit_sort_unique_ch(Rcpp::CharacterVector x,
+                                           bool decreasing = false) {
+    return Rcpp::sort_unique(x, decreasing);
+}
+
 // [[Rcpp::export]]
 IntegerVector runit_table( CharacterVector x){
     return table( x ) ;

inst/unitTests/runit.sugar.R

@@ -687,6 +687,36 @@ if (.runThisTest) {
         )
     }
 
+    test.sort_unique <- function() {
+
+        set.seed(123)
+        x <- sample(LETTERS[1:5], 10, TRUE)
+        checkEquals(
+            sort(unique(x), decreasing = TRUE),
+            runit_sort_unique_ch(x, decreasing = TRUE),
+            "unique / character / without NA / decreasing sort"
+        )
+
+        checkEquals(
+            sort(unique(x), decreasing = FALSE),
+            runit_sort_unique_ch(x, decreasing = FALSE),
+            "unique / character / without NA / increasing sort"
+        )
+
+        x <- c(x, NA, NA)
+        checkEquals(
+            sort(unique(x), decreasing = TRUE, na.last = FALSE),
+            runit_sort_unique_ch(x, decreasing = TRUE),
+            "unique / character / with NA / decreasing sort"
+        )
+
+        checkEquals(
+            sort(unique(x), decreasing = FALSE, na.last = TRUE),
+            runit_sort_unique_ch(x, decreasing = FALSE),
+            "unique / character / with NA / increasing sort"
+        )
+    }
+
     test.table <- function(){
         x <- sample( letters, 1000, replace = TRUE )
         checkTrue( all( runit_table(x) == table(x) ) )