Changeset 3059

Timestamp:

12/20/07 11:10:58 (1 year ago)

Author:

schveiguy

Message:

Added BC date capability to Gregorian Calendar.
Added some unit tests to Gregorian Calendar.

Files:

• trunk/tango/time/chrono/Calendar.d (modified) (2 diffs)
• trunk/tango/time/chrono/Gregorian.d (modified) (12 diffs)
• trunk/tango/time/chrono/GregorianBased.d (modified) (1 diff)

trunk/tango/time/chrono/Calendar.d

@@ -135 +135 @@
-        Time toTime (Date d) 
-        {
-CURRENT_ERA
+d.era
-        }
-
@@ -145 +145 @@
-        Time toTime (Date d, TimeOfDay t) 
-        {
-CURRENT_ERA
+d.era
-        }
-

trunk/tango/time/chrono/Gregorian.d

@@ -8 +8 @@
-                        Apr 2007: reshaped                        
-
-
+, schveiguy
-
-******************************************************************************/
@@ -15 +15 @@
-
-private import tango.time.chrono.Calendar;
-
-
-/**
- * $(ANCHOR _Gregorian)
- * Represents the Gregorian calendar.
-
+
+
+
+
+
+
+
+
-class Gregorian : Calendar 
-{
@@ -44 +50 @@
-        * Represents the current era.
-        */
-
+BC_ERA = 2, 
-
-        private static final uint[] DaysToMonthCommon = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];
@@ -82 +88 @@
-        override Time toTime (uint year, uint month, uint day, uint hour, uint minute, uint second, uint millisecond, uint era)
-        {
-
+, era
-        }
-
@@ -92 +98 @@
-        override DayOfWeek getDayOfWeek(Time time) 
-        {
-
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -138 +153 @@
-        * Overridden. Returns the era in the specified Time.
-        * Params: time = A Time value.
-ar
+ra
-        */
-        override uint getEra(Time time) 
-        {
-
+
+
+
+
-        }
-
@@ -155 +173 @@
-        override uint getDaysInMonth(uint year, uint month, uint era) 
-        {
-(year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
+isLeapYear(year, era
-                return monthDays[month] - monthDays[month - 1];
-        }
@@ -191 +209 @@
-        override bool isLeapYear(uint year, uint era) 
-        {
-(year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
+staticIsLeapYear(year, era
-        }
-
@@ -209 +227 @@
-        override uint[] eras() 
-        {       
-
+, BC_ERA
-                return tmp.dup;
-        }
@@ -224 +242 @@
-        override void split(Time time, ref uint year, ref uint month, ref uint day, ref uint doy, ref uint dow, ref uint era)
-        {
-
-
+
-            dow = getDayOfWeek(time);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                dayOfYear = numDays + 1;
-
-(wholeYears == 3 && (whole4Years != 24 || whole100Years == 3)
+staticIsLeapYear(year, era
-                month = numDays >> 5 + 1;
-                while (numDays >= monthDays[month])
@@ -259 +314 @@
-        package static uint extractPart (long ticks, DatePart part) 
-        {
-
-
-
+, era
+
+, era
-
-                if (part is DatePart.Year)
@@ -275 +330 @@
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}
+
+debug(Gregorian)
+{
+        import tango.io.Stdout;
+
+        void output(Time t)
+        {
+                Date d = Gregorian.generic.toDate(t);
+                TimeOfDay tod = t.time;
+                Stdout.format("{}/{}/{:d4} {} {}:{:d2}:{:d2}.{:d3} dow:{}",
+                                d.month, d.day, d.year, d.era == Gregorian.AD_ERA ? "AD" : "BC",
+                                tod.hours, tod.minutes, tod.seconds, tod.millis, d.dow).newline;
+        }
+
+        void main()
+        {
+                Time t = Time(365 * TimeSpan.TicksPerDay);
+                output(t);
+                for(int i = 0; i < 366 + 365; i++)
+                {
+                        t -= TimeSpan.days(1);
+                        output(t);
+                }
+        }
+}
+
+debug(UnitTest)
+{
+        debug(Gregorian)
+        {
+        }
+        else
+        {
+                void main() {}
+        }
+
+        unittest
+        {
+                //
+                // check Gregorian date handles positive time.
+                //
+                Time t = Time.epoch + TimeSpan.days(365);
+                Date d = Gregorian.generic.toDate(t);
+                assert(d.year == 2);
+                assert(d.month == 1);
+                assert(d.day == 1);
+                assert(d.era == Gregorian.AD_ERA);
+                assert(d.doy == 1);
+                //
+                // note that this is in disagreement with the Julian Calendar
+                //
+                assert(d.dow == Gregorian.DayOfWeek.Tuesday);
+
+                //
+                // check that it handles negative time
+                //
+                t = Time.epoch - TimeSpan.days(366);
+                d = Gregorian.generic.toDate(t);
+                assert(d.year == 1);
+                assert(d.month == 1);
+                assert(d.day == 1);
+                assert(d.era == Gregorian.BC_ERA);
+                assert(d.doy == 1);
+                assert(d.dow == Gregorian.DayOfWeek.Saturday);
+
+        }
+}

trunk/tango/time/chrono/GregorianBased.d

@@ -103 +103 @@
-      long getTicks(uint year, uint month, uint day)
-      {
-
+, Gregorian.AD_ERA
-      }
-      eraRanges[Gregorian.JAPAN] ~= EraRange(4, getTicks(1989, 1, 8), 1988, 1, Gregorian.MAX_YEAR);