Merge pull request #884 from RcppCore/bugfix/min_max_zero

consider empty vectors in min() and max() (fixes #883)

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,13 @@
+2018-07-20  Dirk Eddelbuettel  <[email protected]>
+
+	* inst/include/Rcpp/sugar/functions/max.h (Rcpp): Also consider case
+	of an empty vector
+	* inst/include/Rcpp/sugar/functions/min.h (Rcpp): Idem
+
+2018-07-19  Jack Wasey  <[email protected]>
+
+        * inst/include/Rcpp/r_cast.h: Error and abort if debugging for STRSXP
+
 2018-07-12  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION (Version, Date): Roll minor version

inst/NEWS.Rd

@@ -14,7 +14,8 @@
       \item Next \code{eval} codes now properly unwind (Lionel in the large
       and careful \ghpr{859} fixing \ghit{807}).
       \item In debugging mode, more type information is shown on
-      \code{abort()} (Jack Waseyin \ghpr{860} fixing \ghit{857}).
+      \code{abort()} (Jack Waseyin \ghpr{860} and \ghpr{882} fixing
+      \ghit{857}).
       \item A new class was added which allow suspension of the RNG
       synchronisation to address an issue seen in \CRANpkg{RcppDE}
       (Kevin in \ghpr{862}).
@@ -30,7 +31,8 @@
       \item The \code{Rcpp::unwindProtect()} function extracts the
       unwinding from the \code{Rcpp_fast_eval()} function and makes it
       more generally available. (Lionel in \ghpr{873} and \ghpr{877}).
-      \item The \code{tm_gmtoff} part is skipped on AIX too (\ghpr{876}).
+      \item The \code{tm_gmtoff} part is skipped on AIX too
+      (\ghpr{876}).
     }
     \item Changes in Rcpp Attributes:
     \itemize{
@@ -41,6 +43,11 @@
       the \code{RcppExports} files are more stable across locales (Jack
       Wasey in \ghpr{878}).
     }
+    \item Changes in Rcpp Sugar:
+    \itemize{
+      \item The sugar functions \code{min} and \code{max} now recognise
+      empty vectors (Dirk in \ghpr{884} fixing \ghit{883}).
+    }
   }
 }
 

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

@@ -1,8 +1,7 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
-//
+
 // max.h: Rcpp R/C++ interface class library -- max
 //
-// Copyright (C) 2012 - 2013 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2018  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -33,11 +32,12 @@ namespace sugar{
         Max( const T& obj_) : obj(obj_) {}
 
         operator STORAGE() const {
+            R_xlen_t n = obj.size();
+            if (n == 0) return(static_cast<STORAGE>(R_NegInf));
+
             STORAGE max, current ;
             max = obj[0] ;
             if( Rcpp::traits::is_na<RTYPE>( max ) ) return max ;
-
-            R_xlen_t n = obj.size() ;
             for( R_xlen_t i=1; i<n; i++){
                 current = obj[i] ;
                 if( Rcpp::traits::is_na<RTYPE>( current ) ) return current;
@@ -59,10 +59,11 @@ namespace sugar{
         Max( const T& obj_) : obj(obj_) {}
 
         operator STORAGE() const {
+            R_xlen_t n = obj.size();
+            if (n == 0) return(static_cast<STORAGE>(R_NegInf));
+
             STORAGE max, current ;
             max = obj[0] ;
-
-            R_xlen_t n = obj.size() ;
             for( R_xlen_t i=1; i<n; i++){
                 current = obj[i] ;
                 if( current > max ) max = current ;

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

@@ -1,8 +1,7 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
-//
+
 // Min.h: Rcpp R/C++ interface class library -- min
 //
-// Copyright (C) 2012 - 2013 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2018  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -33,11 +32,13 @@ namespace sugar{
         Min( const T& obj_) : obj(obj_) {}
 
         operator STORAGE() const {
+            R_xlen_t n = obj.size();
+            if (n == 0) return(static_cast<STORAGE>(R_PosInf));
+
             STORAGE min, current ;
             min = obj[0] ;
             if( Rcpp::traits::is_na<RTYPE>( min ) ) return min ;
 
-            R_xlen_t n = obj.size() ;
             for( R_xlen_t i=1; i<n; i++){
                 current = obj[i] ;
                 if( Rcpp::traits::is_na<RTYPE>( current ) ) return current;
@@ -58,10 +59,11 @@ namespace sugar{
         Min( const T& obj_) : obj(obj_) {}
 
         operator STORAGE() const {
+            R_xlen_t n = obj.size();
+            if (n == 0) return(static_cast<STORAGE>(R_PosInf));
+
             STORAGE min, current ;
             min = obj[0] ;
-
-            R_xlen_t n = obj.size() ;
             for( R_xlen_t i=1; i<n; i++){
                 current = obj[i] ;
                 if( current < min ) min = current ;