factor out min, max and range in their own file and classes

Author: romainfrancois

ChangeLog

@@ -13,7 +13,10 @@
         so that it works even when we don't know the previous value
         * unitTests/runit.sugar.R : 
         * unitTests/cpp/sugar.cpp :
-        * TODO : 2 less items
+        * include/Rcpp/sugar/functions/range.h : factored out of minmax.h
+        * include/Rcpp/sugar/functions/min.h : factored out of minmax.h
+        * include/Rcpp/sugar/functions/max.h : factored out of minmax.h
+        * TODO : 3 less items
 
 2013-09-17  JJ Allaire  <jj@rstudio.org>
 

TODO

@@ -50,11 +50,6 @@ Syntactic sugar
 
     o   operator/ needs to handle the case of division by 0
 
-    o   min, max with specialization of the binary operators, so that we can do 
-        things like this lazily: 
-        
-        min( x ) < 4
-    
     o   matrix functions : apply
 
     o   for character vectors: nchar, grepl, sub, gsub

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

@@ -46,7 +46,9 @@
 #include <Rcpp/sugar/functions/pmin.h>
 #include <Rcpp/sugar/functions/pmax.h>
 #include <Rcpp/sugar/functions/clamp.h>
-#include <Rcpp/sugar/functions/minmax.h>
+#include <Rcpp/sugar/functions/min.h>
+#include <Rcpp/sugar/functions/max.h>
+#include <Rcpp/sugar/functions/range.h>
 #include <Rcpp/sugar/functions/sign.h>
 #include <Rcpp/sugar/functions/diff.h>
 #include <Rcpp/sugar/functions/pow.h>

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

@@ -0,0 +1,87 @@
+// -*- 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
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp__sugar__max_h
+#define Rcpp__sugar__max_h
+
+namespace Rcpp{
+namespace sugar{
+
+    template <int RTYPE, bool NA, typename T>
+    class Max {
+    public:
+        typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+        
+        Max( const T& obj_) : obj(obj_) {}
+        
+        operator STORAGE() {
+            max_ = obj[0] ;
+            if( Rcpp::traits::is_na<RTYPE>( max_ ) ) return max_ ;
+            
+            int n = obj.size() ;
+            for( int i=1; i<n; i++){
+                current = obj[i] ;
+                if( Rcpp::traits::is_na<RTYPE>( current ) ) return current;
+                if( current > max_ ) max_ = current ;
+            }
+            return max_ ;
+        }
+        
+    private:
+        const T& obj ;
+        STORAGE min_, max_, current ;
+    } ;
+
+    // version for NA = false
+    template <int RTYPE, typename T>
+    class Max<RTYPE,false,T> {
+    public:
+        typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+        
+        Max( const T& obj_) : obj(obj_) {}
+        
+        operator STORAGE() {
+            max_ = obj[0] ;
+            
+            int n = obj.size() ;
+            for( int i=1; i<n; i++){
+                current = obj[i] ;
+                if( current > max_ ) max_ = current ;
+            }
+            return max_ ;
+        }
+       
+    private:
+        const T& obj ;
+        STORAGE max_, current ;
+    } ;
+         
+
+} // sugar
+
+template <int RTYPE, bool NA, typename T>
+sugar::Max<RTYPE,NA,T> max( const VectorBase<RTYPE,NA,T>& x){
+    return sugar::Max<RTYPE,NA,T>(x.get_ref()) ;
+}
+
+} // Rcpp
+
+#endif

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

@@ -0,0 +1,86 @@
+// -*- 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
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp__sugar__min_h
+#define Rcpp__sugar__min_h
+
+namespace Rcpp{
+namespace sugar{
+
+    template <int RTYPE, bool NA, typename T>
+    class Min {
+    public:
+        typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+        
+        Min( const T& obj_) : obj(obj_) {}
+        
+        operator STORAGE() {
+            min_ = obj[0] ;
+            if( Rcpp::traits::is_na<RTYPE>( min_ ) ) return min_ ;
+            
+            int n = obj.size() ;
+            for( int i=1; i<n; i++){
+                current = obj[i] ;
+                if( Rcpp::traits::is_na<RTYPE>( current ) ) return current;
+                if( current < min_ ) min_ = current ;
+            }
+            return min_ ;
+        }
+    
+        const T& obj ;
+        STORAGE min_, max_, current ;
+    } ;
+
+    // version for NA = false
+    template <int RTYPE, typename T>
+    class Min<RTYPE,false,T> {
+    public:
+        typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+        
+        Min( const T& obj_) : obj(obj_) {}
+        
+        operator STORAGE() {
+            min_ = obj[0] ;
+            
+            int n = obj.size() ;
+            for( int i=1; i<n; i++){
+                current = obj[i] ;
+                if( current < min_ ) min_ = current ;
+            }
+            return min_ ;
+        }
+    
+        const T& obj ;
+        STORAGE min_, current ;
+    } ;
+
+    
+} // sugar
+
+
+template <int RTYPE, bool NA, typename T>
+sugar::Min<RTYPE,NA,T> min( const VectorBase<RTYPE,NA,T>& x){
+    return sugar::Min<RTYPE,NA,T>(x.get_ref()) ;
+}
+
+} // Rcpp
+
+#endif