[Rcpp-commits] r3779 - pkg/RcppBDT/src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2012-09-22 21:25:15 +0200 (Sat, 22 Sep 2012)
New Revision: 3779

Modified:
   pkg/RcppBDT/src/RcppBDTdt.cpp
   pkg/RcppBDT/src/RcppBDTpt.cpp
Log:
added constructors from Date and Datetime, respectively
remove two typedefs


Modified: pkg/RcppBDT/src/RcppBDTdt.cpp
===================================================================
--- pkg/RcppBDT/src/RcppBDTdt.cpp	2012-09-22 18:21:26 UTC (rev 3778)
+++ pkg/RcppBDT/src/RcppBDTdt.cpp	2012-09-22 19:25:15 UTC (rev 3779)
@@ -34,17 +34,12 @@
     }
 }
 
-typedef boost::gregorian::date 				bgd;
-typedef boost::gregorian::nth_day_of_the_week_in_month 	nth_dow;
-
-static const boost::gregorian::greg_weekday friday(boost::gregorian::Friday); // used for end-of-biz-week calcs
-
 class bdtDt {
 
 public:
-    bdtDt() : m_dt(1970,1,1) { };                    			// default empty constructor, using epoch
-    //bdtDt(int datenum);
-    bdtDt(int year, int month, int day) : m_dt(year, month, day) { };
+    bdtDt()  				{ setFromLocalClock(); } 	// default empty constructor, using epoch
+    bdtDt(SEXP dt) 			{ setDate(dt); } 		// constructor from SEXP using R Date
+    bdtDt(int year, int month, int day) : m_dt(year, month, day) { } 	// constructor using year, month, day
 
     // these set the date from the clock, in local or universal time
     void setFromLocalClock()		{ m_dt = boost::gregorian::date(boost::gregorian::day_clock::local_day()); }
@@ -69,18 +64,27 @@
 
     // construct end-of-month and first-of-next-monthm returning a boost::gregorian::date object
     void setEndOfMonth()		{ m_dt = m_dt.end_of_month(); } 
-    bgd getEndOfMonth()			{ return m_dt.end_of_month(); } 
+    boost::gregorian::date getEndOfMonth() { 
+        				  return m_dt.end_of_month(); } 
     void setFirstOfNextMonth()		{ m_dt = m_dt.end_of_month() + boost::gregorian::days(1); } 
-    bgd getFirstOfNextMonth() 		{ return m_dt.end_of_month() + boost::gregorian::days(1); }
+    boost::gregorian::date getFirstOfNextMonth() { 
+                                          return m_dt.end_of_month() + boost::gregorian::days(1); }
 
-    void setEndOfBizWeek() 		{ m_dt += boost::gregorian::days_until_weekday(m_dt, friday); }
-    Rcpp::Date getEndOfBizWeek() 	{ return Rcpp::wrap( m_dt += boost::gregorian::days_until_weekday(m_dt, friday) ); }
+    void setEndOfBizWeek() 		{ 
+        m_dt += boost::gregorian::days_until_weekday(m_dt, boost::gregorian::greg_weekday(boost::gregorian::Friday)); 
+    }
+    Rcpp::Date getEndOfBizWeek() 	{ 
+        return Rcpp::wrap( m_dt += boost::gregorian::days_until_weekday(m_dt, boost::gregorian::greg_weekday(boost::gregorian::Friday) )); 
+    }
 
     void addDays(unsigned int len) 	{ m_dt += boost::gregorian::date_duration(len); }
     void subtractDays(unsigned int len) { m_dt -= boost::gregorian::date_duration(len); }
 
     // with thanks to Whit Armstong for doing this in his rboostdatetime
-    void setIMMDate(int mon, int year)  { m_dt = nth_dow(nth_dow::third, boost::gregorian::Wednesday, mon).get_date(year); }
+    void setIMMDate(int mon, int year)  { 
+        m_dt = boost::gregorian::nth_day_of_the_week_in_month(boost::gregorian::nth_day_of_the_week_in_month::third, 
+                                                              boost::gregorian::Wednesday, mon).get_date(year); 
+    }
 
 private:
     boost::gregorian::date m_dt; 			// private Boost date instance
@@ -88,12 +92,12 @@
 };
 
 Rcpp::Date getIMMDate(bdtDt *d, int mon, int year) { 				// does not use bdtDt pointer, but need for RCPP_MODULE use
-    nth_dow ans_generator(nth_dow::third, boost::gregorian::Wednesday, mon);
-    return Rcpp::wrap(ans_generator.get_date(year));
+    return Rcpp::wrap( boost::gregorian::nth_day_of_the_week_in_month(boost::gregorian::nth_day_of_the_week_in_month::third, 
+                                                                      boost::gregorian::Wednesday, mon).get_date(year) );
 }
 
 Rcpp::Date getNthDayOfWeek(bdtDt *d, int nthday, int dow, int mon, int year) { 	// does not use bdtDt pointer, but need for RCPP_MODULE use
-    nth_dow ans_generator(static_cast<boost::date_time::nth_kday_of_month<boost::gregorian::date>::week_num>(nthday), dow, mon);
+    boost::gregorian::nth_day_of_the_week_in_month ans_generator(static_cast<boost::date_time::nth_kday_of_month<boost::gregorian::date>::week_num>(nthday), dow, mon);
     return Rcpp::wrap(ans_generator.get_date(year));
 }
 
@@ -123,6 +127,7 @@
     Rcpp::class_<bdtDt>("bdtDt")   
 	
         .constructor("default constructor not setting a value")  
+        .constructor<SEXP>("constructor using R Date type")  
         .constructor<int,int,int>("constructor with year, month, and day")  
 
         .method("setFromLocalClock",    &bdtDt::setFromLocalClock,	"set from local date")

Modified: pkg/RcppBDT/src/RcppBDTpt.cpp
===================================================================
--- pkg/RcppBDT/src/RcppBDTpt.cpp	2012-09-22 18:21:26 UTC (rev 3778)
+++ pkg/RcppBDT/src/RcppBDTpt.cpp	2012-09-22 19:25:15 UTC (rev 3779)
@@ -41,8 +41,9 @@
 class bdtPt {
 
 public:
-    bdtPt() { }                    			// default empty constructor 
-    bdtPt(int year, int month, int day, 		// constructor from date and duration
+    bdtPt() 				  { setFromLocalTimeInMicroSeconds(); }  	// default empty constructor 
+    bdtPt(SEXP dt) 			  { setFromDatetime(dt); }     			// constructor from R's Datetime
+    bdtPt(int year, int month, int day, 			// constructor from date and duration
           int hours, int minutes, int seconds, 
           int fractionalseconds) : m_pt(boost::gregorian::date(year, month, day), 
                                         boost::posix_time::time_duration(hours, minutes, seconds, fractionalseconds)) { }
@@ -71,7 +72,8 @@
 RCPP_MODULE(bdtPtMod) {
     Rcpp::class_<bdtPt>("bdtPt")   
 	
-        .constructor("default constructor not setting a value")  
+        .constructor("default constructor setting current local time")  
+        .constructor<SEXP>("constructor using R Datetime")
         .constructor<int,int,int,int,int,int,int>("constructor with year, month, day, hours, minutes, seconds and fractional_seconds")  
 
         .method("setFromLocalTimeInSeconds",      &bdtPt::setFromLocalTimeInSeconds,      "set from local time with seconds")