diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-03-24 08:52:35 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-03-24 08:52:35 +0000 |
commit | 35247a52ef719584a59ae9c518523f0ee825c8e3 (patch) | |
tree | e14e2a884d3c40a86f93b8dcb4ec144f510fe35a /lib/date2.rb | |
parent | 1727010a3abf84fd06f0e44d44b1b8ef6cde588e (diff) |
990324
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/date2.rb')
-rw-r--r-- | lib/date2.rb | 208 |
1 files changed, 123 insertions, 85 deletions
diff --git a/lib/date2.rb b/lib/date2.rb index 6e87824b38..a1045a982e 100644 --- a/lib/date2.rb +++ b/lib/date2.rb @@ -1,107 +1,138 @@ # date.rb: Written by Tadayoshi Funaba 1998, 1999 -# $Id: date.rb,v 1.5 1999/02/06 08:51:56 tadf Exp $ +# $Id: date.rb,v 1.7 1999/03/06 02:05:59 tadf Exp $ class Date include Comparable - MONTHNAMES = [ nil, 'January', 'February', 'March', 'April', 'May', 'June', - 'July', 'August', 'September', 'October', 'November', 'December' ] + MONTHNAMES = [ nil, 'January', 'February', 'March', + 'April', 'May', 'June', 'July', 'August', + 'September', 'October', 'November', 'December' ] - DAYNAMES = [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', - 'Friday', 'Saturday' ] + DAYNAMES = [ 'Sunday', 'Monday', 'Tuesday', + 'Wednesday', 'Thursday', 'Friday', 'Saturday' ] ITALY = 2299161 # Oct 15, 1582 ENGLAND = 2361222 # Sept 14, 1752 - def Date.civil_to_jd(y, m, d, gs = true) - if m <= 2 then - y -= 1 - m += 12 + class << self + + def civil_to_jd(y, m, d, gs=true) + if m <= 2 + y -= 1 + m += 12 + end + a = (y / 100).to_i + b = 2 - a + (a / 4).to_i + jd = (365.25 * (y + 4716)).to_i + + (30.6001 * (m + 1)).to_i + + d + b - 1524 + unless + (if gs.kind_of? Numeric then jd >= gs else gs end) + jd -= b + end + jd end - a = (y / 100).to_i - b = 2 - a + (a / 4).to_i - jd = (365.25 * (y + 4716)).to_i + - (30.6001 * (m + 1)).to_i + - d + b - 1524 - unless - (if gs.kind_of? Numeric then jd >= gs else gs end) then - jd -= b + + def jd_to_civil(jd, gs=true) + unless + (if gs.kind_of? Numeric then jd >= gs else gs end) + a = jd + else + x = ((jd - 1867216.25) / 36524.25).to_i + a = jd + 1 + x - (x / 4).to_i + end + b = a + 1524 + c = ((b - 122.1) / 365.25).to_i + d = (365.25 * c).to_i + e = ((b - d) / 30.6001).to_i + dom = b - d - (30.6001 * e).to_i + if e <= 13 + m = e - 1 + y = c - 4716 + else + m = e - 13 + y = c - 4715 + end + return y, m, dom end - jd - end - def Date.jd_to_civil(jd, gs = true) - unless - (if gs.kind_of? Numeric then jd >= gs else gs end) then - a = jd - else - x = ((jd - 1867216.25) / 36524.25).to_i - a = jd + 1 + x - (x / 4).to_i + def ordinal_to_jd(y, d, gs=true) + civil_to_jd(y, 1, d, gs) end - b = a + 1524 - c = ((b - 122.1) / 365.25).to_i - d = (365.25 * c).to_i - e = ((b - d) / 30.6001).to_i - dom = b - d - (30.6001 * e).to_i - if e <= 13 then - m = e - 1 - y = c - 4716 - else - m = e - 13 - y = c - 4715 + + def jd_to_ordinal(jd, gs=true) + y, *_ = jd_to_civil(jd, gs) + ns = if gs.kind_of? Numeric then jd >= gs else gs end + pl = civil_to_jd(y - 1, 12, 31, ns) + doy = jd - pl + return y, doy end - return y, m, dom - end - def Date.mjd_to_jd(mjd) - mjd + 2400000.5 - end + def mjd_to_jd(mjd) + mjd + 2400000.5 + end - def Date.jd_to_mjd(jd) - jd - 2400000.5 - end + def jd_to_mjd(jd) + jd - 2400000.5 + end - def Date.tjd_to_jd(tjd) - tjd + 2440000.5 - end + def tjd_to_jd(tjd) + tjd + 2440000.5 + end - def Date.jd_to_tjd(jd) - jd - 2440000.5 - end + def jd_to_tjd(jd) + jd - 2440000.5 + end - def Date.julian_leap? (y) - y % 4 == 0 - end + def julian_leap? (y) + y % 4 == 0 + end - def Date.gregorian_leap? (y) - y % 4 == 0 and y % 100 != 0 or y % 400 == 0 - end + def gregorian_leap? (y) + y % 4 == 0 and y % 100 != 0 or y % 400 == 0 + end - def Date.leap? (y) - Date.gregorian_leap?(y) - end + alias_method :leap?, :gregorian_leap? - def initialize(jd = 0, gs = ITALY) - @jd, @gs = jd, gs - end + def exist3? (y, m, d, gs=true) + jd = civil_to_jd(y, m, d, gs) + if [y, m, d] == jd_to_civil(jd, gs) + jd + end + end - def Date.exist? (y, m, d, gs = true) - jd = Date.civil_to_jd(y, m, d, gs) - if [y, m, d] == Date.jd_to_civil(jd, gs) then - jd + alias_method :exist?, :exist3? + + def new3(y=-4712, m=1, d=1, gs=ITALY) + unless jd = exist3?(y, m, d, gs) + fail ArgumentError, 'invalid date' + end + new(jd, gs) + end + + def exist2? (y, d, gs=true) + jd = ordinal_to_jd(y, d, gs) + if [y, d] == jd_to_ordinal(jd, gs) + jd + end end - end - def Date.new3(y = -4712, m = 1, d = 1, gs = ITALY) - unless jd = Date.exist?(y, m, d, gs) then - fail ArgumentError, 'invalid date' + def new2(y=-4712, d=1, gs=ITALY) + unless jd = exist2?(y, d, gs) + fail ArgumentError, 'invalid date' + end + new(jd, gs) end - Date.new(jd, gs) + + def today(gs=ITALY) + new(civil_to_jd(*(Time.now.to_a[3..5].reverse << gs)), gs) + end + end - def Date.today(gs = ITALY) - Date.new(Date.civil_to_jd(*(Time.now.to_a[3..5].reverse << gs)), gs) + def initialize(jd=0, gs=ITALY) + @jd, @gs = jd, gs end def jd @@ -109,19 +140,19 @@ class Date end def mjd - def self.mjd; @mjd end + def self.mjd() @mjd end @mjd = Date.jd_to_mjd(@jd) end def tjd - def self.tjd; @tjd end + def self.tjd() @tjd end @tjd = Date.jd_to_tjd(@jd) end def civil - def self.year; @year end - def self.mon; @mon end - def self.mday; @mday end + def self.year() @year end + def self.mon() @mon end + def self.mday() @mday end @year, @mon, @mday = Date.jd_to_civil(@jd, @gs) end @@ -133,10 +164,9 @@ class Date end def yday - def self.yday; @yday end - ns = if @gs.kind_of? Numeric then @jd >= @gs else @gs end - jd = Date.civil_to_jd(year - 1, 12, 31, ns) - @yday = @jd - jd + def self.yday() @yday end + _, @yday = Date.jd_to_ordinal(@jd, @gs) + @yday end def mon @@ -150,12 +180,12 @@ class Date end def wday - def self.wday; @wday end + def self.wday() @wday end @wday = (@jd + 1) % 7 end def leap? - def self.leap?; @leap_p end + def self.leap?() @leap_p end ns = if @gs.kind_of? Numeric then @jd >= @gs else @gs end jd = Date.civil_to_jd(year, 2, 28, ns) @leap_p = Date.jd_to_civil(jd + 1, ns)[1] == 2 @@ -214,4 +244,12 @@ class Date format('%04d-%02d-%02d', year, mon, mday) end + def _dump(limit) + Marshal.dump([@jd, @gs], -1) + end + + def Date._load(str) + Date.new(*Marshal.load(str)) + end + end |