hi,
Index: leap_second/src/library/base/R/zdatetime.R
==================================================================---
leap_second/src/library/base/R/zdatetime.R (revision 68608)
+++ leap_second/src/library/base/R/zdatetime.R (working copy)
@@ -24,7 +24,8 @@
"1979-12-31", "1981-6-30", "1982-6-30",
"1983-6-30",
"1985-6-30", "1987-12-31",
"1989-12-31", "1990-12-31",
"1992-6-30", "1993-6-30",
"1994-6-30","1995-12-31",
- "1997-6-30", "1998-12-31",
"2005-12-31", "2008-12-31", "2012-6-30")
+ "1997-6-30", "1998-12-31",
"2005-12-31", "2008-12-31",
+ "2012-6-30", "2015-6-30")
.leap.seconds <- strptime(paste(.leap.seconds , "23:59:60"),
"%Y-%m-%d %H:%M:%S")
c(as.POSIXct(.leap.seconds, "GMT")) # lose the timezone
Best Regards,
--
Eiji NAKAMA <nakama (a) ki.rim.or.jp>
"\u4e2d\u9593\u6804\u6cbb" <nakama (a) ki.rim.or.jp>
On 01/07/2015 7:20 AM, Ei-ji Nakama wrote:> hi, > > Index: leap_second/src/library/base/R/zdatetime.R > ==================================================================> --- leap_second/src/library/base/R/zdatetime.R (revision 68608) > +++ leap_second/src/library/base/R/zdatetime.R (working copy) > @@ -24,7 +24,8 @@ > "1979-12-31", "1981-6-30", "1982-6-30", "1983-6-30", > "1985-6-30", "1987-12-31", "1989-12-31", "1990-12-31", > "1992-6-30", "1993-6-30", "1994-6-30","1995-12-31", > - "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", "2012-6-30") > + "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", > + "2012-6-30", "2015-6-30") > .leap.seconds <- strptime(paste(.leap.seconds , "23:59:60"), > "%Y-%m-%d %H:%M:%S") > c(as.POSIXct(.leap.seconds, "GMT")) # lose the timezone > > Best Regards, > -- > Eiji NAKAMA <nakama (a) ki.rim.or.jp> > "\u4e2d\u9593\u6804\u6cbb" <nakama (a) ki.rim.or.jp>Thanks, I'll add it to R-devel and R-patched. Duncan Murdoch
On 1 July 2015 at 07:36, Duncan Murdoch wrote: | On 01/07/2015 7:20 AM, Ei-ji Nakama wrote: | > hi, | > | > Index: leap_second/src/library/base/R/zdatetime.R | > ==================================================================| > --- leap_second/src/library/base/R/zdatetime.R (revision 68608) | > +++ leap_second/src/library/base/R/zdatetime.R (working copy) | > @@ -24,7 +24,8 @@ | > "1979-12-31", "1981-6-30", "1982-6-30", "1983-6-30", | > "1985-6-30", "1987-12-31", "1989-12-31", "1990-12-31", | > "1992-6-30", "1993-6-30", "1994-6-30","1995-12-31", | > - "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", "2012-6-30") | > + "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", | > + "2012-6-30", "2015-6-30") | > .leap.seconds <- strptime(paste(.leap.seconds , "23:59:60"), | > "%Y-%m-%d %H:%M:%S") | > c(as.POSIXct(.leap.seconds, "GMT")) # lose the timezone | > | > Best Regards, | > -- | > Eiji NAKAMA <nakama (a) ki.rim.or.jp> | > "\u4e2d\u9593\u6804\u6cbb" <nakama (a) ki.rim.or.jp> | | Thanks, I'll add it to R-devel and R-patched. I just launched a Debian build of R 3.2.1 as well. Dirk -- http://dirk.eddelbuettel.com | @eddelbuettel | edd at debian.org
Thanks, I was working on this. There are other changes needed in src/main/datetime.c and ?.leap.seconds which I will commit shortly, and the example in hist.POSIXt() needed alteration (it seems DJM did not run 'make check'!). On 01/07/2015 06:20, Ei-ji Nakama wrote:> hi, > > Index: leap_second/src/library/base/R/zdatetime.R > ==================================================================> --- leap_second/src/library/base/R/zdatetime.R (revision 68608) > +++ leap_second/src/library/base/R/zdatetime.R (working copy) > @@ -24,7 +24,8 @@ > "1979-12-31", "1981-6-30", "1982-6-30", "1983-6-30", > "1985-6-30", "1987-12-31", "1989-12-31", "1990-12-31", > "1992-6-30", "1993-6-30", "1994-6-30","1995-12-31", > - "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", "2012-6-30") > + "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", > + "2012-6-30", "2015-6-30") > .leap.seconds <- strptime(paste(.leap.seconds , "23:59:60"), > "%Y-%m-%d %H:%M:%S") > c(as.POSIXct(.leap.seconds, "GMT")) # lose the timezone > > Best Regards, > -- > Eiji NAKAMA <nakama (a) ki.rim.or.jp> > "\u4e2d\u9593\u6804\u6cbb" <nakama (a) ki.rim.or.jp> > > ______________________________________________ > R-devel at r-project.org mailing list > https://stat.ethz.ch/mailman/listinfo/r-devel >-- Brian D. Ripley, ripley at stats.ox.ac.uk Emeritus Professor of Applied Statistics, University of Oxford 1 South Parks Road, Oxford OX1 3TG, UK
sorry, i didnt watch src/main/datetime.c ...
Index: leap_second/src/main/datetime.c
==================================================================---
leap_second/src/main/datetime.c (????? 68608)
+++ leap_second/src/main/datetime.c (?????)
@@ -303,14 +303,15 @@
}
#ifndef HAVE_POSIX_LEAPSECONDS
-/* There have been 25 leapseconds: see .leap.seconds in R
+/* There have been many leapseconds: see .leap.seconds in R
+ * (as.Date(.leap.seconds)-as.Date("1970-01-01"))*86400
*/
-static int n_leapseconds = 25;
static const time_t leapseconds[] { 78796800,
94694400,126230400,157766400,189302400,220924800,252460800,
283996800,315532800,362793600,394329600,425865600,489024000,567993600,
631152000,662688000,709948800,741484800,773020800,820454400,867715200,
- 915148800,1136073600,1230768000,1341100800};
+ 915148800,1136073600,1230768000,1341100800,1435708800};
+static int n_leapseconds = sizeof(leapseconds)/sizeof(time_t);
#endif
static double guess_offset (stm *tm)
2015-07-01 17:13 GMT+09:00 Prof Brian Ripley <ripley at
stats.ox.ac.uk>:> Thanks, I was working on this.
>
> There are other changes needed in src/main/datetime.c and ?.leap.seconds
> which I will commit shortly, and the example in hist.POSIXt() needed
> alteration (it seems DJM did not run 'make check'!).
>
>
>
> On 01/07/2015 06:20, Ei-ji Nakama wrote:
>>
>> hi,
>>
>> Index: leap_second/src/library/base/R/zdatetime.R
>>
==================================================================>> ---
leap_second/src/library/base/R/zdatetime.R (revision 68608)
>> +++ leap_second/src/library/base/R/zdatetime.R (working copy)
>> @@ -24,7 +24,8 @@
>> "1979-12-31", "1981-6-30",
"1982-6-30", "1983-6-30",
>> "1985-6-30", "1987-12-31",
"1989-12-31", "1990-12-31",
>> "1992-6-30", "1993-6-30",
"1994-6-30","1995-12-31",
>> - "1997-6-30", "1998-12-31",
"2005-12-31", "2008-12-31",
>> "2012-6-30")
>> + "1997-6-30", "1998-12-31",
"2005-12-31", "2008-12-31",
>> + "2012-6-30", "2015-6-30")
>> .leap.seconds <- strptime(paste(.leap.seconds ,
"23:59:60"),
>> "%Y-%m-%d %H:%M:%S")
>> c(as.POSIXct(.leap.seconds, "GMT")) # lose the timezone
>>
>> Best Regards,
>> --
>> Eiji NAKAMA <nakama (a) ki.rim.or.jp>
>> "\u4e2d\u9593\u6804\u6cbb" <nakama (a) ki.rim.or.jp>
>>
>> ______________________________________________
>> R-devel at r-project.org mailing list
>> https://stat.ethz.ch/mailman/listinfo/r-devel
>>
>
>
> --
> Brian D. Ripley, ripley at stats.ox.ac.uk
> Emeritus Professor of Applied Statistics, University of Oxford
> 1 South Parks Road, Oxford OX1 3TG, UK
--
Best Regards,
--
Eiji NAKAMA <nakama (a) ki.rim.or.jp>
"\u4e2d\u9593\u6804\u6cbb" <nakama (a) ki.rim.or.jp>
On 01/07/2015 10:13 AM, Prof Brian Ripley wrote:> Thanks, I was working on this. > > There are other changes needed in src/main/datetime.c and ?.leap.seconds > which I will commit shortly, and the example in hist.POSIXt() needed > alteration (it seems DJM did not run 'make check'!).That's true. Sometimes simple changes aren't so simple. Duncan Murdoch> > > On 01/07/2015 06:20, Ei-ji Nakama wrote: >> hi, >> >> Index: leap_second/src/library/base/R/zdatetime.R >> ==================================================================>> --- leap_second/src/library/base/R/zdatetime.R (revision 68608) >> +++ leap_second/src/library/base/R/zdatetime.R (working copy) >> @@ -24,7 +24,8 @@ >> "1979-12-31", "1981-6-30", "1982-6-30", "1983-6-30", >> "1985-6-30", "1987-12-31", "1989-12-31", "1990-12-31", >> "1992-6-30", "1993-6-30", "1994-6-30","1995-12-31", >> - "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", "2012-6-30") >> + "1997-6-30", "1998-12-31", "2005-12-31", "2008-12-31", >> + "2012-6-30", "2015-6-30") >> .leap.seconds <- strptime(paste(.leap.seconds , "23:59:60"), >> "%Y-%m-%d %H:%M:%S") >> c(as.POSIXct(.leap.seconds, "GMT")) # lose the timezone >> >> Best Regards, >> -- >> Eiji NAKAMA <nakama (a) ki.rim.or.jp> >> "\u4e2d\u9593\u6804\u6cbb" <nakama (a) ki.rim.or.jp> >> >> ______________________________________________ >> R-devel at r-project.org mailing list >> https://stat.ethz.ch/mailman/listinfo/r-devel >> > >