dt should be a POSIXct object only

eddelbuettel · Nov 27, 2017 · 46409f0 · 46409f0
1 parent ef3ff6f
commit 46409f0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -37,7 +37,7 @@ exampleFormat <- function() {
 #' @title Return difference between two time zones at a given date.
 #' @param tzfrom The first time zone as a character vector.
 #' @param tzto The second time zone as a character vector.
-#' @param dt A Date or Datetime object specifying when the difference is to be computed.
+#' @param dt A Datetime object specifying when the difference is to be computed.
 #' @param verbose A boolean toggle indicating whether more verbose operations
 #' are desired, default is \code{FALSE}.
 #' @return A numeric value with the difference (in hours) between the first and

diff --git a/man/tzDiff.Rd b/man/tzDiff.Rd
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -72,14 +72,14 @@ BEGIN_RCPP
 END_RCPP
 }
 // tzDiff
-Rcpp::NumericVector tzDiff(const std::string tzfrom, const std::string tzto, Rcpp::RObject dt, bool verbose);
+Rcpp::NumericVector tzDiff(const std::string tzfrom, const std::string tzto, const Rcpp::NumericVector& dt, bool verbose);
 RcppExport SEXP _RcppCCTZ_tzDiff(SEXP tzfromSEXP, SEXP tztoSEXP, SEXP dtSEXP, SEXP verboseSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< const std::string >::type tzfrom(tzfromSEXP);
     Rcpp::traits::input_parameter< const std::string >::type tzto(tztoSEXP);
-    Rcpp::traits::input_parameter< Rcpp::RObject >::type dt(dtSEXP);
+    Rcpp::traits::input_parameter< const Rcpp::NumericVector& >::type dt(dtSEXP);
     Rcpp::traits::input_parameter< bool >::type verbose(verboseSEXP);
     rcpp_result_gen = Rcpp::wrap(tzDiff(tzfrom, tzto, dt, verbose));
     return rcpp_result_gen;

diff --git a/src/utilities.cpp b/src/utilities.cpp
@@ -11,7 +11,6 @@ namespace sc = std::chrono; 	// shorthand
 
 double tzDiffAtomic(const cctz::time_zone& tz1, const cctz::time_zone& tz2, const Rcpp::Datetime& dt, bool verbose);
 
-#define SECS_PER_DAY 86400.0
 
 //' Difference between two given timezones at a specified date.
 //'
@@ -21,7 +20,7 @@ double tzDiffAtomic(const cctz::time_zone& tz1, const cctz::time_zone& tz2, cons
 //' @title Return difference between two time zones at a given date.
 //' @param tzfrom The first time zone as a character vector.
 //' @param tzto The second time zone as a character vector.
-//' @param dt A Date or Datetime object specifying when the difference is to be computed.
+//' @param dt A Datetime object specifying when the difference is to be computed.
 //' @param verbose A boolean toggle indicating whether more verbose operations
 //' are desired, default is \code{FALSE}.
 //' @return A numeric value with the difference (in hours) between the first and
@@ -36,7 +35,7 @@ double tzDiffAtomic(const cctz::time_zone& tz1, const cctz::time_zone& tz2, cons
 // [[Rcpp::export]]
 Rcpp::NumericVector tzDiff(const std::string tzfrom,
                            const std::string tzto,
-                           Rcpp::RObject dt,
+                           const Rcpp::NumericVector& dt,
                            bool verbose=false) {
 
     cctz::time_zone tz1, tz2;
@@ -46,19 +45,9 @@ Rcpp::NumericVector tzDiff(const std::string tzfrom,
 
     Rcpp::NumericVector res;
 
-    if (dt.inherits("Date")) {
-        auto dtv = Rcpp::as<Rcpp::DateVector>(dt);
-        res = Rcpp::NumericVector(dtv.size());
-        std::transform(dtv.begin(), dtv.end(), res.begin(), 
-                       [&tz1, &tz2, verbose](double dtval){
-                           Rcpp::Datetime dtt(dtval * SECS_PER_DAY);
-                           return tzDiffAtomic(tz1, tz2, dtt, verbose);
-                       });
-
-    } else if (dt.inherits("POSIXct")) {
-        auto dtv = Rcpp::as<Rcpp::DatetimeVector>(dt);
-        res = Rcpp::NumericVector(dtv.size());
-        std::transform(dtv.begin(), dtv.end(), res.begin(), 
+    if (dt.inherits("POSIXct")) {
+        res = Rcpp::NumericVector(dt.size());
+        std::transform(dt.begin(), dt.end(), res.begin(), 
                        [&tz1, &tz2, verbose](double dtval){
                            Rcpp::Datetime dtt(dtval);
                            return tzDiffAtomic(tz1, tz2, dtt, verbose);