using GreedyVector template instead of manual copy and paste

romainfrancois · romainfrancois · commit 39877383befb · 2013-11-13T16:54:03.000+01:00
diff --git a/inst/include/Rcpp/DateVector.h b/inst/include/Rcpp/DateVector.h
@@ -2,7 +2,7 @@
 //
 // DateVector.h: Rcpp R/C++ interface class library -- Date vector support
 //
-// Copyright (C) 2010 - 2011    Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2013    Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -23,38 +23,19 @@
 #define Rcpp__DateVector_h
 
 #include <RcppCommon.h>
+#include <Rcpp/internal/GreedyVector.h>
 
 namespace Rcpp {
 
-    class DateVector {
+    class DateVector : public GreedyVector<Date, DateVector> {
     public:
-        typedef std::vector<Date>::iterator iterator;
-        typedef std::vector<Date>::const_iterator const_iterator;
+        DateVector(SEXP vec) : GreedyVector(vec){}
+        DateVector(int n) : GreedyVector(n){}
         
-        DateVector(SEXP vec);
-        DateVector(int n);
-        ~DateVector() {};
-
-        const Date& operator()(int i) const;
-        Date& operator()(int i);
-
-        const Date& operator[](int i) const;
-        Date& operator[](int i);
-
-        int size() const;
-
-        std::vector<Date> getDates() const;
-        
-        inline iterator begin(){ return v.begin(); }
-        inline iterator end(){ return v.end(); }
-        
-        inline const_iterator begin() const { return v.begin(); }
-        inline const_iterator end() const { return v.end(); }
-        
-        inline operator SEXP() const { return wrap( v ) ; } 
+        inline std::vector<Date> getDates() const{
+            return v ;   
+        }
         
-    private:
-        std::vector<Date> v;
     };
 }
 
diff --git a/inst/include/Rcpp/DatetimeVector.h b/inst/include/Rcpp/DatetimeVector.h
@@ -2,7 +2,7 @@
 //
 // DatetimeVector.h: Rcpp R/C++ interface class library -- Datetime vector
 //
-// Copyright (C) 2010 - 2011    Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2013    Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -24,37 +24,19 @@
 
 #include <RcppCommon.h>
 
+#include <Rcpp/internal/GreedyVector.h>
+
 namespace Rcpp {
 
-    class DatetimeVector {
+    class DatetimeVector : public GreedyVector<Datetime, DatetimeVector> {
     public:
-        typedef std::vector<Datetime>::iterator iterator;
-        typedef std::vector<Datetime>::const_iterator const_iterator;
-        
-        DatetimeVector(SEXP vec);
-        DatetimeVector(int n);
-        ~DatetimeVector() {};
-
-        const Datetime& operator()(int i) const;
-        Datetime& operator()(int i);
-
-        const Datetime& operator[](int i) const;
-        Datetime& operator[](int i);
-
-        int size() const;
-
-        std::vector<Datetime> getDatetimes() const;
-        
-        inline iterator begin(){ return v.begin(); }
-        inline iterator end(){ return v.end(); }
-        
-        inline const_iterator begin() const { return v.begin(); }
-        inline const_iterator end() const { return v.end(); }
+        DatetimeVector(SEXP vec) : GreedyVector(vec){}
+        DatetimeVector(int n) : GreedyVector(n){}
         
-        inline operator SEXP() const { return wrap( v ) ; } 
+        std::vector<Datetime> getDatetimes() const{
+            return v ;    
+        }
         
-    private:
-        std::vector<Datetime> v;
     };
 }
 
diff --git a/inst/include/Rcpp/internal/GreedyVector.h b/inst/include/Rcpp/internal/GreedyVector.h
@@ -0,0 +1,96 @@
+// Copyright (C) 2013 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_INTERNAL_GREEDYVECTOR_H
+#define RCPP_INTERNAL_GREEDYVECTOR_H
+
+namespace Rcpp {
+    
+    template <typename T, typename CLASS>
+    class GreedyVector {
+    public:
+        typedef typename std::vector<T>::iterator iterator;
+        typedef typename std::vector<T>::const_iterator const_iterator;
+        
+        GreedyVector(SEXP vec) : v(0){
+            if (!Rf_isNumeric(vec) || Rf_isMatrix(vec) || Rf_isLogical(vec))
+                throw std::range_error("invalid numeric vector in constructor");
+            int len = Rf_length(vec);
+            if (len == 0)
+                throw std::range_error("null vector in constructor");
+            v.resize(len);
+            for (int i = 0; i < len; i++)
+                v[i] = T( static_cast<double>(REAL(vec)[i]));
+        }
+        
+        GreedyVector(int n) : v(n){}
+        
+        inline const T& operator()(int i) const{
+            return at(i) ;    
+        }
+        inline T& operator()(int i){
+            return at(i) ;    
+        }
+
+        inline const T& operator[](int i) const{
+            return at(i) ;    
+        }
+        inline T& operator[](int i){
+            return at(i) ;    
+        }
+        
+        inline int size() const { 
+            return (int)v.size(); 
+        }
+        
+        inline iterator begin(){ return v.begin(); }
+        inline iterator end(){ return v.end(); }
+        
+        inline const_iterator begin() const { return v.begin(); }
+        inline const_iterator end() const { return v.end(); }
+        
+        inline operator SEXP() const { 
+            return wrap( v ) ; 
+        } 
+        
+    protected:
+        std::vector<T> v;
+        
+    private:
+        const T& at(int i) const{
+            if (i < 0 || i >= static_cast<int>(v.size())) {
+                std::ostringstream oss;
+                oss << "subscript out of range: " << i;
+                throw std::range_error(oss.str());
+            }
+            return v[i];        
+        }
+        
+        T& at(int i) {
+            if (i < 0 || i >= static_cast<int>(v.size())) {
+                std::ostringstream oss;
+                oss << "subscript out of range: " << i;
+                throw std::range_error(oss.str());
+            }
+            return v[i];        
+        }
+        
+    } ;
+    
+}
+
+#endif
diff --git a/src/Date.cpp b/src/Date.cpp
@@ -83,126 +83,6 @@ namespace Rcpp {
     #undef isleap
     #undef days_in_year 
 
-    
-    
-    DatetimeVector::DatetimeVector(SEXP vec) : v()  {
-        int i;
-        if (!Rf_isNumeric(vec) || Rf_isMatrix(vec) || Rf_isLogical(vec))
-            throw std::range_error("DatetimeVector: invalid numeric vector in constructor");
-        int len = Rf_length(vec);
-        if (len == 0)
-            throw std::range_error("DatetimeVector: null vector in constructor");
-        v.resize(len);
-        for (i = 0; i < len; i++)
-            v[i] = Datetime( static_cast<double>(REAL(vec)[i]));
-    }
-
-
-    DatetimeVector::DatetimeVector(int n) : v(n) {}
-
-    const Datetime & DatetimeVector::operator()(int i) const {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DatetimeVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    Datetime & DatetimeVector::operator()(int i) {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DatetimeVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    const Datetime & DatetimeVector::operator[](int i) const {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DatetimeVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    Datetime & DatetimeVector::operator[](int i) {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DatetimeVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    int DatetimeVector::size() const { 
-        return v.size(); 
-    }
-
-    std::vector<Datetime> DatetimeVector::getDatetimes() const {
-        return v;
-    }
-    
-    DateVector::DateVector(SEXP vec) : v()  {
-        int i;
-        if (!Rf_isNumeric(vec) || Rf_isMatrix(vec) || Rf_isLogical(vec))
-            throw std::range_error("DateVector: invalid numeric vector in constructor");
-        int len = Rf_length(vec);
-        if (len == 0)
-            throw std::range_error("DateVector: null vector in constructor");
-        v.resize(len);
-        for (i = 0; i < len; i++)
-            v[i] = Date( static_cast<double>(REAL(vec)[i]));
-    }
-
-
-    DateVector::DateVector(int n) : v(n){}
-
-    const Date & DateVector::operator()(int i) const {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DateVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    Date & DateVector::operator()(int i) {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DateVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    const Date & DateVector::operator[](int i) const {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DatetimeVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    Date & DateVector::operator[](int i) {
-        if (i < 0 || i >= static_cast<int>(v.size())) {
-            std::ostringstream oss;
-            oss << "DatetimeVector: subscript out of range: " << i;
-            throw std::range_error(oss.str());
-        }
-        return v[i];
-    }
-
-    int DateVector::size() const { 
-        return v.size(); 
-    }
-
-    std::vector<Date> DateVector::getDates() const {
-        return v;
-    }
-    
 #include "sys/types.h"	/* for time_t */
 #include "string.h"
 #include "limits.h"	/* for CHAR_BIT et al. */
