first step towards updated Date{time}Vector

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,17 @@
+2016-10-16  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/include/Rcpp/date_datetime/date_datetime.h: New header file (and
+        directory) regrouping all Date and Datetime headers, scalar and vector
+
+        * inst/include/Rcpp/date_datetime/Date.h: Moved one directory down
+        * inst/include/Rcpp/date_datetime/Datetime.h: Ditto
+        * inst/include/Rcpp/date_datetime/oldDateVector.h: Moved and renamed
+        * inst/include/Rcpp/date_datetime/oldDatetimeVector.h: Ditto
+
+        * inst/include/Rcpp/date_datetime/newDateVector.h: New implementation
+        inheriting from NumericVector, still optional
+        * inst/include/Rcpp/date_datetime/newDatetimeVector.h: Ditto
+
 2016-09-05  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION (Version): Roll minor version

inst/include/Rcpp.h

@@ -55,10 +55,8 @@
 #include <Rcpp/StringTransformer.h>
 #include <Rcpp/Formula.h>
 #include <Rcpp/DataFrame.h>
-#include <Rcpp/Date.h>
-#include <Rcpp/DateVector.h>
-#include <Rcpp/Datetime.h>
-#include <Rcpp/DatetimeVector.h>
+
+#include <Rcpp/date_datetime/date_datetime.h>
 
 #include <Rcpp/Na_Proxy.h>
 

inst/include/Rcpp/Date.h inst/include/Rcpp/date_datetime/Date.hinst/include/Rcpp/Date.h renamed to inst/include/Rcpp/date_datetime/Date.h

@@ -0,0 +1,33 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+//
+// date_datetime.h: Rcpp R/C++ interface class library -- Date and Datetime support
+//
+// Copyright (C) 2016         Dirk Eddelbuettel
+//
+// 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__Date_Datetime_h
+#define Rcpp__Date_Datetime_h
+
+#include <Rcpp/date_datetime/Date.h>
+#include <Rcpp/date_datetime/oldDateVector.h>
+#include <Rcpp/date_datetime/newDateVector.h>
+
+#include <Rcpp/date_datetime/Datetime.h>
+#include <Rcpp/date_datetime/oldDatetimeVector.h>
+#include <Rcpp/date_datetime/newDatetimeVector.h>
+
+#endif

inst/include/Rcpp/Datetime.h …st/include/Rcpp/date_datetime/Datetime.hinst/include/Rcpp/Datetime.h renamed to inst/include/Rcpp/date_datetime/Datetime.h inst/include/Rcpp/Datetime.h renamed to inst/include/Rcpp/date_datetime/Datetime.h

@@ -0,0 +1,50 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+//
+// newDateVector.h: Rcpp R/C++ interface class library -- Date vector support
+//
+// Copyright (C) 2016         Dirk Eddelbuettel
+//
+// 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__newDateVector_h
+#define Rcpp__newDateVector_h
+
+#include <RcppCommon.h>
+
+namespace Rcpp {
+
+    class newDateVector : public NumericVector {
+    public:
+        newDateVector(SEXP vec) : NumericVector(vec) { setClass(); }
+        newDateVector(int n) : NumericVector(n) { setClass(); }
+
+        inline std::vector<Date> getDates() const {
+            int n = this->size();
+            std::vector<Date> v(n);
+            for (int i=0; i<n; i++)
+                v[i] = (*this)[i];
+            return v;
+        }
+
+    private:
+
+        void setClass() {
+            Rf_setAttrib(*this, R_ClassSymbol, Rf_mkString("Date"));
+        }
+    };
+}
+
+#endif

inst/include/Rcpp/date_datetime/date_datetime.h

@@ -0,0 +1,53 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
+//
+// newDatetimeVector.h: Rcpp R/C++ interface class library -- Datetime vector support
+//
+// Copyright (C) 2016         Dirk Eddelbuettel
+//
+// 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__newDatetimeVector_h
+#define Rcpp__newDatetimeVector_h
+
+#include <RcppCommon.h>
+
+namespace Rcpp {
+
+    class newDatetimeVector : public NumericVector {
+    public:
+        newDatetimeVector(SEXP vec) : NumericVector(vec) { setClass(); }
+        newDatetimeVector(int n) : NumericVector(n) { setClass(); }
+
+        inline std::vector<Datetime> getDatetimes() const {
+            int n = this->size();
+            std::vector<Datetime> v(n);
+            for (int i=0; i<n; i++)
+                v[i] = (*this)[i];
+            return v;
+        }
+
+    private:
+
+        void setClass() {
+            Shield<SEXP> datetimeclass(Rf_allocVector(STRSXP,2));
+            SET_STRING_ELT(datetimeclass, 0, Rf_mkChar("POSIXct"));
+            SET_STRING_ELT(datetimeclass, 1, Rf_mkChar("POSIXt"));
+            Rf_setAttrib(*this, R_ClassSymbol, datetimeclass);
+        }
+    };
+}
+
+#endif