From 7186bdce93396c69ffad5a97b8833bbef03a5dd9 Mon Sep 17 00:00:00 2001 From: Douglas Date: Sat, 10 Dec 2016 20:07:09 -0600 Subject: [PATCH 1/2] working on style --- Gemfile | 6 + lib/solareventcalculator.rb | 331 +++++++++-------- rubysunrise.gemspec | 24 +- test/33_8600S-151_2111E#Australia-Sydney.txt | 352 +++++++++--------- test/39_9937N-75_7850W#America-New_York.txt | 334 ++++++++--------- test/40_0194N-105_2928W#America-Denver.txt | 364 +++++++++---------- test/bulkdatatest.rb | 61 ++-- test/none-test.rb | 45 +++ test/sunrisetest.rb | 275 +++++++++++--- test/sunsettest.rb | 168 ++++++--- 10 files changed, 1130 insertions(+), 830 deletions(-) create mode 100644 Gemfile create mode 100644 test/none-test.rb diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..d0f56e0 --- /dev/null +++ b/Gemfile @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +gemspec +gem 'minitest-spec-expect' +gem 'tzinfo' +gem 'tzinfo-data' \ No newline at end of file diff --git a/lib/solareventcalculator.rb b/lib/solareventcalculator.rb index 85ac085..14770b4 100644 --- a/lib/solareventcalculator.rb +++ b/lib/solareventcalculator.rb @@ -1,247 +1,266 @@ + require 'bigdecimal' require 'date' require 'tzinfo' +# class SolarEventCalculator - - @date - @latitude - @longitude + include Math + attr_accessor :date, :latitude, :longitude + attr_accessor :pi, :to_rad, :to_deg, :cycle def initialize(date, latitude, longitude) @date = date @latitude = latitude @longitude = longitude + @pi = PI + @cycle = @pi * 2 + @to_rad = @pi / 180.0 + @to_deg = 180.0 / @pi end def compute_lnghour - lngHour = @longitude / BigDecimal.new("15") - lngHour.round(4) + lng_hour = @longitude / BigDecimal.new('15') + lng_hour.round(4) end - def compute_longitude_hour(isSunrise) - minuend = (isSunrise) ? BigDecimal.new("6") : BigDecimal.new("18") - longHour = @date.yday + ((minuend - compute_lnghour) / BigDecimal.new("24")) - longHour.round(4) + def compute_longitude_hour(is_sunrise) + minuend = is_sunrise ? BigDecimal.new('6') : BigDecimal.new('18') + long_hour = + @date.yday + + ((minuend - compute_lnghour) / + BigDecimal.new('24')) + long_hour.round(4) end - def compute_sun_mean_anomaly(longHour) - constant = BigDecimal.new("0.9856") - ((longHour * constant) - BigDecimal.new("3.289")).round(4) + def compute_sun_mean_anomaly(long_hour) + constant = BigDecimal.new('0.9856') + ((long_hour * constant) - BigDecimal.new('3.289')).round(4) end - def compute_sun_true_longitude(meanAnomaly) - mAsRads = degrees_as_rads(meanAnomaly) - sinM = BigDecimal.new(Math.sin(mAsRads.to_f).to_s) - sinTwoM = BigDecimal.new(Math.sin((2 * mAsRads).to_f).to_s) - firstParens = BigDecimal.new("1.916") * sinM - secondParens = BigDecimal.new("0.020") * sinTwoM - trueLong = meanAnomaly + firstParens + secondParens + BigDecimal.new("282.634") - trueLong = put_in_range(trueLong, 0, 360, 360) - trueLong.round(4) + def compute_sun_true_longitude(mean_anomaly) + ma_rads = mean_anomaly * @to_rad + sin_ma = sin(ma_rads) + sin_2_ma = sin(2 * ma_rads) + first_parens = sin_ma * 1.916 + second_parens = sin_2_ma * 0.020 + true_long = mean_anomaly + first_parens + second_parens + 282.634 + true_long = put_in_range(true_long, 0, 360, 360) + true_long.round(4) end - def compute_right_ascension(sunTrueLong) - tanL = BigDecimal.new(Math.tan(degrees_as_rads(sunTrueLong).to_f).to_s) - ra = rads_as_degrees(BigDecimal.new(Math.atan(BigDecimal.new("0.91764") * tanL).to_s)) + def put_in_range(number, lower, upper, adjuster) + number -= adjuster if number > upper + number += adjuster if number < lower + number + end + def compute_right_ascension(true_long) + tan = tan(true_long * @to_rad) + ra = atan(0.91764 * tan) * @to_deg ra = put_in_range(ra, 0, 360, 360) ra.round(4) end - def put_ra_in_correct_quadrant(sunTrueLong) - lQuadrant = BigDecimal.new("90") * (sunTrueLong / BigDecimal.new("90")).floor - raQuadrant = BigDecimal.new("90") * (compute_right_ascension(sunTrueLong) / BigDecimal.new("90")).floor + def put_ra_in_correct_quadrant(true_long) + l_quadrant = 90.0 * (true_long / 90.0).floor + ra_quadrant = 90.0 * (compute_right_ascension(true_long) / 90.0).floor - ra = compute_right_ascension(sunTrueLong) + (lQuadrant - raQuadrant) - ra = ra / BigDecimal.new("15") + ra = compute_right_ascension(true_long) + (l_quadrant - ra_quadrant) + ra /= 15.0 ra.round(4) end - def compute_sin_sun_declination(sunTrueLong) - sinL = BigDecimal.new(Math.sin(degrees_as_rads(sunTrueLong).to_f).to_s) - sinDec = sinL * BigDecimal.new("0.39782") - sinDec.round(4) + def compute_sine_sun_declination(true_long) + sine = sin(true_long * @to_rad) + sin_dec = sine * 0.39782 + sin_dec.round(4) end - def compute_cosine_sun_declination(sinSunDeclination) - cosDec = BigDecimal.new(Math.cos(Math.asin(sinSunDeclination)).to_s) - cosDec.round(4) + def compute_cosine_sun_declination(sine_declination) + cos_dec = cos(asin(sine_declination)) + cos_dec.round(4) end - def compute_cosine_sun_local_hour(sunTrueLong, zenith) - cosZenith = BigDecimal.new(Math.cos(degrees_as_rads(BigDecimal.new(zenith.to_s))).to_s) - sinLatitude = BigDecimal.new(Math.sin(degrees_as_rads(@latitude)).to_s) - cosLatitude = BigDecimal.new(Math.cos(degrees_as_rads(@latitude)).to_s) - - sinSunDeclination = compute_sin_sun_declination(sunTrueLong) - top = cosZenith - (sinSunDeclination * sinLatitude) - bottom = compute_cosine_sun_declination(sinSunDeclination) * cosLatitude - - cosLocalHour = top / bottom - cosLocalHour.round(4) + def compute_cosine_sun_local_hour(true_long, zenith) + cosine_zenith = cos(zenith * @to_rad) + sine_latitude = sin(@latitude * @to_rad) + cosine_latitude = cos(@latitude * @to_rad) + sine_declination = compute_sine_sun_declination(true_long) + top = cosine_zenith - (sine_declination * sine_latitude) + bottom = compute_cosine_sun_declination(sine_declination) * cosine_latitude + cosine_local_hour = top / bottom + cosine_local_hour.round(4) end - def compute_local_hour_angle(cosSunLocalHour, isSunrise) - acosH = BigDecimal.new(Math.acos(cosSunLocalHour).to_s) - acosHDegrees = rads_as_degrees(acosH) - - localHourAngle = (isSunrise) ? BigDecimal.new("360") - acosHDegrees : acosHDegrees - localHourAngle = localHourAngle / BigDecimal.new("15") - localHourAngle.round(4) + def compute_local_hour_angle(cosine_local_hour, is_sunrise) + acos_h = acos(cosine_local_hour) + local_hour_angle = is_sunrise ? @cycle - acos_h : acos_h + local_hour_angle /= 15.0 + (local_hour_angle * @to_deg).round(4) end - def compute_local_mean_time(sunTrueLong, longHour, t, sunLocalHour) - h = sunLocalHour - ra = put_ra_in_correct_quadrant(sunTrueLong) - - parens = BigDecimal.new("0.06571") * t - time = h + ra - parens - BigDecimal.new("6.622") - - utcTime = time - longHour - utcTime = put_in_range(utcTime, 0, 24, 24) - utcTime.round(4) + def compute_local_mean_time(true_long, long_hour, t, local_hour) + h = local_hour + ra = put_ra_in_correct_quadrant(true_long) + parens = 0.06571 * t + time = h + ra - parens - 6.622 + utc_time = time - long_hour + utc_time = put_in_range(utc_time, 0, 24, 24) + utc_time.round(4) end - def compute_utc_solar_event(zenith, isSunrise) - longHour = compute_lnghour - eventLongHour = compute_longitude_hour(isSunrise) - - meanAnomaly = compute_sun_mean_anomaly(eventLongHour) - sunTrueLong = compute_sun_true_longitude(meanAnomaly) - cosineSunLocalHour = compute_cosine_sun_local_hour(sunTrueLong, zenith) - - if(cosineSunLocalHour > BigDecimal.new("1") || cosineSunLocalHour < BigDecimal.new("-1")) - return nil + def pad_minutes(minutes) + if minutes < 10 + '0' + minutes.to_s + else + minutes end + end - sunLocalHour = compute_local_hour_angle(cosineSunLocalHour, isSunrise) - localMeanTime = compute_local_mean_time(sunTrueLong, longHour, eventLongHour, sunLocalHour) - - timeParts = localMeanTime.to_f.to_s.split('.') - mins = BigDecimal.new("." + timeParts[1]) * BigDecimal.new("60") - mins = mins.truncate() - mins = pad_minutes(mins.to_i) - hours = timeParts[0] - - Time.utc(@date.year, @date.mon, @date.mday, hours, pad_minutes(mins.to_i)) + def cosine_range(cosine_local_hour) + cosine = cosine_local_hour + cosine_local_hour > BigDecimal.new('1') ? cosine = nil : cosine + cosine_local_hour < BigDecimal.new('-1') ? cosine = nil : cosine + cosine + end + + def compute_utc_solar_event(zenith, is_sunrise) + event_long_hour = compute_longitude_hour(is_sunrise) + mean_anomaly = compute_sun_mean_anomaly(event_long_hour) + true_long = compute_sun_true_longitude(mean_anomaly) + cosine_local_hour = compute_cosine_sun_local_hour(true_long, zenith) + cosine_range(cosine_local_hour).nil? ? return : cosine_local_hour + local_hour = compute_local_hour_angle(cosine_local_hour, is_sunrise) + local_mean_time = + compute_local_mean_time( + true_long, + compute_lnghour, + event_long_hour, + local_hour + ) + time_parts = local_mean_time.to_f.to_s.split('.') + mins = BigDecimal.new('.' + time_parts[1]) * BigDecimal.new('60') + mins = mins.truncate.to_f + hours = time_parts[0].to_f + Time.utc( + @date.year, + @date.mon, + @date.mday, + hours, + pad_minutes(mins.to_i), + 0 + ).to_datetime + DateTime.new(@date.year, @date.mon, @date.day, hours, mins, 0) end - def compute_utc_civil_sunrise - convert_to_datetime(compute_utc_solar_event(96, true)) + def convert_to_datetime(time) + unless time.nil? DateTime.parse( + "#{@date.strftime}T#{time.hour}:#{time.min}:00+0000" + ) + end end - def compute_utc_civil_sunset - convert_to_datetime(compute_utc_solar_event(96, false)) + def get_utc_offset(timezone) + tz = TZInfo::Timezone.get(timezone) + noon_utc = Time.gm(@date.year, @date.mon, @date.mday, 12, 0) + tz.utc_to_local(noon_utc) - noon_utc end - def compute_utc_official_sunrise - convert_to_datetime(compute_utc_solar_event(90.8333, true)) + def dt_from_utc_time(utc_time, offset) + DateTime.new( + utc_time.to_date.year, + utc_time.to_date.month, + utc_time.to_date.day, + (utc_time + offset.to_f).hour, + (utc_time + offset.to_f).min, + (utc_time + offset.to_f).sec, + offset + ) end - def compute_utc_official_sunset - convert_to_datetime(compute_utc_solar_event(90.8333, false)) + def put_in_timezone(utc_time, timezone) + offset = Rational((get_utc_offset(timezone) / 60.0 / 60.0).to_i, 24) + dt_from_utc_time(utc_time, offset) end - def compute_utc_nautical_sunrise - convert_to_datetime(compute_utc_solar_event(102, true)) + def compute_utc_astronomical_sunrise + compute_utc_solar_event(108, true) end - def compute_utc_nautical_sunset - convert_to_datetime(compute_utc_solar_event(102, false)) + def compute_astronomical_sunrise(timezone) + date_time = compute_utc_solar_event(108, true) + put_in_timezone(date_time, timezone) end - def compute_utc_astronomical_sunrise - convert_to_datetime(compute_utc_solar_event(108, true)) + def compute_utc_nautical_sunrise + compute_utc_solar_event(102, true) end - def compute_utc_astronomical_sunset - convert_to_datetime(compute_utc_solar_event(108, false)) + def compute_nautical_sunrise(timezone) + compute_utc_solar_event(102, true) + put_in_timezone(compute_utc_solar_event(102, true), timezone) end - def convert_to_datetime(time) - DateTime.parse("#{@date.strftime}T#{time.hour}:#{time.min}:00+0000") unless time == nil + def compute_utc_civil_sunrise + compute_utc_solar_event(96, true) end def compute_civil_sunrise(timezone) + compute_utc_solar_event(96, true) put_in_timezone(compute_utc_solar_event(96, true), timezone) end - def compute_civil_sunset(timezone) - put_in_timezone(compute_utc_solar_event(96, false), timezone) + def compute_utc_official_sunrise + compute_utc_solar_event(90.8333, true) end def compute_official_sunrise(timezone) - put_in_timezone(compute_utc_solar_event(90.8333, true), timezone) - end - - def compute_official_sunset(timezone) - put_in_timezone(compute_utc_solar_event(90.8333, false), timezone) + sr = compute_utc_solar_event(90.8333, true) + put_in_timezone(sr, timezone) end - def compute_nautical_sunrise(timezone) - put_in_timezone(compute_utc_solar_event(102, true), timezone) + def compute_utc_official_sunset + compute_utc_solar_event(90.8333, false) end - def compute_nautical_sunset(timezone) - put_in_timezone(compute_utc_solar_event(102, false), timezone) + def compute_official_sunset(timezone) + compute_utc_solar_event(90.8333, false) + put_in_timezone(compute_utc_solar_event(90.8333, false), timezone) end - def compute_astronomical_sunrise(timezone) - put_in_timezone(compute_utc_solar_event(108, true), timezone) + def compute_utc_civil_sunset + compute_utc_solar_event(96, false) end - def compute_astronomical_sunset(timezone) - put_in_timezone(compute_utc_solar_event(108, false), timezone) + def compute_civil_sunset(timezone) + compute_utc_solar_event(96, false) + put_in_timezone(compute_utc_solar_event(96, false), timezone) end - def put_in_timezone(utcTime, timezone) - tz = TZInfo::Timezone.get(timezone) - # puts "UTCTime #{utcTime}" - local = utcTime + get_utc_offset(timezone) - # puts "LocalTime #{local}" - - offset = (get_utc_offset(timezone) / 60 / 60).to_i - offset = (offset > 0) ? "+" + offset.to_s : offset.to_s - - timeInZone = DateTime.parse("#{@date.strftime}T#{local.strftime('%H:%M:%S')}#{offset}") - # puts "CALC:timeInZone #{timeInZone}" - timeInZone + def compute_utc_nautical_sunset + compute_utc_solar_event(102, false) end - def get_utc_offset(timezone) - tz = TZInfo::Timezone.get(timezone) - noonUTC = Time.gm(@date.year, @date.mon, @date.mday, 12, 0) - tz.utc_to_local(noonUTC) - noonUTC + def compute_nautical_sunset(timezone) + compute_utc_solar_event(102, false) + put_in_timezone(compute_utc_solar_event(102, false), timezone) end - def pad_minutes(minutes) - if(minutes < 10) - "0" + minutes.to_s - else - minutes - end + def compute_utc_astronomical_sunset + compute_utc_solar_event(108, false) end - def put_in_range(number, lower, upper, adjuster) - if number > upper then - number -= adjuster - elsif number < lower then - number += adjuster - else - number - end + def compute_astronomical_sunset(timezone) + compute_utc_solar_event(108, false) + put_in_timezone(compute_utc_solar_event(108, false), timezone) end - def degrees_as_rads(degrees) - pi = BigDecimal(Math::PI.to_s) - radian = pi / BigDecimal.new("180") - degrees * radian + def degrees_to_radians(degrees) + degrees * @to_rad end - def rads_as_degrees(radians) - pi = BigDecimal(Math::PI.to_s) - degree = BigDecimal.new("180") / pi - radians * degree + def radians_to_degrees(radians) + radians * @to_deg end end diff --git a/rubysunrise.gemspec b/rubysunrise.gemspec index d2d053d..987004f 100644 --- a/rubysunrise.gemspec +++ b/rubysunrise.gemspec @@ -1,13 +1,15 @@ -spec = Gem::Specification.new do | s | - s.name = "RubySunrise" - s.version = "0.3.1" - s.author = "Mike Reedell / LuckyCatLabs" - s.email = "mike@reedell.com" - s.homepage = "http://www.mikereedell.com" + +Gem::Specification.new do |s| + s.name = 'RubySunrise' + s.version = '0.3.1' + s.author = 'Mike Reedell / LuckyCatLabs' + s.email = 'mike@reedell.com' + s.homepage = 'http://www.mikereedell.com' s.platform = Gem::Platform::RUBY - s.summary = "Calculate the sunrise/sunset given lat/long coordinates and the date. Computes civil, official, nautical, and astronomical sunrise/sunset." - s.files = ["rubysunrise.gemspec"] + Dir.glob("lib/**/*") - s.test_files = Dir.glob("{test}/**/*test.rb") + s.summary = + 'Calculate the sunrise/sunset given lat/long coordinates and the date. + Computes civil, official, nautical, and astronomical sunrise/sunset.' + s.files = ['rubysunrise.gemspec'] + Dir.glob('lib/**/*') + s.test_files = Dir.glob('{test}/**/*test.rb') s.has_rdoc = false - s.add_runtime_dependency "tzinfo" -end \ No newline at end of file +end diff --git a/test/33_8600S-151_2111E#Australia-Sydney.txt b/test/33_8600S-151_2111E#Australia-Sydney.txt index b17bfaa..6572257 100644 --- a/test/33_8600S-151_2111E#Australia-Sydney.txt +++ b/test/33_8600S-151_2111E#Australia-Sydney.txt @@ -1,16 +1,16 @@ 1/01/2008,04:04,04:43,05:18,05:47,20:09,20:38,21:14,21:53 1/02/2008,04:05,04:44,05:19,05:48,20:10,20:39,21:14,21:53 -1/03/2008,04:06,04:44,05:20,05:49,20:10,20:39,21:14,21:53 -1/04/2008,04:07,04:45,05:21,05:50,20:10,20:39,21:14,21:53 -1/05/2008,04:08,04:46,05:22,05:51,20:10,20:39,21:14,21:53 +1/03/2008,04:06,04:44,05:20,05:48,20:10,20:39,21:14,21:53 +1/04/2008,04:07,04:45,05:21,05:49,20:10,20:39,21:14,21:53 +1/05/2008,04:08,04:46,05:22,05:50,20:10,20:39,21:14,21:53 1/06/2008,04:09,04:47,05:23,05:51,20:10,20:39,21:14,21:53 1/07/2008,04:10,04:48,05:23,05:52,20:10,20:39,21:14,21:52 1/08/2008,04:11,04:49,05:24,05:53,20:10,20:39,21:14,21:52 -1/09/2008,04:12,04:50,05:25,05:54,20:10,20:39,21:14,21:52 -1/10/2008,04:13,04:51,05:26,05:55,20:10,20:39,21:14,21:52 -1/11/2008,04:14,04:52,05:27,05:56,20:10,20:38,21:13,21:51 -1/12/2008,04:15,04:53,05:28,05:57,20:10,20:38,21:13,21:51 -1/13/2008,04:17,04:54,05:29,05:58,20:10,20:38,21:13,21:50 +1/09/2008,04:12,04:50,05:25,05:53,20:10,20:39,21:14,21:52 +1/10/2008,04:13,04:51,05:26,05:54,20:10,20:39,21:14,21:52 +1/11/2008,04:14,04:52,05:27,05:55,20:10,20:38,21:13,21:51 +1/12/2008,04:15,04:53,05:28,05:56,20:10,20:38,21:13,21:51 +1/13/2008,04:17,04:54,05:29,05:57,20:10,20:38,21:13,21:50 1/14/2008,04:18,04:55,05:30,05:58,20:09,20:38,21:12,21:50 1/15/2008,04:19,04:56,05:31,05:59,20:09,20:38,21:12,21:49 1/16/2008,04:20,04:58,05:32,06:00,20:09,20:37,21:12,21:49 @@ -40,298 +40,298 @@ 2/09/2008,04:52,05:26,05:58,06:24,19:54,20:21,20:53,21:26 2/10/2008,04:54,05:27,05:59,06:25,19:53,20:20,20:52,21:25 2/11/2008,04:55,05:28,06:00,06:26,19:52,20:19,20:50,21:24 -2/12/2008,04:56,05:29,06:01,06:27,19:52,20:18,20:49,21:22 -2/13/2008,04:57,05:30,06:02,06:28,19:51,20:17,20:48,21:21 -2/14/2008,04:59,05:31,06:03,06:29,19:50,20:16,20:47,21:20 -2/15/2008,05:00,05:32,06:04,06:30,19:48,20:15,20:46,21:18 -2/16/2008,05:01,05:34,06:05,06:31,19:47,20:14,20:45,21:17 -2/17/2008,05:02,05:35,06:06,06:32,19:46,20:12,20:43,21:16 -2/18/2008,05:04,05:36,06:07,06:33,19:45,20:11,20:42,21:14 -2/19/2008,05:05,05:37,06:08,06:34,19:44,20:10,20:41,21:13 +2/12/2008,04:56,05:29,06:01,06:26,19:52,20:18,20:49,21:22 +2/13/2008,04:57,05:30,06:02,06:27,19:51,20:17,20:48,21:21 +2/14/2008,04:59,05:31,06:03,06:28,19:50,20:16,20:47,21:20 +2/15/2008,05:00,05:32,06:04,06:29,19:48,20:15,20:46,21:18 +2/16/2008,05:01,05:34,06:05,06:30,19:47,20:14,20:45,21:17 +2/17/2008,05:02,05:35,06:06,06:31,19:46,20:12,20:43,21:16 +2/18/2008,05:04,05:36,06:07,06:32,19:45,20:11,20:42,21:14 +2/19/2008,05:05,05:37,06:08,06:33,19:44,20:10,20:41,21:13 2/20/2008,05:06,05:38,06:09,06:34,19:43,20:09,20:40,21:12 2/21/2008,05:07,05:39,06:10,06:35,19:42,20:08,20:38,21:10 2/22/2008,05:08,05:40,06:11,06:36,19:41,20:07,20:37,21:09 2/23/2008,05:09,05:41,06:11,06:37,19:40,20:05,20:36,21:07 2/24/2008,05:11,05:42,06:12,06:38,19:39,20:04,20:35,21:06 -2/25/2008,05:12,05:43,06:13,06:39,19:37,20:03,20:33,21:04 -2/26/2008,05:13,05:44,06:14,06:40,19:36,20:02,20:32,21:03 -2/27/2008,05:14,05:45,06:15,06:41,19:35,20:00,20:31,21:02 -2/28/2008,05:15,05:46,06:16,06:42,19:34,19:59,20:29,21:00 +2/25/2008,05:12,05:43,06:13,06:38,19:37,20:03,20:33,21:04 +2/26/2008,05:13,05:44,06:14,06:39,19:36,20:02,20:32,21:03 +2/27/2008,05:14,05:45,06:15,06:40,19:35,20:00,20:31,21:02 +2/28/2008,05:15,05:46,06:16,06:41,19:34,19:59,20:29,21:00 2/29/2008,05:16,05:47,06:17,06:42,19:32,19:58,20:28,20:59 3/01/2008,05:17,05:48,06:18,06:43,19:31,19:57,20:27,20:57 3/02/2008,05:18,05:49,06:19,06:44,19:30,19:55,20:25,20:56 3/03/2008,05:19,05:50,06:20,06:45,19:29,19:54,20:24,20:54 -3/04/2008,05:20,05:51,06:21,06:46,19:27,19:53,20:22,20:53 -3/05/2008,05:21,05:52,06:21,06:47,19:26,19:51,20:21,20:51 +3/04/2008,05:20,05:51,06:21,06:45,19:27,19:53,20:22,20:53 +3/05/2008,05:21,05:52,06:21,06:46,19:26,19:51,20:21,20:51 3/06/2008,05:22,05:53,06:22,06:47,19:25,19:50,20:20,20:50 3/07/2008,05:23,05:54,06:23,06:48,19:24,19:49,20:18,20:48 3/08/2008,05:24,05:54,06:24,06:49,19:22,19:47,20:17,20:47 -3/09/2008,05:25,05:55,06:25,06:50,19:21,19:46,20:15,20:46 -3/10/2008,05:26,05:56,06:26,06:51,19:20,19:45,20:14,20:44 -3/11/2008,05:27,05:57,06:26,06:52,19:18,19:43,20:13,20:43 +3/09/2008,05:25,05:55,06:25,06:49,19:21,19:46,20:15,20:46 +3/10/2008,05:26,05:56,06:26,06:50,19:20,19:45,20:14,20:44 +3/11/2008,05:27,05:57,06:26,06:51,19:18,19:43,20:13,20:43 3/12/2008,05:28,05:58,06:27,06:52,19:17,19:42,20:11,20:41 3/13/2008,05:29,05:59,06:28,06:53,19:16,19:41,20:10,20:40 -3/14/2008,05:30,06:00,06:29,06:54,19:14,19:39,20:09,20:38 -3/15/2008,05:31,06:00,06:30,06:55,19:13,19:38,20:07,20:37 +3/14/2008,05:30,06:00,06:29,06:53,19:14,19:39,20:09,20:38 +3/15/2008,05:31,06:00,06:30,06:54,19:13,19:38,20:07,20:37 3/16/2008,05:32,06:01,06:31,06:55,19:12,19:37,20:06,20:35 3/17/2008,05:33,06:02,06:31,06:56,19:10,19:35,20:04,20:34 3/18/2008,05:33,06:03,06:32,06:57,19:09,19:34,20:03,20:32 -3/19/2008,05:34,06:04,06:33,06:58,19:08,19:32,20:02,20:31 -3/20/2008,05:35,06:05,06:34,06:59,19:06,19:31,20:00,20:29 +3/19/2008,05:34,06:04,06:33,06:57,19:08,19:32,20:02,20:31 +3/20/2008,05:35,06:05,06:34,06:58,19:06,19:31,20:00,20:29 3/21/2008,05:36,06:05,06:34,06:59,19:05,19:30,19:59,20:28 3/22/2008,05:37,06:06,06:35,07:00,19:03,19:28,19:57,20:27 -3/23/2008,05:38,06:07,06:36,07:01,19:02,19:27,19:56,20:25 -3/24/2008,05:38,06:08,06:37,07:02,19:01,19:26,19:55,20:24 +3/23/2008,05:38,06:07,06:36,07:00,19:02,19:27,19:56,20:25 +3/24/2008,05:38,06:08,06:37,07:01,19:01,19:26,19:55,20:24 3/25/2008,05:39,06:08,06:37,07:02,18:59,19:24,19:53,20:22 3/26/2008,05:40,06:09,06:38,07:03,18:58,19:23,19:52,20:21 -3/27/2008,05:41,06:10,06:39,07:04,18:57,19:22,19:50,20:20 -3/28/2008,05:42,06:11,06:40,07:05,18:55,19:20,19:49,20:18 +3/27/2008,05:41,06:10,06:39,07:03,18:57,19:22,19:50,20:20 +3/28/2008,05:42,06:11,06:40,07:04,18:55,19:20,19:49,20:18 3/29/2008,05:42,06:12,06:40,07:05,18:54,19:19,19:48,20:17 3/30/2008,05:43,06:12,06:41,07:06,18:53,19:18,19:46,20:15 -3/31/2008,05:44,06:13,06:42,07:07,18:51,19:16,19:45,20:14 -4/01/2008,05:45,06:14,06:43,07:08,18:50,19:15,19:44,20:13 +3/31/2008,05:44,06:13,06:42,07:06,18:51,19:16,19:45,20:14 +4/01/2008,05:45,06:14,06:43,07:07,18:50,19:15,19:44,20:13 4/02/2008,05:45,06:14,06:43,07:08,18:49,19:14,19:42,20:11 4/03/2008,05:46,06:15,06:44,07:09,18:47,19:12,19:41,20:10 -4/04/2008,05:47,06:16,06:45,07:10,18:46,19:11,19:40,20:09 -4/05/2008,05:48,06:17,06:46,07:11,18:45,19:10,19:39,20:07 +4/04/2008,05:47,06:16,06:45,07:09,18:46,19:11,19:40,20:09 +4/05/2008,05:48,06:17,06:46,07:10,18:45,19:10,19:39,20:07 4/06/2008,04:48,05:17,05:46,06:11,17:43,18:08,18:37,19:06 4/07/2008,04:49,05:18,05:47,06:12,17:42,18:07,18:36,19:05 -4/08/2008,04:50,05:19,05:48,06:13,17:41,18:06,18:35,19:04 +4/08/2008,04:50,05:19,05:48,06:12,17:41,18:06,18:35,19:04 4/09/2008,04:51,05:19,05:48,06:13,17:39,18:05,18:33,19:02 4/10/2008,04:51,05:20,05:49,06:14,17:38,18:03,18:32,19:01 4/11/2008,04:52,05:21,05:50,06:15,17:37,18:02,18:31,19:00 -4/12/2008,04:53,05:22,05:51,06:16,17:36,18:01,18:30,18:59 +4/12/2008,04:53,05:22,05:51,06:15,17:36,18:01,18:30,18:59 4/13/2008,04:53,05:22,05:51,06:16,17:34,18:00,18:29,18:57 4/14/2008,04:54,05:23,05:52,06:17,17:33,17:58,18:27,18:56 -4/15/2008,04:55,05:24,05:53,06:18,17:32,17:57,18:26,18:55 -4/16/2008,04:55,05:24,05:53,06:19,17:31,17:56,18:25,18:54 +4/15/2008,04:55,05:24,05:53,06:17,17:32,17:57,18:26,18:55 +4/16/2008,04:55,05:24,05:53,06:18,17:31,17:56,18:25,18:54 4/17/2008,04:56,05:25,05:54,06:19,17:29,17:55,18:24,18:53 4/18/2008,04:57,05:26,05:55,06:20,17:28,17:54,18:23,18:52 -4/19/2008,04:57,05:26,05:56,06:21,17:27,17:52,18:22,18:51 -4/20/2008,04:58,05:27,05:56,06:22,17:26,17:51,18:21,18:50 +4/19/2008,04:57,05:26,05:56,06:20,17:27,17:52,18:22,18:51 +4/20/2008,04:58,05:27,05:56,06:21,17:26,17:51,18:21,18:50 4/21/2008,04:59,05:28,05:57,06:22,17:25,17:50,18:19,18:48 4/22/2008,04:59,05:28,05:58,06:23,17:24,17:49,18:18,18:47 -4/23/2008,05:00,05:29,05:58,06:24,17:23,17:48,18:17,18:46 -4/24/2008,05:01,05:30,05:59,06:25,17:21,17:47,18:16,18:45 +4/23/2008,05:00,05:29,05:58,06:23,17:23,17:48,18:17,18:46 +4/24/2008,05:01,05:30,05:59,06:24,17:21,17:47,18:16,18:45 4/25/2008,05:01,05:30,06:00,06:25,17:20,17:46,18:15,18:44 4/26/2008,05:02,05:31,06:01,06:26,17:19,17:45,18:14,18:43 -4/27/2008,05:03,05:32,06:01,06:27,17:18,17:44,18:13,18:42 -4/28/2008,05:03,05:32,06:02,06:28,17:17,17:43,18:12,18:42 +4/27/2008,05:03,05:32,06:01,06:26,17:18,17:44,18:13,18:42 +4/28/2008,05:03,05:32,06:02,06:27,17:17,17:43,18:12,18:42 4/29/2008,05:04,05:33,06:03,06:28,17:16,17:42,18:11,18:41 4/30/2008,05:05,05:34,06:03,06:29,17:15,17:41,18:11,18:40 -5/01/2008,05:05,05:34,06:04,06:30,17:14,17:40,18:10,18:39 -5/02/2008,05:06,05:35,06:05,06:31,17:13,17:39,18:09,18:38 +5/01/2008,05:05,05:34,06:04,06:29,17:14,17:40,18:10,18:39 +5/02/2008,05:06,05:35,06:05,06:30,17:13,17:39,18:09,18:38 5/03/2008,05:07,05:36,06:05,06:31,17:12,17:38,18:08,18:37 5/04/2008,05:07,05:36,06:06,06:32,17:11,17:37,18:07,18:36 -5/05/2008,05:08,05:37,06:07,06:33,17:10,17:36,18:06,18:36 -5/06/2008,05:08,05:38,06:08,06:34,17:09,17:36,18:05,18:35 +5/05/2008,05:08,05:37,06:07,06:32,17:10,17:36,18:06,18:36 +5/06/2008,05:08,05:38,06:08,06:33,17:09,17:36,18:05,18:35 5/07/2008,05:09,05:38,06:08,06:34,17:09,17:35,18:05,18:34 5/08/2008,05:10,05:39,06:09,06:35,17:08,17:34,18:04,18:33 -5/09/2008,05:10,05:40,06:10,06:36,17:07,17:33,18:03,18:33 -5/10/2008,05:11,05:40,06:10,06:37,17:06,17:32,18:02,18:32 +5/09/2008,05:10,05:40,06:10,06:35,17:07,17:33,18:03,18:33 +5/10/2008,05:11,05:40,06:10,06:36,17:06,17:32,18:02,18:32 5/11/2008,05:11,05:41,06:11,06:37,17:05,17:32,18:02,18:31 5/12/2008,05:12,05:42,06:12,06:38,17:04,17:31,18:01,18:31 -5/13/2008,05:13,05:42,06:12,06:39,17:04,17:30,18:00,18:30 -5/14/2008,05:13,05:43,06:13,06:40,17:03,17:30,18:00,18:29 +5/13/2008,05:13,05:42,06:12,06:38,17:04,17:30,18:00,18:30 +5/14/2008,05:13,05:43,06:13,06:39,17:03,17:30,18:00,18:29 5/15/2008,05:14,05:44,06:14,06:40,17:02,17:29,17:59,18:29 5/16/2008,05:15,05:44,06:14,06:41,17:02,17:28,17:59,18:28 -5/17/2008,05:15,05:45,06:15,06:42,17:01,17:28,17:58,18:28 -5/18/2008,05:16,05:45,06:16,06:43,17:00,17:27,17:57,18:27 +5/17/2008,05:15,05:45,06:15,06:41,17:01,17:28,17:58,18:28 +5/18/2008,05:16,05:45,06:16,06:42,17:00,17:27,17:57,18:27 5/19/2008,05:16,05:46,06:16,06:43,17:00,17:27,17:57,18:27 -5/20/2008,05:17,05:47,06:17,06:44,16:59,17:26,17:56,18:26 -5/21/2008,05:17,05:47,06:18,06:45,16:59,17:25,17:56,18:26 +5/20/2008,05:17,05:47,06:17,06:43,16:59,17:26,17:56,18:26 +5/21/2008,05:17,05:47,06:18,06:44,16:59,17:25,17:56,18:26 5/22/2008,05:18,05:48,06:18,06:45,16:58,17:25,17:56,18:25 5/23/2008,05:19,05:48,06:19,06:46,16:58,17:25,17:55,18:25 -5/24/2008,05:19,05:49,06:20,06:47,16:57,17:24,17:55,18:25 +5/24/2008,05:19,05:49,06:20,06:46,16:57,17:24,17:55,18:25 5/25/2008,05:20,05:50,06:20,06:47,16:57,17:24,17:54,18:24 -5/26/2008,05:20,05:50,06:21,06:48,16:56,17:23,17:54,18:24 -5/27/2008,05:21,05:51,06:21,06:49,16:56,17:23,17:54,18:24 +5/26/2008,05:20,05:50,06:21,06:47,16:56,17:23,17:54,18:24 +5/27/2008,05:21,05:51,06:21,06:48,16:56,17:23,17:54,18:24 5/28/2008,05:21,05:51,06:22,06:49,16:55,17:23,17:53,18:23 -5/29/2008,05:22,05:52,06:23,06:50,16:55,17:22,17:53,18:23 -5/30/2008,05:22,05:52,06:23,06:51,16:55,17:22,17:53,18:23 +5/29/2008,05:22,05:52,06:23,06:49,16:55,17:22,17:53,18:23 +5/30/2008,05:22,05:52,06:23,06:50,16:55,17:22,17:53,18:23 5/31/2008,05:23,05:53,06:24,06:51,16:54,17:22,17:53,18:23 -6/01/2008,05:23,05:53,06:24,06:52,16:54,17:21,17:52,18:23 +6/01/2008,05:23,05:53,06:24,06:51,16:54,17:21,17:52,18:23 6/02/2008,05:24,05:54,06:25,06:52,16:54,17:21,17:52,18:22 -6/03/2008,05:24,05:54,06:25,06:53,16:54,17:21,17:52,18:22 +6/03/2008,05:24,05:54,06:25,06:52,16:54,17:21,17:52,18:22 6/04/2008,05:25,05:55,06:26,06:53,16:53,17:21,17:52,18:22 -6/05/2008,05:25,05:55,06:26,06:54,16:53,17:21,17:52,18:22 +6/05/2008,05:25,05:55,06:26,06:53,16:53,17:21,17:52,18:22 6/06/2008,05:26,05:56,06:27,06:54,16:53,17:21,17:52,18:22 -6/07/2008,05:26,05:56,06:27,06:55,16:53,17:21,17:52,18:22 +6/07/2008,05:26,05:56,06:27,06:54,16:53,17:21,17:52,18:22 6/08/2008,05:26,05:57,06:28,06:55,16:53,17:20,17:52,18:22 -6/09/2008,05:27,05:57,06:28,06:56,16:53,17:20,17:52,18:22 +6/09/2008,05:27,05:57,06:28,06:55,16:53,17:20,17:52,18:22 6/10/2008,05:27,05:58,06:29,06:56,16:53,17:20,17:52,18:22 -6/11/2008,05:28,05:58,06:29,06:57,16:53,17:20,17:52,18:22 +6/11/2008,05:28,05:58,06:29,06:56,16:53,17:20,17:52,18:22 6/12/2008,05:28,05:58,06:30,06:57,16:53,17:20,17:52,18:22 -6/13/2008,05:28,05:59,06:30,06:58,16:53,17:20,17:52,18:22 -6/14/2008,05:29,05:59,06:30,06:58,16:53,17:21,17:52,18:22 +6/13/2008,05:28,05:59,06:30,06:57,16:53,17:20,17:52,18:22 +6/14/2008,05:29,05:59,06:30,06:57,16:53,17:21,17:52,18:22 6/15/2008,05:29,05:59,06:31,06:58,16:53,17:21,17:52,18:22 -6/16/2008,05:29,06:00,06:31,06:59,16:53,17:21,17:52,18:22 -6/17/2008,05:30,06:00,06:31,06:59,16:53,17:21,17:52,18:23 +6/16/2008,05:29,06:00,06:31,06:58,16:53,17:21,17:52,18:22 +6/17/2008,05:30,06:00,06:31,06:58,16:53,17:21,17:52,18:23 6/18/2008,05:30,06:00,06:32,06:59,16:53,17:21,17:52,18:23 -6/19/2008,05:30,06:01,06:32,07:00,16:54,17:21,17:52,18:23 -6/20/2008,05:30,06:01,06:32,07:00,16:54,17:21,17:53,18:23 -6/21/2008,05:31,06:01,06:32,07:00,16:54,17:22,17:53,18:23 +6/19/2008,05:30,06:01,06:32,06:59,16:54,17:21,17:52,18:23 +6/20/2008,05:30,06:01,06:32,06:59,16:54,17:21,17:53,18:23 +6/21/2008,05:31,06:01,06:32,06:59,16:54,17:22,17:53,18:23 6/22/2008,05:31,06:01,06:32,07:00,16:54,17:22,17:53,18:24 6/23/2008,05:31,06:01,06:33,07:00,16:54,17:22,17:53,18:24 -6/24/2008,05:31,06:02,06:33,07:01,16:55,17:22,17:54,18:24 -6/25/2008,05:31,06:02,06:33,07:01,16:55,17:23,17:54,18:24 -6/26/2008,05:31,06:02,06:33,07:01,16:55,17:23,17:54,18:25 -6/27/2008,05:32,06:02,06:33,07:01,16:56,17:23,17:55,18:25 -6/28/2008,05:32,06:02,06:33,07:01,16:56,17:24,17:55,18:25 -6/29/2008,05:32,06:02,06:33,07:01,16:56,17:24,17:55,18:26 -6/30/2008,05:32,06:02,06:33,07:01,16:57,17:24,17:56,18:26 -7/01/2008,05:32,06:02,06:33,07:01,16:57,17:25,17:56,18:26 -7/02/2008,05:32,06:02,06:33,07:01,16:58,17:25,17:56,18:27 -7/03/2008,05:32,06:02,06:33,07:01,16:58,17:26,17:57,18:27 -7/04/2008,05:32,06:02,06:33,07:01,16:59,17:26,17:57,18:28 -7/05/2008,05:32,06:02,06:33,07:01,16:59,17:27,17:58,18:28 +6/24/2008,05:31,06:02,06:33,07:00,16:55,17:22,17:54,18:24 +6/25/2008,05:31,06:02,06:33,07:00,16:55,17:23,17:54,18:24 +6/26/2008,05:31,06:02,06:33,07:00,16:55,17:23,17:54,18:25 +6/27/2008,05:32,06:02,06:33,07:00,16:56,17:23,17:55,18:25 +6/28/2008,05:32,06:02,06:33,07:00,16:56,17:24,17:55,18:25 +6/29/2008,05:32,06:02,06:33,07:00,16:56,17:24,17:55,18:26 +6/30/2008,05:32,06:02,06:33,07:00,16:57,17:24,17:56,18:26 +7/01/2008,05:32,06:02,06:33,07:00,16:57,17:25,17:56,18:26 +7/02/2008,05:32,06:02,06:33,07:00,16:58,17:25,17:56,18:27 +7/03/2008,05:32,06:02,06:33,07:00,16:58,17:26,17:57,18:27 +7/04/2008,05:32,06:02,06:33,07:00,16:59,17:26,17:57,18:28 +7/05/2008,05:32,06:02,06:33,07:00,16:59,17:27,17:58,18:28 7/06/2008,05:32,06:02,06:33,07:00,17:00,17:27,17:58,18:28 7/07/2008,05:31,06:02,06:33,07:00,17:00,17:28,17:59,18:29 7/08/2008,05:31,06:02,06:33,07:00,17:01,17:28,17:59,18:29 -7/09/2008,05:31,06:01,06:32,07:00,17:01,17:29,17:59,18:30 -7/10/2008,05:31,06:01,06:32,07:00,17:02,17:29,18:00,18:30 +7/09/2008,05:31,06:01,06:32,06:59,17:01,17:29,17:59,18:30 +7/10/2008,05:31,06:01,06:32,06:59,17:02,17:29,18:00,18:30 7/11/2008,05:31,06:01,06:32,06:59,17:02,17:30,18:00,18:31 -7/12/2008,05:31,06:01,06:32,06:59,17:03,17:30,18:01,18:31 -7/13/2008,05:30,06:01,06:31,06:59,17:03,17:31,18:01,18:32 +7/12/2008,05:31,06:01,06:32,06:58,17:03,17:30,18:01,18:31 +7/13/2008,05:30,06:01,06:31,06:58,17:03,17:31,18:01,18:32 7/14/2008,05:30,06:00,06:31,06:58,17:04,17:31,18:02,18:32 -7/15/2008,05:30,06:00,06:31,06:58,17:05,17:32,18:03,18:33 +7/15/2008,05:30,06:00,06:31,06:57,17:05,17:32,18:03,18:33 7/16/2008,05:30,06:00,06:30,06:57,17:05,17:32,18:03,18:33 -7/17/2008,05:29,05:59,06:30,06:57,17:06,17:33,18:04,18:34 -7/18/2008,05:29,05:59,06:29,06:57,17:06,17:34,18:04,18:34 +7/17/2008,05:29,05:59,06:30,06:56,17:06,17:33,18:04,18:34 +7/18/2008,05:29,05:59,06:29,06:56,17:06,17:34,18:04,18:34 7/19/2008,05:28,05:58,06:29,06:56,17:07,17:34,18:05,18:35 -7/20/2008,05:28,05:58,06:29,06:56,17:08,17:35,18:05,18:35 -7/21/2008,05:28,05:58,06:28,06:55,17:08,17:35,18:06,18:36 +7/20/2008,05:28,05:58,06:29,06:55,17:08,17:35,18:05,18:35 +7/21/2008,05:28,05:58,06:28,06:54,17:08,17:35,18:06,18:36 7/22/2008,05:27,05:57,06:28,06:54,17:09,17:36,18:06,18:36 -7/23/2008,05:27,05:57,06:27,06:54,17:10,17:37,18:07,18:37 +7/23/2008,05:27,05:57,06:27,06:53,17:10,17:37,18:07,18:37 7/24/2008,05:26,05:56,06:26,06:53,17:10,17:37,18:08,18:37 -7/25/2008,05:26,05:55,06:26,06:53,17:11,17:38,18:08,18:38 -7/26/2008,05:25,05:55,06:25,06:52,17:12,17:38,18:09,18:38 +7/25/2008,05:26,05:55,06:26,06:52,17:11,17:38,18:08,18:38 +7/26/2008,05:25,05:55,06:25,06:51,17:12,17:38,18:09,18:38 7/27/2008,05:25,05:54,06:25,06:51,17:12,17:39,18:09,18:39 7/28/2008,05:24,05:54,06:24,06:50,17:13,17:40,18:10,18:40 -7/29/2008,05:23,05:53,06:23,06:50,17:14,17:40,18:10,18:40 -7/30/2008,05:23,05:52,06:22,06:49,17:15,17:41,18:11,18:41 +7/29/2008,05:23,05:53,06:23,06:49,17:14,17:40,18:10,18:40 +7/30/2008,05:23,05:52,06:22,06:48,17:15,17:41,18:11,18:41 7/31/2008,05:22,05:52,06:22,06:48,17:15,17:42,18:12,18:41 8/01/2008,05:21,05:51,06:21,06:47,17:16,17:42,18:12,18:42 -8/02/2008,05:21,05:50,06:20,06:47,17:17,17:43,18:13,18:42 -8/03/2008,05:20,05:49,06:19,06:46,17:17,17:44,18:13,18:43 -8/04/2008,05:19,05:49,06:19,06:45,17:18,17:44,18:14,18:43 -8/05/2008,05:18,05:48,06:18,06:44,17:19,17:45,18:15,18:44 -8/06/2008,05:18,05:47,06:17,06:43,17:19,17:46,18:15,18:45 +8/02/2008,05:21,05:50,06:20,06:46,17:17,17:43,18:13,18:42 +8/03/2008,05:20,05:49,06:19,06:45,17:17,17:44,18:13,18:43 +8/04/2008,05:19,05:49,06:19,06:44,17:18,17:44,18:14,18:43 +8/05/2008,05:18,05:48,06:18,06:43,17:19,17:45,18:15,18:44 +8/06/2008,05:18,05:47,06:17,06:42,17:19,17:46,18:15,18:45 8/07/2008,05:17,05:46,06:16,06:42,17:20,17:46,18:16,18:45 8/08/2008,05:16,05:45,06:15,06:41,17:21,17:47,18:17,18:46 8/09/2008,05:15,05:44,06:14,06:40,17:22,17:47,18:17,18:46 8/10/2008,05:14,05:44,06:13,06:39,17:22,17:48,18:18,18:47 8/11/2008,05:13,05:43,06:12,06:38,17:23,17:49,18:18,18:48 8/12/2008,05:12,05:42,06:11,06:37,17:24,17:49,18:19,18:48 -8/13/2008,05:12,05:41,06:10,06:36,17:24,17:50,18:20,18:49 -8/14/2008,05:11,05:40,06:09,06:35,17:25,17:51,18:20,18:49 -8/15/2008,05:10,05:39,06:08,06:34,17:26,17:51,18:21,18:50 -8/16/2008,05:09,05:38,06:07,06:33,17:26,17:52,18:21,18:51 -8/17/2008,05:08,05:37,06:06,06:32,17:27,17:53,18:22,18:51 +8/13/2008,05:12,05:41,06:10,06:35,17:24,17:50,18:20,18:49 +8/14/2008,05:11,05:40,06:09,06:34,17:25,17:51,18:20,18:49 +8/15/2008,05:10,05:39,06:08,06:33,17:26,17:51,18:21,18:50 +8/16/2008,05:09,05:38,06:07,06:32,17:26,17:52,18:21,18:51 +8/17/2008,05:08,05:37,06:06,06:31,17:27,17:53,18:22,18:51 8/18/2008,05:07,05:36,06:05,06:30,17:28,17:53,18:23,18:52 8/19/2008,05:05,05:34,06:04,06:29,17:28,17:54,18:23,18:52 8/20/2008,05:04,05:33,06:03,06:28,17:29,17:55,18:24,18:53 -8/21/2008,05:03,05:32,06:02,06:27,17:30,17:55,18:25,18:54 -8/22/2008,05:02,05:31,06:00,06:26,17:31,17:56,18:25,18:54 -8/23/2008,05:01,05:30,05:59,06:25,17:31,17:57,18:26,18:55 +8/21/2008,05:03,05:32,06:02,06:26,17:30,17:55,18:25,18:54 +8/22/2008,05:02,05:31,06:00,06:25,17:31,17:56,18:25,18:54 +8/23/2008,05:01,05:30,05:59,06:24,17:31,17:57,18:26,18:55 8/24/2008,05:00,05:29,05:58,06:23,17:32,17:57,18:26,18:55 8/25/2008,04:59,05:28,05:57,06:22,17:33,17:58,18:27,18:56 -8/26/2008,04:58,05:27,05:56,06:21,17:33,17:59,18:28,18:57 -8/27/2008,04:56,05:25,05:54,06:20,17:34,17:59,18:28,18:57 +8/26/2008,04:58,05:27,05:56,06:20,17:33,17:59,18:28,18:57 +8/27/2008,04:56,05:25,05:54,06:19,17:34,17:59,18:28,18:57 8/28/2008,04:55,05:24,05:53,06:18,17:35,18:00,18:29,18:58 8/29/2008,04:54,05:23,05:52,06:17,17:35,18:01,18:30,18:58 -8/30/2008,04:53,05:22,05:51,06:16,17:36,18:01,18:30,18:59 +8/30/2008,04:53,05:22,05:51,06:15,17:36,18:01,18:30,18:59 8/31/2008,04:51,05:20,05:49,06:14,17:37,18:02,18:31,19:00 9/01/2008,04:50,05:19,05:48,06:13,17:37,18:02,18:31,19:00 -9/02/2008,04:49,05:18,05:47,06:12,17:38,18:03,18:32,19:01 -9/03/2008,04:48,05:17,05:45,06:11,17:39,18:04,18:33,19:02 +9/02/2008,04:49,05:18,05:47,06:11,17:38,18:03,18:32,19:01 +9/03/2008,04:48,05:17,05:45,06:10,17:39,18:04,18:33,19:02 9/04/2008,04:46,05:15,05:44,06:09,17:39,18:04,18:33,19:02 -9/05/2008,04:45,05:14,05:43,06:08,17:40,18:05,18:34,19:03 -9/06/2008,04:44,05:13,05:42,06:07,17:41,18:06,18:35,19:04 +9/05/2008,04:45,05:14,05:43,06:07,17:40,18:05,18:34,19:03 +9/06/2008,04:44,05:13,05:42,06:06,17:41,18:06,18:35,19:04 9/07/2008,04:42,05:11,05:40,06:05,17:41,18:06,18:35,19:04 -9/08/2008,04:41,05:10,05:39,06:04,17:42,18:07,18:36,19:05 +9/08/2008,04:41,05:10,05:39,06:03,17:42,18:07,18:36,19:05 9/09/2008,04:40,05:09,05:38,06:02,17:43,18:08,18:37,19:06 9/10/2008,04:38,05:07,05:36,06:01,17:43,18:08,18:37,19:06 -9/11/2008,04:37,05:06,05:35,06:00,17:44,18:09,18:38,19:07 +9/11/2008,04:37,05:06,05:35,05:59,17:44,18:09,18:38,19:07 9/12/2008,04:35,05:04,05:33,05:58,17:45,18:10,18:39,19:08 -9/13/2008,04:34,05:03,05:32,05:57,17:45,18:10,18:39,19:08 -9/14/2008,04:33,05:02,05:31,05:56,17:46,18:11,18:40,19:09 +9/13/2008,04:34,05:03,05:32,05:56,17:45,18:10,18:39,19:08 +9/14/2008,04:33,05:02,05:31,05:55,17:46,18:11,18:40,19:09 9/15/2008,04:31,05:00,05:29,05:54,17:47,18:12,18:41,19:10 -9/16/2008,04:30,04:59,05:28,05:53,17:48,18:12,18:41,19:11 +9/16/2008,04:30,04:59,05:28,05:52,17:48,18:12,18:41,19:11 9/17/2008,04:28,04:58,05:26,05:51,17:48,18:13,18:42,19:11 9/18/2008,04:27,04:56,05:25,05:50,17:49,18:14,18:43,19:12 -9/19/2008,04:25,04:55,05:24,05:49,17:50,18:14,18:43,19:13 +9/19/2008,04:25,04:55,05:24,05:48,17:50,18:14,18:43,19:13 9/20/2008,04:24,04:53,05:22,05:47,17:50,18:15,18:44,19:13 -9/21/2008,04:23,04:52,05:21,05:46,17:51,18:16,18:45,19:14 +9/21/2008,04:23,04:52,05:21,05:45,17:51,18:16,18:45,19:14 9/22/2008,04:21,04:50,05:19,05:44,17:52,18:17,18:46,19:15 -9/23/2008,04:20,04:49,05:18,05:43,17:52,18:17,18:46,19:16 -9/24/2008,04:18,04:48,05:17,05:42,17:53,18:18,18:47,19:17 +9/23/2008,04:20,04:49,05:18,05:42,17:52,18:17,18:46,19:16 +9/24/2008,04:18,04:48,05:17,05:41,17:53,18:18,18:47,19:17 9/25/2008,04:17,04:46,05:15,05:40,17:54,18:19,18:48,19:17 -9/26/2008,04:15,04:45,05:14,05:39,17:54,18:19,18:49,19:18 +9/26/2008,04:15,04:45,05:14,05:38,17:54,18:19,18:49,19:18 9/27/2008,04:14,04:43,05:12,05:37,17:55,18:20,18:49,19:19 9/28/2008,04:12,04:42,05:11,05:36,17:56,18:21,18:50,19:20 -9/29/2008,04:11,04:40,05:10,05:35,17:57,18:22,18:51,19:21 +9/29/2008,04:11,04:40,05:10,05:34,17:57,18:22,18:51,19:21 9/30/2008,04:09,04:39,05:08,05:33,17:57,18:22,18:52,19:22 -10/01/2008,04:08,04:38,05:07,05:32,17:58,18:23,18:52,19:22 -10/02/2008,04:06,04:36,05:05,05:31,17:59,18:24,18:53,19:23 +10/01/2008,04:08,04:38,05:07,05:31,17:58,18:23,18:52,19:22 +10/02/2008,04:06,04:36,05:05,05:30,17:59,18:24,18:53,19:23 10/03/2008,04:05,04:35,05:04,05:29,18:00,18:25,18:54,19:24 -10/04/2008,04:03,04:33,05:03,05:28,18:00,18:25,18:55,19:25 +10/04/2008,04:03,04:33,05:03,05:27,18:00,18:25,18:55,19:25 10/05/2008,05:02,05:32,06:01,06:26,19:01,19:26,19:56,20:26 10/06/2008,05:00,05:30,06:00,06:25,19:02,19:27,19:57,20:27 -10/07/2008,04:59,05:29,05:59,06:24,19:03,19:28,19:57,20:28 -10/08/2008,04:57,05:28,05:57,06:23,19:03,19:29,19:58,20:29 +10/07/2008,04:59,05:29,05:59,06:23,19:03,19:28,19:57,20:28 +10/08/2008,04:57,05:28,05:57,06:22,19:03,19:29,19:58,20:29 10/09/2008,04:56,05:26,05:56,06:21,19:04,19:29,19:59,20:30 -10/10/2008,04:54,05:25,05:55,06:20,19:05,19:30,20:00,20:31 -10/11/2008,04:53,05:23,05:53,06:19,19:06,19:31,20:01,20:32 +10/10/2008,04:54,05:25,05:55,06:19,19:05,19:30,20:00,20:31 +10/11/2008,04:53,05:23,05:53,06:18,19:06,19:31,20:01,20:32 10/12/2008,04:51,05:22,05:52,06:17,19:06,19:32,20:02,20:33 10/13/2008,04:50,05:21,05:51,06:16,19:07,19:33,20:03,20:34 -10/14/2008,04:48,05:19,05:49,06:15,19:08,19:33,20:04,20:35 -10/15/2008,04:47,05:18,05:48,06:14,19:09,19:34,20:05,20:36 +10/14/2008,04:48,05:19,05:49,06:14,19:08,19:33,20:04,20:35 +10/15/2008,04:47,05:18,05:48,06:13,19:09,19:34,20:05,20:36 10/16/2008,04:45,05:16,05:47,06:12,19:10,19:35,20:05,20:37 10/17/2008,04:44,05:15,05:45,06:11,19:10,19:36,20:06,20:38 -10/18/2008,04:42,05:14,05:44,06:10,19:11,19:37,20:07,20:39 -10/19/2008,04:41,05:12,05:43,06:09,19:12,19:38,20:08,20:40 +10/18/2008,04:42,05:14,05:44,06:09,19:11,19:37,20:07,20:39 +10/19/2008,04:41,05:12,05:43,06:08,19:12,19:38,20:08,20:40 10/20/2008,04:39,05:11,05:42,06:07,19:13,19:39,20:09,20:41 10/21/2008,04:38,05:10,05:40,06:06,19:14,19:40,20:10,20:42 10/22/2008,04:37,05:08,05:39,06:05,19:15,19:41,20:11,20:43 -10/23/2008,04:35,05:07,05:38,06:04,19:15,19:41,20:12,20:44 -10/24/2008,04:34,05:06,05:37,06:03,19:16,19:42,20:13,20:46 -10/25/2008,04:32,05:05,05:36,06:02,19:17,19:43,20:14,20:47 -10/26/2008,04:31,05:03,05:35,06:01,19:18,19:44,20:15,20:48 -10/27/2008,04:30,05:02,05:33,06:00,19:19,19:45,20:16,20:49 -10/28/2008,04:28,05:01,05:32,05:59,19:20,19:46,20:17,20:50 -10/29/2008,04:27,05:00,05:31,05:58,19:21,19:47,20:19,20:51 +10/23/2008,04:35,05:07,05:38,06:03,19:15,19:41,20:12,20:44 +10/24/2008,04:34,05:06,05:37,06:02,19:16,19:42,20:13,20:46 +10/25/2008,04:32,05:05,05:36,06:01,19:17,19:43,20:14,20:47 +10/26/2008,04:31,05:03,05:35,06:00,19:18,19:44,20:15,20:48 +10/27/2008,04:30,05:02,05:33,05:59,19:19,19:45,20:16,20:49 +10/28/2008,04:28,05:01,05:32,05:58,19:20,19:46,20:17,20:50 +10/29/2008,04:27,05:00,05:31,05:57,19:21,19:47,20:19,20:51 10/30/2008,04:26,04:59,05:30,05:56,19:22,19:48,20:20,20:53 10/31/2008,04:24,04:57,05:29,05:55,19:23,19:49,20:21,20:54 -11/01/2008,04:23,04:56,05:28,05:55,19:23,19:50,20:22,20:55 -11/02/2008,04:22,04:55,05:27,05:54,19:24,19:51,20:23,20:56 -11/03/2008,04:21,04:54,05:26,05:53,19:25,19:52,20:24,20:58 -11/04/2008,04:19,04:53,05:25,05:52,19:26,19:53,20:25,20:59 -11/05/2008,04:18,04:52,05:24,05:51,19:27,19:54,20:26,21:00 +11/01/2008,04:23,04:56,05:28,05:54,19:23,19:50,20:22,20:55 +11/02/2008,04:22,04:55,05:27,05:53,19:24,19:51,20:23,20:56 +11/03/2008,04:21,04:54,05:26,05:52,19:25,19:52,20:24,20:58 +11/04/2008,04:19,04:53,05:25,05:51,19:26,19:53,20:25,20:59 +11/05/2008,04:18,04:52,05:24,05:50,19:27,19:54,20:26,21:00 11/06/2008,04:17,04:51,05:23,05:50,19:28,19:55,20:27,21:01 11/07/2008,04:16,04:50,05:22,05:49,19:29,19:56,20:28,21:03 11/08/2008,04:15,04:49,05:21,05:48,19:30,19:57,20:30,21:04 -11/09/2008,04:13,04:48,05:20,05:48,19:31,19:58,20:31,21:05 -11/10/2008,04:12,04:47,05:20,05:47,19:32,19:59,20:32,21:07 +11/09/2008,04:13,04:48,05:20,05:47,19:31,19:58,20:31,21:05 +11/10/2008,04:12,04:47,05:20,05:46,19:32,19:59,20:32,21:07 11/11/2008,04:11,04:46,05:19,05:46,19:33,20:00,20:33,21:08 11/12/2008,04:10,04:45,05:18,05:45,19:34,20:01,20:34,21:09 -11/13/2008,04:09,04:44,05:17,05:45,19:35,20:02,20:35,21:10 +11/13/2008,04:09,04:44,05:17,05:44,19:35,20:02,20:35,21:10 11/14/2008,04:08,04:43,05:17,05:44,19:36,20:03,20:36,21:12 11/15/2008,04:07,04:43,05:16,05:43,19:37,20:04,20:38,21:13 -11/16/2008,04:06,04:42,05:15,05:43,19:38,20:05,20:39,21:14 +11/16/2008,04:06,04:42,05:15,05:42,19:38,20:05,20:39,21:14 11/17/2008,04:05,04:41,05:15,05:42,19:39,20:06,20:40,21:16 -11/18/2008,04:04,04:40,05:14,05:42,19:40,20:07,20:41,21:17 +11/18/2008,04:04,04:40,05:14,05:41,19:40,20:07,20:41,21:17 11/19/2008,04:04,04:40,05:13,05:41,19:41,20:08,20:42,21:18 -11/20/2008,04:03,04:39,05:13,05:41,19:41,20:09,20:43,21:20 +11/20/2008,04:03,04:39,05:13,05:40,19:41,20:09,20:43,21:20 11/21/2008,04:02,04:38,05:12,05:40,19:42,20:10,20:44,21:21 -11/22/2008,04:01,04:38,05:12,05:40,19:43,20:11,20:45,21:22 +11/22/2008,04:01,04:38,05:12,05:39,19:43,20:11,20:45,21:22 11/23/2008,04:00,04:37,05:11,05:39,19:44,20:12,20:47,21:23 11/24/2008,04:00,04:37,05:11,05:39,19:45,20:13,20:48,21:25 -11/25/2008,03:59,04:36,05:10,05:39,19:46,20:14,20:49,21:26 +11/25/2008,03:59,04:36,05:10,05:38,19:46,20:14,20:49,21:26 11/26/2008,03:59,04:36,05:10,05:38,19:47,20:15,20:50,21:27 11/27/2008,03:58,04:35,05:10,05:38,19:48,20:16,20:51,21:28 -11/28/2008,03:57,04:35,05:09,05:38,19:49,20:17,20:52,21:30 -11/29/2008,03:57,04:34,05:09,05:38,19:50,20:18,20:53,21:31 +11/28/2008,03:57,04:35,05:09,05:37,19:49,20:17,20:52,21:30 +11/29/2008,03:57,04:34,05:09,05:37,19:50,20:18,20:53,21:31 11/30/2008,03:56,04:34,05:09,05:37,19:51,20:19,20:54,21:32 12/01/2008,03:56,04:34,05:09,05:37,19:52,20:20,20:55,21:33 12/02/2008,03:56,04:34,05:09,05:37,19:52,20:21,20:56,21:34 @@ -343,24 +343,24 @@ 12/08/2008,03:54,04:33,05:08,05:37,19:57,20:26,21:02,21:40 12/09/2008,03:54,04:33,05:08,05:37,19:58,20:27,21:03,21:41 12/10/2008,03:54,04:33,05:09,05:37,19:59,20:28,21:03,21:42 -12/11/2008,03:54,04:33,05:09,05:38,20:00,20:29,21:04,21:43 -12/12/2008,03:54,04:33,05:09,05:38,20:00,20:29,21:05,21:44 +12/11/2008,03:54,04:33,05:09,05:37,20:00,20:29,21:04,21:43 +12/12/2008,03:54,04:33,05:09,05:37,20:00,20:29,21:05,21:44 12/13/2008,03:54,04:33,05:09,05:38,20:01,20:30,21:06,21:45 12/14/2008,03:54,04:34,05:09,05:38,20:02,20:31,21:07,21:46 -12/15/2008,03:55,04:34,05:10,05:39,20:02,20:31,21:07,21:46 +12/15/2008,03:55,04:34,05:10,05:38,20:02,20:31,21:07,21:46 12/16/2008,03:55,04:34,05:10,05:39,20:03,20:32,21:08,21:47 12/17/2008,03:55,04:34,05:10,05:39,20:04,20:33,21:09,21:48 -12/18/2008,03:55,04:35,05:11,05:40,20:04,20:33,21:09,21:48 +12/18/2008,03:55,04:35,05:11,05:39,20:04,20:33,21:09,21:48 12/19/2008,03:56,04:35,05:11,05:40,20:05,20:34,21:10,21:49 -12/20/2008,03:56,04:36,05:11,05:41,20:05,20:34,21:10,21:50 +12/20/2008,03:56,04:36,05:11,05:40,20:05,20:34,21:10,21:50 12/21/2008,03:57,04:36,05:12,05:41,20:06,20:35,21:11,21:50 -12/22/2008,03:57,04:37,05:12,05:42,20:06,20:35,21:11,21:51 +12/22/2008,03:57,04:37,05:12,05:41,20:06,20:35,21:11,21:51 12/23/2008,03:58,04:37,05:13,05:42,20:07,20:36,21:12,21:51 -12/24/2008,03:58,04:38,05:14,05:43,20:07,20:36,21:12,21:51 +12/24/2008,03:58,04:38,05:14,05:42,20:07,20:36,21:12,21:51 12/25/2008,03:59,04:38,05:14,05:43,20:08,20:37,21:13,21:52 -12/26/2008,04:00,04:39,05:15,05:44,20:08,20:37,21:13,21:52 +12/26/2008,04:00,04:39,05:15,05:43,20:08,20:37,21:13,21:52 12/27/2008,04:00,04:40,05:15,05:44,20:08,20:37,21:13,21:52 12/28/2008,04:01,04:40,05:16,05:45,20:09,20:38,21:13,21:53 -12/29/2008,04:02,04:41,05:17,05:46,20:09,20:38,21:14,21:53 +12/29/2008,04:02,04:41,05:17,05:45,20:09,20:38,21:14,21:53 12/30/2008,04:03,04:42,05:17,05:46,20:09,20:38,21:14,21:53 12/31/2008,04:04,04:43,05:18,05:47,20:09,20:38,21:14,21:53 diff --git a/test/39_9937N-75_7850W#America-New_York.txt b/test/39_9937N-75_7850W#America-New_York.txt index 95203c3..82f012e 100644 --- a/test/39_9937N-75_7850W#America-New_York.txt +++ b/test/39_9937N-75_7850W#America-New_York.txt @@ -6,123 +6,123 @@ 1/06/2008,05:49,06:21,06:55,07:25,16:53,17:23,17:57,18:30 1/07/2008,05:49,06:21,06:55,07:25,16:54,17:24,17:58,18:31 1/08/2008,05:49,06:21,06:55,07:25,16:55,17:25,17:59,18:32 -1/09/2008,05:49,06:21,06:55,07:25,16:56,17:26,18:00,18:32 -1/10/2008,05:49,06:21,06:55,07:25,16:57,17:27,18:01,18:33 -1/11/2008,05:48,06:21,06:55,07:25,16:58,17:28,18:02,18:34 +1/09/2008,05:49,06:21,06:55,07:24,16:56,17:26,18:00,18:32 +1/10/2008,05:49,06:21,06:55,07:24,16:57,17:27,18:01,18:33 +1/11/2008,05:48,06:21,06:55,07:24,16:58,17:28,18:02,18:34 1/12/2008,05:48,06:21,06:54,07:24,16:59,17:29,18:03,18:35 1/13/2008,05:48,06:21,06:54,07:24,17:00,17:30,18:03,18:36 -1/14/2008,05:48,06:20,06:54,07:24,17:01,17:31,18:04,18:37 +1/14/2008,05:48,06:20,06:54,07:23,17:01,17:31,18:04,18:37 1/15/2008,05:48,06:20,06:54,07:23,17:02,17:32,18:05,18:38 -1/16/2008,05:48,06:20,06:53,07:23,17:03,17:33,18:06,18:39 -1/17/2008,05:47,06:20,06:53,07:23,17:05,17:34,18:07,18:40 +1/16/2008,05:48,06:20,06:53,07:22,17:03,17:33,18:06,18:39 +1/17/2008,05:47,06:20,06:53,07:22,17:05,17:34,18:07,18:40 1/18/2008,05:47,06:19,06:52,07:22,17:06,17:35,18:08,18:41 -1/19/2008,05:47,06:19,06:52,07:22,17:07,17:36,18:09,18:42 -1/20/2008,05:46,06:18,06:52,07:21,17:08,17:37,18:10,18:43 +1/19/2008,05:47,06:19,06:52,07:21,17:07,17:36,18:09,18:42 +1/20/2008,05:46,06:18,06:52,07:20,17:08,17:37,18:10,18:43 1/21/2008,05:46,06:18,06:51,07:20,17:09,17:38,18:12,18:44 -1/22/2008,05:45,06:18,06:51,07:20,17:10,17:40,18:13,18:45 +1/22/2008,05:45,06:18,06:51,07:19,17:10,17:40,18:13,18:45 1/23/2008,05:45,06:17,06:50,07:19,17:11,17:41,18:14,18:46 -1/24/2008,05:44,06:16,06:49,07:19,17:13,17:42,18:15,18:47 -1/25/2008,05:44,06:16,06:49,07:18,17:14,17:43,18:16,18:48 +1/24/2008,05:44,06:16,06:49,07:18,17:13,17:42,18:15,18:47 +1/25/2008,05:44,06:16,06:49,07:17,17:14,17:43,18:16,18:48 1/26/2008,05:43,06:15,06:48,07:17,17:15,17:44,18:17,18:49 1/27/2008,05:43,06:15,06:47,07:16,17:16,17:45,18:18,18:50 1/28/2008,05:42,06:14,06:47,07:15,17:17,17:46,18:19,18:51 -1/29/2008,05:41,06:13,06:46,07:15,17:19,17:47,18:20,18:52 -1/30/2008,05:41,06:12,06:45,07:14,17:20,17:49,18:21,18:53 -1/31/2008,05:40,06:12,06:44,07:13,17:21,17:50,18:22,18:54 -2/01/2008,05:39,06:11,06:43,07:12,17:22,17:51,18:23,18:55 +1/29/2008,05:41,06:13,06:46,07:14,17:19,17:47,18:20,18:52 +1/30/2008,05:41,06:12,06:45,07:13,17:20,17:49,18:21,18:53 +1/31/2008,05:40,06:12,06:44,07:12,17:21,17:50,18:22,18:54 +2/01/2008,05:39,06:11,06:43,07:11,17:22,17:51,18:23,18:55 2/02/2008,05:38,06:10,06:42,07:11,17:23,17:52,18:24,18:56 2/03/2008,05:38,06:09,06:42,07:10,17:25,17:53,18:25,18:57 2/04/2008,05:37,06:08,06:41,07:09,17:26,17:54,18:26,18:58 2/05/2008,05:36,06:07,06:40,07:08,17:27,17:55,18:28,18:59 -2/06/2008,05:35,06:07,06:39,07:07,17:28,17:56,18:29,19:00 -2/07/2008,05:34,06:06,06:38,07:06,17:29,17:58,18:30,19:01 -2/08/2008,05:33,06:05,06:37,07:05,17:31,17:59,18:31,19:02 -2/09/2008,05:32,06:04,06:36,07:04,17:32,18:00,18:32,19:03 -2/10/2008,05:31,06:03,06:34,07:03,17:33,18:01,18:33,19:04 +2/06/2008,05:35,06:07,06:39,07:06,17:28,17:56,18:29,19:00 +2/07/2008,05:34,06:06,06:38,07:05,17:29,17:58,18:30,19:01 +2/08/2008,05:33,06:05,06:37,07:04,17:31,17:59,18:31,19:02 +2/09/2008,05:32,06:04,06:36,07:03,17:32,18:00,18:32,19:03 +2/10/2008,05:31,06:03,06:34,07:02,17:33,18:01,18:33,19:04 2/11/2008,05:30,06:01,06:33,07:01,17:34,18:02,18:34,19:06 2/12/2008,05:29,06:00,06:32,07:00,17:35,18:03,18:35,19:07 -2/13/2008,05:28,05:59,06:31,06:59,17:37,18:04,18:36,19:08 -2/14/2008,05:27,05:58,06:30,06:58,17:38,18:06,18:37,19:09 +2/13/2008,05:28,05:59,06:31,06:58,17:37,18:04,18:36,19:08 +2/14/2008,05:27,05:58,06:30,06:57,17:38,18:06,18:37,19:09 2/15/2008,05:26,05:57,06:29,06:56,17:39,18:07,18:38,19:10 2/16/2008,05:24,05:56,06:27,06:55,17:40,18:08,18:39,19:11 -2/17/2008,05:23,05:55,06:26,06:54,17:41,18:09,18:41,19:12 -2/18/2008,05:22,05:53,06:25,06:53,17:42,18:10,18:42,19:13 +2/17/2008,05:23,05:55,06:26,06:53,17:41,18:09,18:41,19:12 +2/18/2008,05:22,05:53,06:25,06:52,17:42,18:10,18:42,19:13 2/19/2008,05:21,05:52,06:24,06:51,17:44,18:11,18:43,19:14 -2/20/2008,05:19,05:51,06:22,06:50,17:45,18:12,18:44,19:15 +2/20/2008,05:19,05:51,06:22,06:49,17:45,18:12,18:44,19:15 2/21/2008,05:18,05:49,06:21,06:48,17:46,18:13,18:45,19:16 2/22/2008,05:17,05:48,06:20,06:47,17:47,18:14,18:46,19:17 -2/23/2008,05:15,05:47,06:18,06:46,17:48,18:16,18:47,19:18 +2/23/2008,05:15,05:47,06:18,06:45,17:48,18:16,18:47,19:18 2/24/2008,05:14,05:45,06:17,06:44,17:49,18:17,18:48,19:19 -2/25/2008,05:13,05:44,06:16,06:43,17:50,18:18,18:49,19:20 +2/25/2008,05:13,05:44,06:16,06:42,17:50,18:18,18:49,19:20 2/26/2008,05:11,05:43,06:14,06:41,17:52,18:19,18:50,19:22 -2/27/2008,05:10,05:41,06:13,06:40,17:53,18:20,18:51,19:23 +2/27/2008,05:10,05:41,06:13,06:39,17:53,18:20,18:51,19:23 2/28/2008,05:09,05:40,06:11,06:38,17:54,18:21,18:52,19:24 -2/29/2008,05:07,05:38,06:10,06:37,17:55,18:22,18:53,19:25 +2/29/2008,05:07,05:38,06:10,06:36,17:55,18:22,18:53,19:25 3/01/2008,05:06,05:37,06:08,06:35,17:56,18:23,18:54,19:26 -3/02/2008,05:04,05:35,06:07,06:34,17:57,18:24,18:56,19:27 +3/02/2008,05:04,05:35,06:07,06:33,17:57,18:24,18:56,19:27 3/03/2008,05:03,05:34,06:05,06:32,17:58,18:25,18:57,19:28 -3/04/2008,05:01,05:32,06:04,06:31,17:59,18:26,18:58,19:29 +3/04/2008,05:01,05:32,06:04,06:30,17:59,18:26,18:58,19:29 3/05/2008,04:59,05:31,06:02,06:29,18:00,18:27,18:59,19:30 -3/06/2008,04:58,05:29,06:01,06:28,18:01,18:28,19:00,19:31 +3/06/2008,04:58,05:29,06:01,06:27,18:01,18:28,19:00,19:31 3/07/2008,04:56,05:28,05:59,06:26,18:02,18:29,19:01,19:32 -3/08/2008,04:55,05:26,05:58,06:25,18:04,18:31,19:02,19:33 +3/08/2008,04:55,05:26,05:58,06:24,18:04,18:31,19:02,19:33 3/09/2008,05:53,06:25,06:56,07:23,19:05,19:32,20:03,20:35 -3/10/2008,05:52,06:23,06:55,07:22,19:06,19:33,20:04,20:36 -3/11/2008,05:50,06:22,06:53,07:20,19:07,19:34,20:05,20:37 +3/10/2008,05:52,06:23,06:55,07:21,19:06,19:33,20:04,20:36 +3/11/2008,05:50,06:22,06:53,07:19,19:07,19:34,20:05,20:37 3/12/2008,05:48,06:20,06:51,07:18,19:08,19:35,20:06,20:38 -3/13/2008,05:47,06:18,06:50,07:17,19:09,19:36,20:07,20:39 +3/13/2008,05:47,06:18,06:50,07:16,19:09,19:36,20:07,20:39 3/14/2008,05:45,06:17,06:48,07:15,19:10,19:37,20:08,20:40 -3/15/2008,05:43,06:15,06:47,07:14,19:11,19:38,20:09,20:41 -3/16/2008,05:42,06:13,06:45,07:12,19:12,19:39,20:10,20:42 +3/15/2008,05:43,06:15,06:47,07:13,19:11,19:38,20:09,20:41 +3/16/2008,05:42,06:13,06:45,07:11,19:12,19:39,20:10,20:42 3/17/2008,05:40,06:12,06:43,07:10,19:13,19:40,20:11,20:44 -3/18/2008,05:38,06:10,06:42,07:09,19:14,19:41,20:13,20:45 +3/18/2008,05:38,06:10,06:42,07:08,19:14,19:41,20:13,20:45 3/19/2008,05:36,06:08,06:40,07:07,19:15,19:42,20:14,20:46 3/20/2008,05:35,06:07,06:38,07:05,19:16,19:43,20:15,20:47 -3/21/2008,05:33,06:05,06:37,07:04,19:17,19:44,20:16,20:48 +3/21/2008,05:33,06:05,06:37,07:03,19:17,19:44,20:16,20:48 3/22/2008,05:31,06:03,06:35,07:02,19:18,19:45,20:17,20:49 -3/23/2008,05:29,06:02,06:33,07:01,19:19,19:46,20:18,20:50 -3/24/2008,05:28,06:00,06:32,06:59,19:20,19:47,20:19,20:52 +3/23/2008,05:29,06:02,06:33,07:00,19:19,19:46,20:18,20:50 +3/24/2008,05:28,06:00,06:32,06:58,19:20,19:47,20:19,20:52 3/25/2008,05:26,05:58,06:30,06:57,19:21,19:48,20:20,20:53 -3/26/2008,05:24,05:57,06:29,06:56,19:22,19:49,20:21,20:54 +3/26/2008,05:24,05:57,06:29,06:55,19:22,19:49,20:21,20:54 3/27/2008,05:22,05:55,06:27,06:54,19:23,19:50,20:22,20:55 3/28/2008,05:20,05:53,06:25,06:52,19:24,19:51,20:23,20:56 -3/29/2008,05:18,05:51,06:24,06:51,19:25,19:52,20:25,20:58 +3/29/2008,05:18,05:51,06:24,06:50,19:25,19:52,20:25,20:58 3/30/2008,05:17,05:50,06:22,06:49,19:26,19:54,20:26,20:59 -3/31/2008,05:15,05:48,06:20,06:48,19:27,19:55,20:27,21:00 -4/01/2008,05:13,05:46,06:19,06:46,19:28,19:56,20:28,21:01 +3/31/2008,05:15,05:48,06:20,06:47,19:27,19:55,20:27,21:00 +4/01/2008,05:13,05:46,06:19,06:45,19:28,19:56,20:28,21:01 4/02/2008,05:11,05:45,06:17,06:44,19:29,19:57,20:29,21:03 -4/03/2008,05:09,05:43,06:15,06:43,19:30,19:58,20:30,21:04 +4/03/2008,05:09,05:43,06:15,06:42,19:30,19:58,20:30,21:04 4/04/2008,05:07,05:41,06:14,06:41,19:31,19:59,20:31,21:05 -4/05/2008,05:06,05:39,06:12,06:40,19:32,20:00,20:33,21:06 +4/05/2008,05:06,05:39,06:12,06:39,19:32,20:00,20:33,21:06 4/06/2008,05:04,05:38,06:10,06:38,19:33,20:01,20:34,21:08 4/07/2008,05:02,05:36,06:09,06:36,19:34,20:02,20:35,21:09 -4/08/2008,05:00,05:34,06:07,06:35,19:35,20:03,20:36,21:10 +4/08/2008,05:00,05:34,06:07,06:34,19:35,20:03,20:36,21:10 4/09/2008,04:58,05:33,06:06,06:33,19:36,20:04,20:37,21:12 -4/10/2008,04:56,05:31,06:04,06:32,19:37,20:05,20:38,21:13 +4/10/2008,04:56,05:31,06:04,06:31,19:37,20:05,20:38,21:13 4/11/2008,04:54,05:29,06:02,06:30,19:38,20:06,20:40,21:14 -4/12/2008,04:53,05:27,06:01,06:29,19:39,20:07,20:41,21:16 +4/12/2008,04:53,05:27,06:01,06:28,19:39,20:07,20:41,21:16 4/13/2008,04:51,05:26,05:59,06:27,19:40,20:08,20:42,21:17 -4/14/2008,04:49,05:24,05:58,06:26,19:41,20:09,20:43,21:18 +4/14/2008,04:49,05:24,05:58,06:25,19:41,20:09,20:43,21:18 4/15/2008,04:47,05:22,05:56,06:24,19:42,20:11,20:44,21:20 -4/16/2008,04:45,05:21,05:55,06:23,19:43,20:12,20:45,21:21 +4/16/2008,04:45,05:21,05:55,06:22,19:43,20:12,20:45,21:21 4/17/2008,04:43,05:19,05:53,06:21,19:44,20:13,20:47,21:22 -4/18/2008,04:42,05:17,05:51,06:20,19:45,20:14,20:48,21:24 +4/18/2008,04:42,05:17,05:51,06:19,19:45,20:14,20:48,21:24 4/19/2008,04:40,05:16,05:50,06:18,19:46,20:15,20:49,21:25 -4/20/2008,04:38,05:14,05:48,06:17,19:47,20:16,20:50,21:27 -4/21/2008,04:36,05:13,05:47,06:16,19:48,20:17,20:52,21:28 +4/20/2008,04:38,05:14,05:48,06:16,19:47,20:16,20:50,21:27 +4/21/2008,04:36,05:13,05:47,06:15,19:48,20:17,20:52,21:28 4/22/2008,04:34,05:11,05:45,06:14,19:49,20:18,20:53,21:30 -4/23/2008,04:32,05:09,05:44,06:13,19:51,20:19,20:54,21:31 +4/23/2008,04:32,05:09,05:44,06:12,19:51,20:19,20:54,21:31 4/24/2008,04:31,05:08,05:43,06:11,19:52,20:20,20:55,21:32 4/25/2008,04:29,05:06,05:41,06:10,19:53,20:21,20:56,21:34 -4/26/2008,04:27,05:05,05:40,06:09,19:54,20:23,20:58,21:35 +4/26/2008,04:27,05:05,05:40,06:08,19:54,20:23,20:58,21:35 4/27/2008,04:25,05:03,05:38,06:07,19:55,20:24,20:59,21:37 4/28/2008,04:24,05:02,05:37,06:06,19:56,20:25,21:00,21:38 -4/29/2008,04:22,05:00,05:36,06:05,19:57,20:26,21:01,21:40 +4/29/2008,04:22,05:00,05:36,06:04,19:57,20:26,21:01,21:40 4/30/2008,04:20,04:59,05:34,06:03,19:58,20:27,21:03,21:41 5/01/2008,04:18,04:57,05:33,06:02,19:59,20:28,21:04,21:43 5/02/2008,04:17,04:56,05:32,06:01,20:00,20:29,21:05,21:44 -5/03/2008,04:15,04:54,05:30,06:00,20:01,20:30,21:06,21:46 -5/04/2008,04:13,04:53,05:29,05:59,20:02,20:31,21:08,21:47 +5/03/2008,04:15,04:54,05:30,05:59,20:01,20:30,21:06,21:46 +5/04/2008,04:13,04:53,05:29,05:58,20:02,20:31,21:08,21:47 5/05/2008,04:12,04:51,05:28,05:57,20:03,20:32,21:09,21:49 5/06/2008,04:10,04:50,05:26,05:56,20:04,20:33,21:10,21:50 5/07/2008,04:08,04:49,05:25,05:55,20:05,20:35,21:11,21:52 @@ -136,94 +136,94 @@ 5/15/2008,03:56,04:38,05:16,05:47,20:12,20:43,21:21,22:03 5/16/2008,03:55,04:37,05:15,05:46,20:13,20:44,21:22,22:05 5/17/2008,03:53,04:36,05:15,05:45,20:14,20:45,21:23,22:06 -5/18/2008,03:52,04:35,05:14,05:45,20:15,20:46,21:25,22:08 -5/19/2008,03:51,04:34,05:13,05:44,20:16,20:47,21:26,22:09 +5/18/2008,03:52,04:35,05:14,05:44,20:15,20:46,21:25,22:08 +5/19/2008,03:51,04:34,05:13,05:43,20:16,20:47,21:26,22:09 5/20/2008,03:49,04:33,05:12,05:43,20:17,20:48,21:27,22:11 5/21/2008,03:48,04:32,05:11,05:42,20:18,20:49,21:28,22:12 -5/22/2008,03:47,04:31,05:10,05:42,20:19,20:50,21:29,22:13 -5/23/2008,03:46,04:30,05:09,05:41,20:19,20:51,21:30,22:15 +5/22/2008,03:47,04:31,05:10,05:41,20:19,20:50,21:29,22:13 +5/23/2008,03:46,04:30,05:09,05:40,20:19,20:51,21:30,22:15 5/24/2008,03:45,04:29,05:09,05:40,20:20,20:52,21:31,22:16 -5/25/2008,03:44,04:28,05:08,05:40,20:21,20:53,21:32,22:17 -5/26/2008,03:42,04:28,05:07,05:39,20:22,20:54,21:33,22:19 +5/25/2008,03:44,04:28,05:08,05:39,20:21,20:53,21:32,22:17 +5/26/2008,03:42,04:28,05:07,05:38,20:22,20:54,21:33,22:19 5/27/2008,03:41,04:27,05:07,05:38,20:23,20:55,21:34,22:20 -5/28/2008,03:40,04:26,05:06,05:38,20:23,20:55,21:35,22:21 +5/28/2008,03:40,04:26,05:06,05:37,20:23,20:55,21:35,22:21 5/29/2008,03:39,04:25,05:05,05:37,20:24,20:56,21:36,22:22 -5/30/2008,03:39,04:25,05:05,05:37,20:25,20:57,21:37,22:23 +5/30/2008,03:39,04:25,05:05,05:36,20:25,20:57,21:37,22:23 5/31/2008,03:38,04:24,05:04,05:36,20:26,20:58,21:38,22:25 6/01/2008,03:37,04:23,05:04,05:36,20:26,20:59,21:39,22:26 -6/02/2008,03:36,04:23,05:03,05:36,20:27,20:59,21:40,22:27 +6/02/2008,03:36,04:23,05:03,05:35,20:27,20:59,21:40,22:27 6/03/2008,03:35,04:22,05:03,05:35,20:28,21:00,21:41,22:28 6/04/2008,03:35,04:22,05:03,05:35,20:28,21:01,21:42,22:29 -6/05/2008,03:34,04:21,05:02,05:35,20:29,21:01,21:42,22:30 +6/05/2008,03:34,04:21,05:02,05:34,20:29,21:01,21:42,22:30 6/06/2008,03:34,04:21,05:02,05:34,20:30,21:02,21:43,22:31 6/07/2008,03:33,04:21,05:02,05:34,20:30,21:03,21:44,22:32 6/08/2008,03:33,04:20,05:01,05:34,20:31,21:03,21:45,22:32 -6/09/2008,03:32,04:20,05:01,05:34,20:31,21:04,21:45,22:33 -6/10/2008,03:32,04:20,05:01,05:34,20:32,21:04,21:46,22:34 -6/11/2008,03:31,04:20,05:01,05:34,20:32,21:05,21:46,22:35 -6/12/2008,03:31,04:19,05:01,05:34,20:33,21:05,21:47,22:35 -6/13/2008,03:31,04:19,05:01,05:34,20:33,21:06,21:48,22:36 -6/14/2008,03:31,04:19,05:01,05:34,20:34,21:06,21:48,22:37 -6/15/2008,03:31,04:19,05:01,05:34,20:34,21:07,21:48,22:37 -6/16/2008,03:31,04:19,05:01,05:34,20:34,21:07,21:49,22:37 -6/17/2008,03:31,04:19,05:01,05:34,20:35,21:07,21:49,22:38 +6/09/2008,03:32,04:20,05:01,05:33,20:31,21:04,21:45,22:33 +6/10/2008,03:32,04:20,05:01,05:33,20:32,21:04,21:46,22:34 +6/11/2008,03:31,04:20,05:01,05:33,20:32,21:05,21:46,22:35 +6/12/2008,03:31,04:19,05:01,05:33,20:33,21:05,21:47,22:35 +6/13/2008,03:31,04:19,05:01,05:33,20:33,21:06,21:48,22:36 +6/14/2008,03:31,04:19,05:01,05:33,20:34,21:06,21:48,22:37 +6/15/2008,03:31,04:19,05:01,05:33,20:34,21:07,21:48,22:37 +6/16/2008,03:31,04:19,05:01,05:33,20:34,21:07,21:49,22:37 +6/17/2008,03:31,04:19,05:01,05:33,20:35,21:07,21:49,22:38 6/18/2008,03:31,04:19,05:01,05:34,20:35,21:08,21:49,22:38 6/19/2008,03:31,04:20,05:01,05:34,20:35,21:08,21:50,22:39 6/20/2008,03:31,04:20,05:01,05:34,20:35,21:08,21:50,22:39 -6/21/2008,03:31,04:20,05:02,05:35,20:36,21:08,21:50,22:39 -6/22/2008,03:31,04:20,05:02,05:35,20:36,21:09,21:50,22:39 +6/21/2008,03:31,04:20,05:02,05:34,20:36,21:08,21:50,22:39 +6/22/2008,03:31,04:20,05:02,05:34,20:36,21:09,21:50,22:39 6/23/2008,03:32,04:21,05:02,05:35,20:36,21:09,21:50,22:39 6/24/2008,03:32,04:21,05:03,05:35,20:36,21:09,21:50,22:39 -6/25/2008,03:33,04:21,05:03,05:36,20:36,21:09,21:50,22:39 +6/25/2008,03:33,04:21,05:03,05:35,20:36,21:09,21:50,22:39 6/26/2008,03:33,04:22,05:03,05:36,20:36,21:09,21:50,22:39 -6/27/2008,03:34,04:22,05:04,05:37,20:36,21:09,21:50,22:39 -6/28/2008,03:34,04:23,05:04,05:37,20:36,21:09,21:50,22:39 +6/27/2008,03:34,04:22,05:04,05:36,20:36,21:09,21:50,22:39 +6/28/2008,03:34,04:23,05:04,05:36,20:36,21:09,21:50,22:39 6/29/2008,03:35,04:23,05:05,05:37,20:36,21:09,21:50,22:38 -6/30/2008,03:36,04:24,05:05,05:38,20:36,21:09,21:50,22:38 +6/30/2008,03:36,04:24,05:05,05:37,20:36,21:09,21:50,22:38 7/01/2008,03:36,04:24,05:06,05:38,20:36,21:08,21:50,22:38 -7/02/2008,03:37,04:25,05:06,05:39,20:36,21:08,21:49,22:37 +7/02/2008,03:37,04:25,05:06,05:38,20:36,21:08,21:49,22:37 7/03/2008,03:38,04:26,05:07,05:39,20:35,21:08,21:49,22:37 -7/04/2008,03:39,04:26,05:07,05:40,20:35,21:08,21:49,22:36 -7/05/2008,03:40,04:27,05:08,05:41,20:35,21:07,21:48,22:36 +7/04/2008,03:39,04:26,05:07,05:39,20:35,21:08,21:49,22:36 +7/05/2008,03:40,04:27,05:08,05:40,20:35,21:07,21:48,22:36 7/06/2008,03:41,04:28,05:09,05:41,20:35,21:07,21:48,22:35 -7/07/2008,03:42,04:29,05:09,05:42,20:34,21:07,21:47,22:34 +7/07/2008,03:42,04:29,05:09,05:41,20:34,21:07,21:47,22:34 7/08/2008,03:43,04:29,05:10,05:42,20:34,21:06,21:47,22:33 7/09/2008,03:44,04:30,05:11,05:43,20:34,21:06,21:46,22:33 -7/10/2008,03:45,04:31,05:12,05:44,20:33,21:05,21:46,22:32 -7/11/2008,03:46,04:32,05:12,05:45,20:33,21:05,21:45,22:31 +7/10/2008,03:45,04:31,05:12,05:43,20:33,21:05,21:46,22:32 +7/11/2008,03:46,04:32,05:12,05:44,20:33,21:05,21:45,22:31 7/12/2008,03:47,04:33,05:13,05:45,20:32,21:04,21:44,22:30 -7/13/2008,03:48,04:34,05:14,05:46,20:32,21:04,21:44,22:29 -7/14/2008,03:49,04:35,05:15,05:47,20:31,21:03,21:43,22:28 +7/13/2008,03:48,04:34,05:14,05:45,20:32,21:04,21:44,22:29 +7/14/2008,03:49,04:35,05:15,05:46,20:31,21:03,21:43,22:28 7/15/2008,03:51,04:36,05:16,05:47,20:31,21:02,21:42,22:27 7/16/2008,03:52,04:37,05:17,05:48,20:30,21:02,21:41,22:26 7/17/2008,03:53,04:38,05:17,05:49,20:29,21:01,21:40,22:25 -7/18/2008,03:55,04:39,05:18,05:50,20:29,21:00,21:39,22:24 -7/19/2008,03:56,04:40,05:19,05:51,20:28,20:59,21:38,22:22 -7/20/2008,03:57,04:41,05:20,05:52,20:27,20:58,21:37,22:21 +7/18/2008,03:55,04:39,05:18,05:49,20:29,21:00,21:39,22:24 +7/19/2008,03:56,04:40,05:19,05:50,20:28,20:59,21:38,22:22 +7/20/2008,03:57,04:41,05:20,05:51,20:27,20:58,21:37,22:21 7/21/2008,03:59,04:42,05:21,05:52,20:26,20:58,21:36,22:20 7/22/2008,04:00,04:43,05:22,05:53,20:26,20:57,21:35,22:19 7/23/2008,04:01,04:44,05:23,05:54,20:25,20:56,21:34,22:17 -7/24/2008,04:03,04:46,05:24,05:55,20:24,20:55,21:33,22:16 -7/25/2008,04:04,04:47,05:25,05:56,20:23,20:54,21:32,22:15 -7/26/2008,04:05,04:48,05:26,05:57,20:22,20:53,21:31,22:13 -7/27/2008,04:07,04:49,05:27,05:58,20:21,20:52,21:30,22:12 -7/28/2008,04:08,04:50,05:28,05:59,20:20,20:51,21:28,22:10 +7/24/2008,04:03,04:46,05:24,05:54,20:24,20:55,21:33,22:16 +7/25/2008,04:04,04:47,05:25,05:55,20:23,20:54,21:32,22:15 +7/26/2008,04:05,04:48,05:26,05:56,20:22,20:53,21:31,22:13 +7/27/2008,04:07,04:49,05:27,05:57,20:21,20:52,21:30,22:12 +7/28/2008,04:08,04:50,05:28,05:58,20:20,20:51,21:28,22:10 7/29/2008,04:10,04:51,05:29,05:59,20:19,20:50,21:27,22:09 7/30/2008,04:11,04:52,05:30,06:00,20:18,20:49,21:26,22:07 7/31/2008,04:13,04:54,05:31,06:01,20:17,20:47,21:25,22:06 8/01/2008,04:14,04:55,05:32,06:02,20:16,20:46,21:23,22:04 8/02/2008,04:15,04:56,05:33,06:03,20:15,20:45,21:22,22:02 8/03/2008,04:17,04:57,05:34,06:04,20:14,20:44,21:21,22:01 -8/04/2008,04:18,04:58,05:35,06:05,20:13,20:43,21:19,21:59 -8/05/2008,04:20,05:00,05:36,06:06,20:12,20:41,21:18,21:57 -8/06/2008,04:21,05:01,05:37,06:07,20:10,20:40,21:16,21:56 -8/07/2008,04:23,05:02,05:38,06:08,20:09,20:39,21:15,21:54 -8/08/2008,04:24,05:03,05:39,06:09,20:08,20:37,21:13,21:52 -8/09/2008,04:25,05:04,05:40,06:10,20:07,20:36,21:12,21:51 -8/10/2008,04:27,05:05,05:41,06:11,20:05,20:35,21:10,21:49 -8/11/2008,04:28,05:07,05:42,06:12,20:04,20:33,21:09,21:47 -8/12/2008,04:30,05:08,05:43,06:13,20:03,20:32,21:07,21:45 -8/13/2008,04:31,05:09,05:44,06:14,20:02,20:31,21:06,21:44 +8/04/2008,04:18,04:58,05:35,06:04,20:13,20:43,21:19,21:59 +8/05/2008,04:20,05:00,05:36,06:05,20:12,20:41,21:18,21:57 +8/06/2008,04:21,05:01,05:37,06:06,20:10,20:40,21:16,21:56 +8/07/2008,04:23,05:02,05:38,06:07,20:09,20:39,21:15,21:54 +8/08/2008,04:24,05:03,05:39,06:08,20:08,20:37,21:13,21:52 +8/09/2008,04:25,05:04,05:40,06:09,20:07,20:36,21:12,21:51 +8/10/2008,04:27,05:05,05:41,06:10,20:05,20:35,21:10,21:49 +8/11/2008,04:28,05:07,05:42,06:11,20:04,20:33,21:09,21:47 +8/12/2008,04:30,05:08,05:43,06:12,20:03,20:32,21:07,21:45 +8/13/2008,04:31,05:09,05:44,06:13,20:02,20:31,21:06,21:44 8/14/2008,04:33,05:10,05:45,06:14,20:00,20:29,21:04,21:42 8/15/2008,04:34,05:11,05:46,06:15,19:59,20:28,21:03,21:40 8/16/2008,04:35,05:13,05:48,06:16,19:57,20:26,21:01,21:38 @@ -234,16 +234,16 @@ 8/21/2008,04:42,05:18,05:53,06:21,19:50,20:19,20:53,21:29 8/22/2008,04:43,05:20,05:54,06:22,19:49,20:17,20:51,21:27 8/23/2008,04:45,05:21,05:55,06:23,19:47,20:16,20:50,21:25 -8/24/2008,04:46,05:22,05:56,06:24,19:46,20:14,20:48,21:24 -8/25/2008,04:47,05:23,05:57,06:25,19:44,20:12,20:46,21:22 -8/26/2008,04:49,05:24,05:58,06:26,19:43,20:11,20:44,21:20 -8/27/2008,04:50,05:25,05:59,06:27,19:41,20:09,20:43,21:18 -8/28/2008,04:51,05:26,06:00,06:28,19:40,20:08,20:41,21:16 -8/29/2008,04:53,05:27,06:01,06:29,19:38,20:06,20:39,21:14 -8/30/2008,04:54,05:29,06:02,06:30,19:37,20:04,20:38,21:12 -8/31/2008,04:55,05:30,06:03,06:31,19:35,20:03,20:36,21:10 -9/01/2008,04:56,05:31,06:04,06:32,19:33,20:01,20:34,21:08 -9/02/2008,04:58,05:32,06:05,06:33,19:32,20:00,20:32,21:07 +8/24/2008,04:46,05:22,05:56,06:23,19:46,20:14,20:48,21:24 +8/25/2008,04:47,05:23,05:57,06:24,19:44,20:12,20:46,21:22 +8/26/2008,04:49,05:24,05:58,06:25,19:43,20:11,20:44,21:20 +8/27/2008,04:50,05:25,05:59,06:26,19:41,20:09,20:43,21:18 +8/28/2008,04:51,05:26,06:00,06:27,19:40,20:08,20:41,21:16 +8/29/2008,04:53,05:27,06:01,06:28,19:38,20:06,20:39,21:14 +8/30/2008,04:54,05:29,06:02,06:29,19:37,20:04,20:38,21:12 +8/31/2008,04:55,05:30,06:03,06:30,19:35,20:03,20:36,21:10 +9/01/2008,04:56,05:31,06:04,06:31,19:33,20:01,20:34,21:08 +9/02/2008,04:58,05:32,06:05,06:32,19:32,20:00,20:32,21:07 9/03/2008,04:59,05:33,06:06,06:33,19:30,19:58,20:31,21:05 9/04/2008,05:00,05:34,06:07,06:34,19:29,19:56,20:29,21:03 9/05/2008,05:01,05:35,06:08,06:35,19:27,19:55,20:27,21:01 @@ -252,15 +252,15 @@ 9/08/2008,05:05,05:38,06:11,06:38,19:22,19:50,20:22,20:55 9/09/2008,05:06,05:39,06:12,06:39,19:21,19:48,20:20,20:53 9/10/2008,05:07,05:40,06:13,06:40,19:19,19:46,20:18,20:52 -9/11/2008,05:08,05:41,06:14,06:41,19:17,19:45,20:17,20:50 -9/12/2008,05:10,05:43,06:15,06:42,19:16,19:43,20:15,20:48 -9/13/2008,05:11,05:44,06:16,06:43,19:14,19:41,20:13,20:46 -9/14/2008,05:12,05:45,06:17,06:44,19:12,19:39,20:11,20:44 -9/15/2008,05:13,05:46,06:18,06:45,19:11,19:38,20:10,20:42 -9/16/2008,05:14,05:47,06:19,06:46,19:09,19:36,20:08,20:41 -9/17/2008,05:15,05:48,06:20,06:47,19:07,19:34,20:06,20:39 -9/18/2008,05:16,05:49,06:21,06:48,19:06,19:33,20:04,20:37 -9/19/2008,05:17,05:50,06:21,06:49,19:04,19:31,20:03,20:35 +9/11/2008,05:08,05:41,06:14,06:40,19:17,19:45,20:17,20:50 +9/12/2008,05:10,05:43,06:15,06:41,19:16,19:43,20:15,20:48 +9/13/2008,05:11,05:44,06:16,06:42,19:14,19:41,20:13,20:46 +9/14/2008,05:12,05:45,06:17,06:43,19:12,19:39,20:11,20:44 +9/15/2008,05:13,05:46,06:18,06:44,19:11,19:38,20:10,20:42 +9/16/2008,05:14,05:47,06:19,06:45,19:09,19:36,20:08,20:41 +9/17/2008,05:15,05:48,06:20,06:46,19:07,19:34,20:06,20:39 +9/18/2008,05:16,05:49,06:21,06:47,19:06,19:33,20:04,20:37 +9/19/2008,05:17,05:50,06:21,06:48,19:04,19:31,20:03,20:35 9/20/2008,05:18,05:51,06:22,06:49,19:02,19:29,20:01,20:33 9/21/2008,05:20,05:52,06:23,06:50,19:01,19:28,19:59,20:32 9/22/2008,05:21,05:53,06:24,06:51,18:59,19:26,19:58,20:30 @@ -289,41 +289,41 @@ 10/15/2008,05:44,06:16,06:47,07:14,18:22,18:50,19:21,19:53 10/16/2008,05:45,06:17,06:48,07:15,18:21,18:48,19:20,19:51 10/17/2008,05:46,06:18,06:49,07:16,18:20,18:47,19:18,19:50 -10/18/2008,05:47,06:19,06:50,07:18,18:18,18:46,19:17,19:48 -10/19/2008,05:48,06:20,06:51,07:19,18:17,18:44,19:16,19:47 -10/20/2008,05:49,06:21,06:52,07:20,18:15,18:43,19:14,19:46 -10/21/2008,05:50,06:22,06:53,07:21,18:14,18:41,19:13,19:44 -10/22/2008,05:51,06:23,06:54,07:22,18:12,18:40,19:12,19:43 -10/23/2008,05:52,06:24,06:55,07:23,18:11,18:39,19:10,19:42 +10/18/2008,05:47,06:19,06:50,07:17,18:18,18:46,19:17,19:48 +10/19/2008,05:48,06:20,06:51,07:18,18:17,18:44,19:16,19:47 +10/20/2008,05:49,06:21,06:52,07:19,18:15,18:43,19:14,19:46 +10/21/2008,05:50,06:22,06:53,07:20,18:14,18:41,19:13,19:44 +10/22/2008,05:51,06:23,06:54,07:21,18:12,18:40,19:12,19:43 +10/23/2008,05:52,06:24,06:55,07:22,18:11,18:39,19:10,19:42 10/24/2008,05:53,06:25,06:56,07:24,18:10,18:38,19:09,19:41 10/25/2008,05:54,06:26,06:57,07:25,18:08,18:36,19:08,19:39 10/26/2008,05:55,06:27,06:59,07:26,18:07,18:35,19:07,19:38 10/27/2008,05:56,06:28,07:00,07:27,18:06,18:34,19:06,19:37 -10/28/2008,05:57,06:29,07:01,07:29,18:05,18:33,19:04,19:36 -10/29/2008,05:58,06:30,07:02,07:30,18:03,18:31,19:03,19:35 -10/30/2008,05:59,06:31,07:03,07:31,18:02,18:30,19:02,19:34 -10/31/2008,06:00,06:32,07:04,07:32,18:01,18:29,19:01,19:33 +10/28/2008,05:57,06:29,07:01,07:28,18:05,18:33,19:04,19:36 +10/29/2008,05:58,06:30,07:02,07:29,18:03,18:31,19:03,19:35 +10/30/2008,05:59,06:31,07:03,07:30,18:02,18:30,19:02,19:34 +10/31/2008,06:00,06:32,07:04,07:31,18:01,18:29,19:01,19:33 11/01/2008,06:01,06:33,07:05,07:33,18:00,18:28,19:00,19:32 11/02/2008,05:02,05:34,06:06,06:34,16:59,17:27,17:59,18:31 11/03/2008,05:03,05:35,06:07,06:35,16:58,17:26,17:58,18:30 11/04/2008,05:04,05:36,06:08,06:36,16:56,17:25,17:57,18:29 -11/05/2008,05:05,05:37,06:09,06:38,16:55,17:24,17:56,18:28 -11/06/2008,05:06,05:38,06:10,06:39,16:54,17:23,17:55,18:27 -11/07/2008,05:07,05:39,06:11,06:40,16:53,17:22,17:54,18:26 +11/05/2008,05:05,05:37,06:09,06:37,16:55,17:24,17:56,18:28 +11/06/2008,05:06,05:38,06:10,06:38,16:54,17:23,17:55,18:27 +11/07/2008,05:07,05:39,06:11,06:39,16:53,17:22,17:54,18:26 11/08/2008,05:08,05:40,06:13,06:41,16:52,17:21,17:53,18:25 11/09/2008,05:09,05:41,06:14,06:42,16:51,17:20,17:53,18:24 11/10/2008,05:10,05:42,06:15,06:43,16:50,17:19,17:52,18:24 -11/11/2008,05:11,05:43,06:16,06:45,16:50,17:18,17:51,18:23 -11/12/2008,05:12,05:44,06:17,06:46,16:49,17:18,17:50,18:22 -11/13/2008,05:13,05:45,06:18,06:47,16:48,17:17,17:49,18:21 +11/11/2008,05:11,05:43,06:16,06:44,16:50,17:18,17:51,18:23 +11/12/2008,05:12,05:44,06:17,06:45,16:49,17:18,17:50,18:22 +11/13/2008,05:13,05:45,06:18,06:46,16:48,17:17,17:49,18:21 11/14/2008,05:14,05:46,06:19,06:48,16:47,17:16,17:49,18:21 11/15/2008,05:15,05:47,06:20,06:49,16:46,17:15,17:48,18:20 11/16/2008,05:16,05:48,06:21,06:50,16:45,17:15,17:47,18:20 11/17/2008,05:17,05:49,06:22,06:51,16:45,17:14,17:47,18:19 -11/18/2008,05:18,05:50,06:23,06:53,16:44,17:13,17:46,18:18 -11/19/2008,05:19,05:51,06:24,06:54,16:43,17:13,17:46,18:18 -11/20/2008,05:20,05:52,06:25,06:55,16:43,17:12,17:45,18:18 -11/21/2008,05:21,05:53,06:26,06:56,16:42,17:12,17:45,18:17 +11/18/2008,05:18,05:50,06:23,06:52,16:44,17:13,17:46,18:18 +11/19/2008,05:19,05:51,06:24,06:53,16:43,17:13,17:46,18:18 +11/20/2008,05:20,05:52,06:25,06:54,16:43,17:12,17:45,18:18 +11/21/2008,05:21,05:53,06:26,06:55,16:42,17:12,17:45,18:17 11/22/2008,05:22,05:54,06:28,06:57,16:42,17:11,17:44,18:17 11/23/2008,05:23,05:55,06:29,06:58,16:41,17:11,17:44,18:16 11/24/2008,05:24,05:56,06:30,06:59,16:41,17:10,17:44,18:16 @@ -331,36 +331,36 @@ 11/26/2008,05:26,05:58,06:32,07:01,16:40,17:10,17:43,18:15 11/27/2008,05:27,05:59,06:33,07:02,16:39,17:09,17:43,18:15 11/28/2008,05:28,06:00,06:34,07:03,16:39,17:09,17:42,18:15 -11/29/2008,05:28,06:01,06:35,07:05,16:39,17:09,17:42,18:15 -11/30/2008,05:29,06:02,06:36,07:06,16:39,17:09,17:42,18:15 -12/01/2008,05:30,06:03,06:36,07:07,16:38,17:08,17:42,18:15 +11/29/2008,05:28,06:01,06:35,07:04,16:39,17:09,17:42,18:15 +11/30/2008,05:29,06:02,06:36,07:05,16:39,17:09,17:42,18:15 +12/01/2008,05:30,06:03,06:36,07:06,16:38,17:08,17:42,18:15 12/02/2008,05:31,06:04,06:37,07:07,16:38,17:08,17:42,18:15 12/03/2008,05:32,06:05,06:38,07:08,16:38,17:08,17:42,18:15 12/04/2008,05:33,06:05,06:39,07:09,16:38,17:08,17:42,18:15 12/05/2008,05:34,06:06,06:40,07:10,16:38,17:08,17:42,18:15 12/06/2008,05:34,06:07,06:41,07:11,16:38,17:08,17:42,18:15 12/07/2008,05:35,06:08,06:42,07:12,16:38,17:08,17:42,18:15 -12/08/2008,05:36,06:09,06:43,07:13,16:38,17:08,17:42,18:15 -12/09/2008,05:37,06:10,06:43,07:14,16:38,17:08,17:42,18:15 -12/10/2008,05:37,06:10,06:44,07:15,16:38,17:08,17:42,18:15 +12/08/2008,05:36,06:09,06:43,07:12,16:38,17:08,17:42,18:15 +12/09/2008,05:37,06:10,06:43,07:13,16:38,17:08,17:42,18:15 +12/10/2008,05:37,06:10,06:44,07:14,16:38,17:08,17:42,18:15 12/11/2008,05:38,06:11,06:45,07:15,16:38,17:09,17:43,18:15 12/12/2008,05:39,06:12,06:46,07:16,16:38,17:09,17:43,18:16 -12/13/2008,05:40,06:12,06:46,07:17,16:39,17:09,17:43,18:16 -12/14/2008,05:40,06:13,06:47,07:18,16:39,17:09,17:43,18:16 +12/13/2008,05:40,06:12,06:46,07:16,16:39,17:09,17:43,18:16 +12/14/2008,05:40,06:13,06:47,07:17,16:39,17:09,17:43,18:16 12/15/2008,05:41,06:14,06:48,07:18,16:39,17:10,17:44,18:17 12/16/2008,05:41,06:14,06:48,07:19,16:39,17:10,17:44,18:17 -12/17/2008,05:42,06:15,06:49,07:20,16:40,17:10,17:44,18:17 +12/17/2008,05:42,06:15,06:49,07:19,16:40,17:10,17:44,18:17 12/18/2008,05:43,06:16,06:50,07:20,16:40,17:11,17:45,18:18 -12/19/2008,05:43,06:16,06:50,07:21,16:41,17:11,17:45,18:18 +12/19/2008,05:43,06:16,06:50,07:20,16:41,17:11,17:45,18:18 12/20/2008,05:44,06:17,06:51,07:21,16:41,17:12,17:46,18:19 -12/21/2008,05:44,06:17,06:51,07:22,16:42,17:12,17:46,18:19 +12/21/2008,05:44,06:17,06:51,07:21,16:42,17:12,17:46,18:19 12/22/2008,05:45,06:18,06:52,07:22,16:42,17:13,17:47,18:20 -12/23/2008,05:45,06:18,06:52,07:23,16:43,17:13,17:47,18:20 +12/23/2008,05:45,06:18,06:52,07:22,16:43,17:13,17:47,18:20 12/24/2008,05:46,06:19,06:53,07:23,16:43,17:14,17:48,18:21 -12/25/2008,05:46,06:19,06:53,07:24,16:44,17:15,17:49,18:22 -12/26/2008,05:46,06:19,06:53,07:24,16:45,17:15,17:49,18:22 +12/25/2008,05:46,06:19,06:53,07:23,16:44,17:15,17:49,18:22 +12/26/2008,05:46,06:19,06:53,07:23,16:45,17:15,17:49,18:22 12/27/2008,05:47,06:20,06:54,07:24,16:45,17:16,17:50,18:23 12/28/2008,05:47,06:20,06:54,07:24,16:46,17:17,17:51,18:23 -12/29/2008,05:47,06:20,06:54,07:25,16:47,17:17,17:51,18:24 -12/30/2008,05:48,06:20,06:54,07:25,16:48,17:18,17:52,18:25 +12/29/2008,05:47,06:20,06:54,07:24,16:47,17:17,17:51,18:24 +12/30/2008,05:48,06:20,06:54,07:24,16:48,17:18,17:52,18:25 12/31/2008,05:48,06:21,06:55,07:25,16:48,17:19,17:53,18:26 diff --git a/test/40_0194N-105_2928W#America-Denver.txt b/test/40_0194N-105_2928W#America-Denver.txt index 8bb91a7..654d542 100644 --- a/test/40_0194N-105_2928W#America-Denver.txt +++ b/test/40_0194N-105_2928W#America-Denver.txt @@ -7,206 +7,206 @@ 1/07/2008,05:47,06:19,06:53,07:23,16:52,17:22,17:56,18:29 1/08/2008,05:47,06:19,06:53,07:23,16:53,17:23,17:57,18:30 1/09/2008,05:47,06:19,06:53,07:23,16:54,17:24,17:58,18:30 -1/10/2008,05:47,06:19,06:53,07:23,16:55,17:25,17:59,18:31 -1/11/2008,05:46,06:19,06:53,07:23,16:56,17:26,18:00,18:32 +1/10/2008,05:47,06:19,06:53,07:22,16:55,17:25,17:59,18:31 +1/11/2008,05:46,06:19,06:53,07:22,16:56,17:26,18:00,18:32 1/12/2008,05:46,06:19,06:52,07:22,16:57,17:27,18:01,18:33 1/13/2008,05:46,06:19,06:52,07:22,16:58,17:28,18:02,18:34 -1/14/2008,05:46,06:19,06:52,07:22,16:59,17:29,18:03,18:35 +1/14/2008,05:46,06:19,06:52,07:21,16:59,17:29,18:03,18:35 1/15/2008,05:46,06:18,06:52,07:21,17:00,17:30,18:03,18:36 1/16/2008,05:46,06:18,06:51,07:21,17:02,17:31,18:04,18:37 -1/17/2008,05:45,06:18,06:51,07:21,17:03,17:32,18:05,18:38 +1/17/2008,05:45,06:18,06:51,07:20,17:03,17:32,18:05,18:38 1/18/2008,05:45,06:17,06:51,07:20,17:04,17:33,18:06,18:39 -1/19/2008,05:45,06:17,06:50,07:20,17:05,17:34,18:08,18:40 +1/19/2008,05:45,06:17,06:50,07:19,17:05,17:34,18:08,18:40 1/20/2008,05:44,06:16,06:50,07:19,17:06,17:35,18:09,18:41 1/21/2008,05:44,06:16,06:49,07:18,17:07,17:37,18:10,18:42 -1/22/2008,05:43,06:16,06:49,07:18,17:08,17:38,18:11,18:43 +1/22/2008,05:43,06:16,06:49,07:17,17:08,17:38,18:11,18:43 1/23/2008,05:43,06:15,06:48,07:17,17:10,17:39,18:12,18:44 -1/24/2008,05:42,06:14,06:47,07:17,17:11,17:40,18:13,18:45 -1/25/2008,05:42,06:14,06:47,07:16,17:12,17:41,18:14,18:46 +1/24/2008,05:42,06:14,06:47,07:16,17:11,17:40,18:13,18:45 +1/25/2008,05:42,06:14,06:47,07:15,17:12,17:41,18:14,18:46 1/26/2008,05:41,06:13,06:46,07:15,17:13,17:42,18:15,18:47 1/27/2008,05:41,06:13,06:45,07:14,17:14,17:43,18:16,18:48 -1/28/2008,05:40,06:12,06:45,07:14,17:15,17:44,18:17,18:49 -1/29/2008,05:39,06:11,06:44,07:13,17:17,17:45,18:18,18:50 -1/30/2008,05:39,06:10,06:43,07:12,17:18,17:47,18:19,18:51 -1/31/2008,05:38,06:10,06:42,07:11,17:19,17:48,18:20,18:52 -2/01/2008,05:37,06:09,06:41,07:10,17:20,17:49,18:21,18:53 +1/28/2008,05:40,06:12,06:45,07:13,17:15,17:44,18:17,18:49 +1/29/2008,05:39,06:11,06:44,07:12,17:17,17:45,18:18,18:50 +1/30/2008,05:39,06:10,06:43,07:11,17:18,17:47,18:19,18:51 +1/31/2008,05:38,06:10,06:42,07:10,17:19,17:48,18:20,18:52 +2/01/2008,05:37,06:09,06:41,07:09,17:20,17:49,18:21,18:53 2/02/2008,05:36,06:08,06:40,07:09,17:21,17:50,18:22,18:54 2/03/2008,05:35,06:07,06:40,07:08,17:23,17:51,18:23,18:55 2/04/2008,05:35,06:06,06:39,07:07,17:24,17:52,18:25,18:56 2/05/2008,05:34,06:05,06:38,07:06,17:25,17:53,18:26,18:57 -2/06/2008,05:33,06:05,06:37,07:05,17:26,17:55,18:27,18:58 -2/07/2008,05:32,06:04,06:36,07:04,17:27,17:56,18:28,18:59 -2/08/2008,05:31,06:03,06:35,07:03,17:29,17:57,18:29,19:00 -2/09/2008,05:30,06:02,06:34,07:02,17:30,17:58,18:30,19:02 -2/10/2008,05:29,06:00,06:32,07:01,17:31,17:59,18:31,19:03 +2/06/2008,05:33,06:05,06:37,07:04,17:26,17:55,18:27,18:58 +2/07/2008,05:32,06:04,06:36,07:03,17:27,17:56,18:28,18:59 +2/08/2008,05:31,06:03,06:35,07:02,17:29,17:57,18:29,19:00 +2/09/2008,05:30,06:02,06:34,07:01,17:30,17:58,18:30,19:02 +2/10/2008,05:29,06:00,06:32,07:00,17:31,17:59,18:31,19:03 2/11/2008,05:28,05:59,06:31,06:59,17:32,18:00,18:32,19:04 2/12/2008,05:27,05:58,06:30,06:58,17:33,18:01,18:33,19:05 -2/13/2008,05:26,05:57,06:29,06:57,17:35,18:03,18:34,19:06 -2/14/2008,05:25,05:56,06:28,06:56,17:36,18:04,18:35,19:07 +2/13/2008,05:26,05:57,06:29,06:56,17:35,18:03,18:34,19:06 +2/14/2008,05:25,05:56,06:28,06:55,17:36,18:04,18:35,19:07 2/15/2008,05:23,05:55,06:27,06:54,17:37,18:05,18:36,19:08 2/16/2008,05:22,05:54,06:25,06:53,17:38,18:06,18:38,19:09 -2/17/2008,05:21,05:52,06:24,06:52,17:39,18:07,18:39,19:10 -2/18/2008,05:20,05:51,06:23,06:51,17:40,18:08,18:40,19:11 +2/17/2008,05:21,05:52,06:24,06:51,17:39,18:07,18:39,19:10 +2/18/2008,05:20,05:51,06:23,06:50,17:40,18:08,18:40,19:11 2/19/2008,05:19,05:50,06:22,06:49,17:42,18:09,18:41,19:12 -2/20/2008,05:17,05:49,06:20,06:48,17:43,18:10,18:42,19:13 +2/20/2008,05:17,05:49,06:20,06:47,17:43,18:10,18:42,19:13 2/21/2008,05:16,05:47,06:19,06:46,17:44,18:11,18:43,19:14 2/22/2008,05:15,05:46,06:18,06:45,17:45,18:13,18:44,19:15 -2/23/2008,05:13,05:45,06:16,06:44,17:46,18:14,18:45,19:16 +2/23/2008,05:13,05:45,06:16,06:43,17:46,18:14,18:45,19:16 2/24/2008,05:12,05:43,06:15,06:42,17:47,18:15,18:46,19:18 -2/25/2008,05:11,05:42,06:13,06:41,17:48,18:16,18:47,19:19 +2/25/2008,05:11,05:42,06:13,06:40,17:48,18:16,18:47,19:19 2/26/2008,05:09,05:41,06:12,06:39,17:50,18:17,18:48,19:20 -2/27/2008,05:08,05:39,06:11,06:38,17:51,18:18,18:49,19:21 +2/27/2008,05:08,05:39,06:11,06:37,17:51,18:18,18:49,19:21 2/28/2008,05:06,05:38,06:09,06:36,17:52,18:19,18:50,19:22 -2/29/2008,05:05,05:36,06:08,06:35,17:53,18:20,18:51,19:23 +2/29/2008,05:05,05:36,06:08,06:34,17:53,18:20,18:51,19:23 3/01/2008,05:03,05:35,06:06,06:33,17:54,18:21,18:53,19:24 -3/02/2008,05:02,05:33,06:05,06:32,17:55,18:22,18:54,19:25 +3/02/2008,05:02,05:33,06:05,06:31,17:55,18:22,18:54,19:25 3/03/2008,05:00,05:32,06:03,06:30,17:56,18:23,18:55,19:26 -3/04/2008,04:59,05:30,06:02,06:29,17:57,18:24,18:56,19:27 +3/04/2008,04:59,05:30,06:02,06:28,17:57,18:24,18:56,19:27 3/05/2008,04:57,05:29,06:00,06:27,17:58,18:25,18:57,19:28 -3/06/2008,04:56,05:27,05:59,06:26,17:59,18:27,18:58,19:29 +3/06/2008,04:56,05:27,05:59,06:25,17:59,18:27,18:58,19:29 3/07/2008,04:54,05:26,05:57,06:24,18:01,18:28,18:59,19:31 -3/08/2008,04:53,05:24,05:56,06:23,18:02,18:29,19:00,19:32 +3/08/2008,04:53,05:24,05:56,06:22,18:02,18:29,19:00,19:32 3/10/2008,05:49,06:21,06:52,07:19,19:04,19:31,20:02,20:34 -3/11/2008,05:48,06:19,06:51,07:18,19:05,19:32,20:03,20:35 +3/11/2008,05:48,06:19,06:51,07:17,19:05,19:32,20:03,20:35 3/12/2008,05:46,06:18,06:49,07:16,19:06,19:33,20:04,20:36 -3/13/2008,05:44,06:16,06:48,07:15,19:07,19:34,20:05,20:37 +3/13/2008,05:44,06:16,06:48,07:14,19:07,19:34,20:05,20:37 3/14/2008,05:43,06:15,06:46,07:13,19:08,19:35,20:06,20:38 3/15/2008,05:41,06:13,06:44,07:11,19:09,19:36,20:07,20:39 -3/16/2008,05:39,06:11,06:43,07:10,19:10,19:37,20:09,20:41 +3/16/2008,05:39,06:11,06:43,07:09,19:10,19:37,20:09,20:41 3/17/2008,05:38,06:10,06:41,07:08,19:11,19:38,20:10,20:42 -3/18/2008,05:36,06:08,06:40,07:07,19:12,19:39,20:11,20:43 -3/19/2008,05:34,06:06,06:38,07:05,19:13,19:40,20:12,20:44 +3/18/2008,05:36,06:08,06:40,07:06,19:12,19:39,20:11,20:43 +3/19/2008,05:34,06:06,06:38,07:04,19:13,19:40,20:12,20:44 3/20/2008,05:32,06:05,06:36,07:03,19:14,19:41,20:13,20:45 -3/21/2008,05:31,06:03,06:35,07:02,19:15,19:42,20:14,20:46 +3/21/2008,05:31,06:03,06:35,07:01,19:15,19:42,20:14,20:46 3/22/2008,05:29,06:01,06:33,07:00,19:16,19:43,20:15,20:47 3/23/2008,05:27,06:00,06:31,06:58,19:17,19:44,20:16,20:49 -3/24/2008,05:25,05:58,06:30,06:57,19:18,19:45,20:17,20:50 +3/24/2008,05:25,05:58,06:30,06:56,19:18,19:45,20:17,20:50 3/25/2008,05:24,05:56,06:28,06:55,19:19,19:46,20:18,20:51 -3/26/2008,05:22,05:54,06:26,06:54,19:20,19:47,20:19,20:52 -3/27/2008,05:20,05:53,06:25,06:52,19:21,19:49,20:21,20:53 +3/26/2008,05:22,05:54,06:26,06:53,19:20,19:47,20:19,20:52 +3/27/2008,05:20,05:53,06:25,06:51,19:21,19:49,20:21,20:53 3/28/2008,05:18,05:51,06:23,06:50,19:22,19:50,20:22,20:55 -3/29/2008,05:16,05:49,06:21,06:49,19:23,19:51,20:23,20:56 +3/29/2008,05:16,05:49,06:21,06:48,19:23,19:51,20:23,20:56 3/30/2008,05:14,05:48,06:20,06:47,19:24,19:52,20:24,20:57 3/31/2008,05:13,05:46,06:18,06:45,19:25,19:53,20:25,20:58 -4/01/2008,05:11,05:44,06:17,06:44,19:26,19:54,20:26,21:00 +4/01/2008,05:11,05:44,06:17,06:43,19:26,19:54,20:26,21:00 4/02/2008,05:09,05:42,06:15,06:42,19:27,19:55,20:27,21:01 -4/03/2008,05:07,05:41,06:13,06:41,19:28,19:56,20:28,21:02 +4/03/2008,05:07,05:41,06:13,06:40,19:28,19:56,20:28,21:02 4/04/2008,05:05,05:39,06:12,06:39,19:29,19:57,20:30,21:03 -4/05/2008,05:03,05:37,06:10,06:38,19:30,19:58,20:31,21:05 -4/06/2008,05:02,05:36,06:08,06:36,19:31,19:59,20:32,21:06 +4/05/2008,05:03,05:37,06:10,06:37,19:30,19:58,20:31,21:05 +4/06/2008,05:02,05:36,06:08,06:35,19:31,19:59,20:32,21:06 4/07/2008,05:00,05:34,06:07,06:34,19:32,20:00,20:33,21:07 -4/08/2008,04:58,05:32,06:05,06:33,19:33,20:01,20:34,21:09 +4/08/2008,04:58,05:32,06:05,06:32,19:33,20:01,20:34,21:09 4/09/2008,04:56,05:30,06:03,06:31,19:34,20:02,20:35,21:10 -4/10/2008,04:54,05:29,06:02,06:30,19:35,20:03,20:37,21:11 +4/10/2008,04:54,05:29,06:02,06:29,19:35,20:03,20:37,21:11 4/11/2008,04:52,05:27,06:00,06:28,19:36,20:04,20:38,21:12 -4/12/2008,04:50,05:25,05:59,06:27,19:38,20:05,20:39,21:14 +4/12/2008,04:50,05:25,05:59,06:26,19:38,20:05,20:39,21:14 4/13/2008,04:49,05:24,05:57,06:25,19:39,20:07,20:40,21:15 -4/14/2008,04:47,05:22,05:56,06:24,19:40,20:08,20:41,21:17 +4/14/2008,04:47,05:22,05:56,06:23,19:40,20:08,20:41,21:17 4/15/2008,04:45,05:20,05:54,06:22,19:41,20:09,20:42,21:18 -4/16/2008,04:43,05:19,05:52,06:21,19:42,20:10,20:44,21:19 +4/16/2008,04:43,05:19,05:52,06:20,19:42,20:10,20:44,21:19 4/17/2008,04:41,05:17,05:51,06:19,19:43,20:11,20:45,21:21 -4/18/2008,04:39,05:15,05:49,06:18,19:44,20:12,20:46,21:22 +4/18/2008,04:39,05:15,05:49,06:17,19:44,20:12,20:46,21:22 4/19/2008,04:38,05:14,05:48,06:16,19:45,20:13,20:47,21:23 -4/20/2008,04:36,05:12,05:46,06:15,19:46,20:14,20:49,21:25 +4/20/2008,04:36,05:12,05:46,06:14,19:46,20:14,20:49,21:25 4/21/2008,04:34,05:10,05:45,06:13,19:47,20:15,20:50,21:26 4/22/2008,04:32,05:09,05:43,06:12,19:48,20:16,20:51,21:28 -4/23/2008,04:30,05:07,05:42,06:11,19:49,20:17,20:52,21:29 +4/23/2008,04:30,05:07,05:42,06:10,19:49,20:17,20:52,21:29 4/24/2008,04:28,05:06,05:40,06:09,19:50,20:19,20:53,21:31 -4/25/2008,04:27,05:04,05:39,06:08,19:51,20:20,20:55,21:32 -4/26/2008,04:25,05:02,05:38,06:07,19:52,20:21,20:56,21:34 +4/25/2008,04:27,05:04,05:39,06:07,19:51,20:20,20:55,21:32 +4/26/2008,04:25,05:02,05:38,06:06,19:52,20:21,20:56,21:34 4/27/2008,04:23,05:01,05:36,06:05,19:53,20:22,20:57,21:35 -4/28/2008,04:21,04:59,05:35,06:04,19:54,20:23,20:58,21:36 -4/29/2008,04:20,04:58,05:33,06:03,19:55,20:24,21:00,21:38 +4/28/2008,04:21,04:59,05:35,06:03,19:54,20:23,20:58,21:36 +4/29/2008,04:20,04:58,05:33,06:02,19:55,20:24,21:00,21:38 4/30/2008,04:18,04:56,05:32,06:01,19:56,20:25,21:01,21:39 5/01/2008,04:16,04:55,05:31,06:00,19:57,20:26,21:02,21:41 -5/02/2008,04:14,04:53,05:29,05:59,19:58,20:27,21:03,21:42 -5/03/2008,04:13,04:52,05:28,05:58,19:59,20:28,21:05,21:44 -5/04/2008,04:11,04:51,05:27,05:57,20:00,20:30,21:06,21:45 +5/02/2008,04:14,04:53,05:29,05:58,19:58,20:27,21:03,21:42 +5/03/2008,04:13,04:52,05:28,05:57,19:59,20:28,21:05,21:44 +5/04/2008,04:11,04:51,05:27,05:56,20:00,20:30,21:06,21:45 5/05/2008,04:09,04:49,05:26,05:55,20:01,20:31,21:07,21:47 5/06/2008,04:08,04:48,05:24,05:54,20:02,20:32,21:08,21:48 5/07/2008,04:06,04:46,05:23,05:53,20:03,20:33,21:10,21:50 5/08/2008,04:05,04:45,05:22,05:52,20:04,20:34,21:11,21:51 -5/09/2008,04:03,04:44,05:21,05:51,20:05,20:35,21:12,21:53 -5/10/2008,04:01,04:42,05:20,05:50,20:06,20:36,21:13,21:54 -5/11/2008,04:00,04:41,05:19,05:49,20:07,20:37,21:15,21:56 -5/12/2008,03:58,04:40,05:17,05:48,20:08,20:38,21:16,21:57 -5/13/2008,03:57,04:39,05:16,05:47,20:09,20:39,21:17,21:59 +5/09/2008,04:03,04:44,05:21,05:50,20:05,20:35,21:12,21:53 +5/10/2008,04:01,04:42,05:20,05:49,20:06,20:36,21:13,21:54 +5/11/2008,04:00,04:41,05:19,05:48,20:07,20:37,21:15,21:56 +5/12/2008,03:58,04:40,05:17,05:47,20:08,20:38,21:16,21:57 +5/13/2008,03:57,04:39,05:16,05:46,20:09,20:39,21:17,21:59 5/14/2008,03:55,04:37,05:15,05:46,20:09,20:40,21:18,22:00 5/15/2008,03:54,04:36,05:14,05:45,20:10,20:41,21:19,22:02 5/16/2008,03:53,04:35,05:13,05:44,20:11,20:42,21:21,22:03 5/17/2008,03:51,04:34,05:12,05:43,20:12,20:43,21:22,22:05 5/18/2008,03:50,04:33,05:11,05:42,20:13,20:44,21:23,22:06 -5/19/2008,03:49,04:32,05:11,05:42,20:14,20:45,21:24,22:07 -5/20/2008,03:47,04:31,05:10,05:41,20:15,20:46,21:25,22:09 +5/19/2008,03:49,04:32,05:11,05:41,20:14,20:45,21:24,22:07 +5/20/2008,03:47,04:31,05:10,05:40,20:15,20:46,21:25,22:09 5/21/2008,03:46,04:30,05:09,05:40,20:16,20:47,21:26,22:10 5/22/2008,03:45,04:29,05:08,05:39,20:17,20:48,21:27,22:12 -5/23/2008,03:44,04:28,05:07,05:39,20:18,20:49,21:29,22:13 +5/23/2008,03:44,04:28,05:07,05:38,20:18,20:49,21:29,22:13 5/24/2008,03:42,04:27,05:07,05:38,20:18,20:50,21:30,22:14 5/25/2008,03:41,04:26,05:06,05:37,20:19,20:51,21:31,22:16 -5/26/2008,03:40,04:25,05:05,05:37,20:20,20:52,21:32,22:17 +5/26/2008,03:40,04:25,05:05,05:36,20:20,20:52,21:32,22:17 5/27/2008,03:39,04:25,05:04,05:36,20:21,20:53,21:33,22:18 -5/28/2008,03:38,04:24,05:04,05:36,20:22,20:54,21:34,22:19 +5/28/2008,03:38,04:24,05:04,05:35,20:22,20:54,21:34,22:19 5/29/2008,03:37,04:23,05:03,05:35,20:22,20:54,21:35,22:21 -5/30/2008,03:36,04:22,05:03,05:35,20:23,20:55,21:36,22:22 +5/30/2008,03:36,04:22,05:03,05:34,20:23,20:55,21:36,22:22 5/31/2008,03:36,04:22,05:02,05:34,20:24,20:56,21:37,22:23 -6/01/2008,03:35,04:21,05:02,05:34,20:25,20:57,21:37,22:24 -6/02/2008,03:34,04:21,05:01,05:34,20:25,20:58,21:38,22:25 +6/01/2008,03:35,04:21,05:02,05:33,20:25,20:57,21:37,22:24 +6/02/2008,03:34,04:21,05:01,05:33,20:25,20:58,21:38,22:25 6/03/2008,03:33,04:20,05:01,05:33,20:26,20:58,21:39,22:26 -6/04/2008,03:33,04:20,05:01,05:33,20:27,20:59,21:40,22:27 -6/05/2008,03:32,04:19,05:00,05:33,20:27,21:00,21:41,22:28 +6/04/2008,03:33,04:20,05:01,05:32,20:27,20:59,21:40,22:27 +6/05/2008,03:32,04:19,05:00,05:32,20:27,21:00,21:41,22:28 6/06/2008,03:31,04:19,05:00,05:32,20:28,21:00,21:41,22:29 6/07/2008,03:31,04:18,05:00,05:32,20:28,21:01,21:42,22:30 -6/08/2008,03:30,04:18,04:59,05:32,20:29,21:02,21:43,22:31 -6/09/2008,03:30,04:18,04:59,05:32,20:29,21:02,21:43,22:32 -6/10/2008,03:30,04:18,04:59,05:32,20:30,21:03,21:44,22:32 -6/11/2008,03:29,04:17,04:59,05:32,20:30,21:03,21:45,22:33 -6/12/2008,03:29,04:17,04:59,05:32,20:31,21:04,21:45,22:34 -6/13/2008,03:29,04:17,04:59,05:32,20:31,21:04,21:46,22:34 -6/14/2008,03:29,04:17,04:59,05:32,20:32,21:05,21:46,22:35 -6/15/2008,03:28,04:17,04:59,05:32,20:32,21:05,21:47,22:35 -6/16/2008,03:28,04:17,04:59,05:32,20:32,21:05,21:47,22:36 -6/17/2008,03:28,04:17,04:59,05:32,20:33,21:06,21:47,22:36 -6/18/2008,03:29,04:17,04:59,05:32,20:33,21:06,21:48,22:36 +6/08/2008,03:30,04:18,04:59,05:31,20:29,21:02,21:43,22:31 +6/09/2008,03:30,04:18,04:59,05:31,20:29,21:02,21:43,22:32 +6/10/2008,03:30,04:18,04:59,05:31,20:30,21:03,21:44,22:32 +6/11/2008,03:29,04:17,04:59,05:31,20:30,21:03,21:45,22:33 +6/12/2008,03:29,04:17,04:59,05:31,20:31,21:04,21:45,22:34 +6/13/2008,03:29,04:17,04:59,05:31,20:31,21:04,21:46,22:34 +6/14/2008,03:29,04:17,04:59,05:31,20:32,21:05,21:46,22:35 +6/15/2008,03:28,04:17,04:59,05:31,20:32,21:05,21:47,22:35 +6/16/2008,03:28,04:17,04:59,05:31,20:32,21:05,21:47,22:36 +6/17/2008,03:28,04:17,04:59,05:31,20:33,21:06,21:47,22:36 +6/18/2008,03:29,04:17,04:59,05:31,20:33,21:06,21:48,22:36 6/19/2008,03:29,04:17,04:59,05:32,20:33,21:06,21:48,22:37 6/20/2008,03:29,04:18,04:59,05:32,20:33,21:06,21:48,22:37 -6/21/2008,03:29,04:18,05:00,05:33,20:34,21:07,21:48,22:37 -6/22/2008,03:29,04:18,05:00,05:33,20:34,21:07,21:48,22:37 +6/21/2008,03:29,04:18,05:00,05:32,20:34,21:07,21:48,22:37 +6/22/2008,03:29,04:18,05:00,05:32,20:34,21:07,21:48,22:37 6/23/2008,03:30,04:18,05:00,05:33,20:34,21:07,21:49,22:37 6/24/2008,03:30,04:19,05:01,05:33,20:34,21:07,21:49,22:37 -6/25/2008,03:31,04:19,05:01,05:34,20:34,21:07,21:49,22:37 +6/25/2008,03:31,04:19,05:01,05:33,20:34,21:07,21:49,22:37 6/26/2008,03:31,04:20,05:01,05:34,20:34,21:07,21:49,22:37 -6/27/2008,03:32,04:20,05:02,05:35,20:34,21:07,21:49,22:37 -6/28/2008,03:32,04:21,05:02,05:35,20:34,21:07,21:48,22:37 +6/27/2008,03:32,04:20,05:02,05:34,20:34,21:07,21:49,22:37 +6/28/2008,03:32,04:21,05:02,05:34,20:34,21:07,21:48,22:37 6/29/2008,03:33,04:21,05:03,05:35,20:34,21:07,21:48,22:37 -6/30/2008,03:34,04:22,05:03,05:36,20:34,21:07,21:48,22:36 +6/30/2008,03:34,04:22,05:03,05:35,20:34,21:07,21:48,22:36 7/01/2008,03:34,04:22,05:04,05:36,20:34,21:06,21:48,22:36 -7/02/2008,03:35,04:23,05:04,05:37,20:34,21:06,21:48,22:35 +7/02/2008,03:35,04:23,05:04,05:36,20:34,21:06,21:48,22:35 7/03/2008,03:36,04:24,05:05,05:37,20:33,21:06,21:47,22:35 -7/04/2008,03:37,04:24,05:05,05:38,20:33,21:06,21:47,22:34 -7/05/2008,03:38,04:25,05:06,05:39,20:33,21:05,21:46,22:34 +7/04/2008,03:37,04:24,05:05,05:37,20:33,21:06,21:47,22:34 +7/05/2008,03:38,04:25,05:06,05:38,20:33,21:05,21:46,22:34 7/06/2008,03:39,04:26,05:07,05:39,20:33,21:05,21:46,22:33 -7/07/2008,03:40,04:27,05:07,05:40,20:32,21:05,21:45,22:32 +7/07/2008,03:40,04:27,05:07,05:39,20:32,21:05,21:45,22:32 7/08/2008,03:41,04:27,05:08,05:40,20:32,21:04,21:45,22:32 7/09/2008,03:42,04:28,05:09,05:41,20:32,21:04,21:44,22:31 -7/10/2008,03:43,04:29,05:10,05:42,20:31,21:03,21:44,22:30 -7/11/2008,03:44,04:30,05:10,05:43,20:31,21:03,21:43,22:29 +7/10/2008,03:43,04:29,05:10,05:41,20:31,21:03,21:44,22:30 +7/11/2008,03:44,04:30,05:10,05:42,20:31,21:03,21:43,22:29 7/12/2008,03:45,04:31,05:11,05:43,20:30,21:02,21:42,22:28 -7/13/2008,03:46,04:32,05:12,05:44,20:30,21:02,21:42,22:27 -7/14/2008,03:47,04:33,05:13,05:45,20:29,21:01,21:41,22:26 +7/13/2008,03:46,04:32,05:12,05:43,20:30,21:02,21:42,22:27 +7/14/2008,03:47,04:33,05:13,05:44,20:29,21:01,21:41,22:26 7/15/2008,03:49,04:34,05:14,05:45,20:29,21:00,21:40,22:25 7/16/2008,03:50,04:35,05:15,05:46,20:28,21:00,21:39,22:24 7/17/2008,03:51,04:36,05:15,05:47,20:27,20:59,21:38,22:23 -7/18/2008,03:53,04:37,05:16,05:48,20:27,20:58,21:37,22:22 -7/19/2008,03:54,04:38,05:17,05:49,20:26,20:57,21:36,22:21 -7/20/2008,03:55,04:39,05:18,05:50,20:25,20:56,21:35,22:19 +7/18/2008,03:53,04:37,05:16,05:47,20:27,20:58,21:37,22:22 +7/19/2008,03:54,04:38,05:17,05:48,20:26,20:57,21:36,22:21 +7/20/2008,03:55,04:39,05:18,05:49,20:25,20:56,21:35,22:19 7/21/2008,03:57,04:40,05:19,05:50,20:24,20:56,21:34,22:18 7/22/2008,03:58,04:41,05:20,05:51,20:24,20:55,21:33,22:17 7/23/2008,03:59,04:42,05:21,05:52,20:23,20:54,21:32,22:15 -7/24/2008,04:01,04:44,05:22,05:53,20:22,20:53,21:31,22:14 -7/25/2008,04:02,04:45,05:23,05:54,20:21,20:52,21:30,22:13 -7/26/2008,04:03,04:46,05:24,05:55,20:20,20:51,21:29,22:11 -7/27/2008,04:05,04:47,05:25,05:56,20:19,20:50,21:28,22:10 -7/28/2008,04:06,04:48,05:26,05:57,20:18,20:49,21:27,22:08 +7/24/2008,04:01,04:44,05:22,05:52,20:22,20:53,21:31,22:14 +7/25/2008,04:02,04:45,05:23,05:53,20:21,20:52,21:30,22:13 +7/26/2008,04:03,04:46,05:24,05:54,20:20,20:51,21:29,22:11 +7/27/2008,04:05,04:47,05:25,05:55,20:19,20:50,21:28,22:10 +7/28/2008,04:06,04:48,05:26,05:56,20:18,20:49,21:27,22:08 7/29/2008,04:08,04:49,05:27,05:57,20:17,20:48,21:25,22:07 7/30/2008,04:09,04:50,05:28,05:58,20:16,20:47,21:24,22:05 7/31/2008,04:11,04:52,05:29,05:59,20:15,20:45,21:23,22:04 @@ -214,16 +214,16 @@ 8/02/2008,04:13,04:54,05:31,06:01,20:13,20:43,21:20,22:00 8/03/2008,04:15,04:55,05:32,06:02,20:12,20:42,21:19,21:59 8/04/2008,04:16,04:56,05:33,06:03,20:11,20:41,21:17,21:57 -8/05/2008,04:18,04:58,05:34,06:04,20:10,20:39,21:16,21:55 -8/06/2008,04:19,04:59,05:35,06:05,20:08,20:38,21:14,21:54 -8/07/2008,04:21,05:00,05:36,06:06,20:07,20:37,21:13,21:52 -8/08/2008,04:22,05:01,05:37,06:07,20:06,20:35,21:11,21:50 -8/09/2008,04:24,05:02,05:38,06:08,20:05,20:34,21:10,21:49 -8/10/2008,04:25,05:04,05:39,06:09,20:03,20:33,21:08,21:47 -8/11/2008,04:26,05:05,05:40,06:10,20:02,20:31,21:07,21:45 -8/12/2008,04:28,05:06,05:41,06:11,20:01,20:30,21:05,21:43 -8/13/2008,04:29,05:07,05:42,06:12,19:59,20:29,21:04,21:42 -8/14/2008,04:31,05:08,05:43,06:13,19:58,20:27,21:02,21:40 +8/05/2008,04:18,04:58,05:34,06:03,20:10,20:39,21:16,21:55 +8/06/2008,04:19,04:59,05:35,06:04,20:08,20:38,21:14,21:54 +8/07/2008,04:21,05:00,05:36,06:05,20:07,20:37,21:13,21:52 +8/08/2008,04:22,05:01,05:37,06:06,20:06,20:35,21:11,21:50 +8/09/2008,04:24,05:02,05:38,06:07,20:05,20:34,21:10,21:49 +8/10/2008,04:25,05:04,05:39,06:08,20:03,20:33,21:08,21:47 +8/11/2008,04:26,05:05,05:40,06:09,20:02,20:31,21:07,21:45 +8/12/2008,04:28,05:06,05:41,06:10,20:01,20:30,21:05,21:43 +8/13/2008,04:29,05:07,05:42,06:11,19:59,20:29,21:04,21:42 +8/14/2008,04:31,05:08,05:43,06:12,19:58,20:27,21:02,21:40 8/15/2008,04:32,05:09,05:45,06:13,19:57,20:26,21:01,21:38 8/16/2008,04:33,05:11,05:46,06:14,19:55,20:24,20:59,21:36 8/17/2008,04:35,05:12,05:47,06:15,19:54,20:23,20:57,21:34 @@ -234,16 +234,16 @@ 8/22/2008,04:42,05:18,05:52,06:20,19:47,20:15,20:49,21:25 8/23/2008,04:43,05:19,05:53,06:21,19:45,20:14,20:48,21:23 8/24/2008,04:44,05:20,05:54,06:22,19:44,20:12,20:46,21:21 -8/25/2008,04:46,05:21,05:55,06:23,19:42,20:10,20:44,21:20 -8/26/2008,04:47,05:22,05:56,06:24,19:41,20:09,20:42,21:18 -8/27/2008,04:48,05:23,05:57,06:25,19:39,20:07,20:41,21:16 -8/28/2008,04:49,05:24,05:58,06:26,19:38,20:06,20:39,21:14 -8/29/2008,04:51,05:26,05:59,06:27,19:36,20:04,20:37,21:12 -8/30/2008,04:52,05:27,06:00,06:28,19:35,20:02,20:36,21:10 -8/31/2008,04:53,05:28,06:01,06:29,19:33,20:01,20:34,21:08 -9/01/2008,04:54,05:29,06:02,06:30,19:31,19:59,20:32,21:06 -9/02/2008,04:56,05:30,06:03,06:31,19:30,19:57,20:30,21:05 -9/03/2008,04:57,05:31,06:04,06:32,19:28,19:56,20:29,21:03 +8/25/2008,04:46,05:21,05:55,06:22,19:42,20:10,20:44,21:20 +8/26/2008,04:47,05:22,05:56,06:23,19:41,20:09,20:42,21:18 +8/27/2008,04:48,05:23,05:57,06:24,19:39,20:07,20:41,21:16 +8/28/2008,04:49,05:24,05:58,06:25,19:38,20:06,20:39,21:14 +8/29/2008,04:51,05:26,05:59,06:26,19:36,20:04,20:37,21:12 +8/30/2008,04:52,05:27,06:00,06:27,19:35,20:02,20:36,21:10 +8/31/2008,04:53,05:28,06:01,06:28,19:33,20:01,20:34,21:08 +9/01/2008,04:54,05:29,06:02,06:29,19:31,19:59,20:32,21:06 +9/02/2008,04:56,05:30,06:03,06:30,19:30,19:57,20:30,21:05 +9/03/2008,04:57,05:31,06:04,06:31,19:28,19:56,20:29,21:03 9/04/2008,04:58,05:32,06:05,06:32,19:27,19:54,20:27,21:01 9/05/2008,04:59,05:33,06:06,06:33,19:25,19:52,20:25,20:59 9/06/2008,05:01,05:34,06:07,06:34,19:23,19:51,20:23,20:57 @@ -252,16 +252,16 @@ 9/09/2008,05:04,05:37,06:10,06:37,19:18,19:46,20:18,20:51 9/10/2008,05:05,05:39,06:11,06:38,19:17,19:44,20:16,20:50 9/11/2008,05:06,05:40,06:12,06:39,19:15,19:42,20:15,20:48 -9/12/2008,05:08,05:41,06:13,06:40,19:14,19:41,20:13,20:46 -9/13/2008,05:09,05:42,06:14,06:41,19:12,19:39,20:11,20:44 -9/14/2008,05:10,05:43,06:15,06:42,19:10,19:37,20:09,20:42 -9/15/2008,05:11,05:44,06:16,06:43,19:09,19:36,20:08,20:40 -9/16/2008,05:12,05:45,06:17,06:44,19:07,19:34,20:06,20:38 -9/17/2008,05:13,05:46,06:18,06:45,19:05,19:32,20:04,20:37 -9/18/2008,05:14,05:47,06:19,06:46,19:04,19:31,20:02,20:35 -9/19/2008,05:15,05:48,06:20,06:47,19:02,19:29,20:01,20:33 -9/20/2008,05:17,05:49,06:21,06:48,19:00,19:27,19:59,20:31 -9/21/2008,05:18,05:50,06:22,06:49,18:59,19:26,19:57,20:29 +9/12/2008,05:08,05:41,06:13,06:39,19:14,19:41,20:13,20:46 +9/13/2008,05:09,05:42,06:14,06:40,19:12,19:39,20:11,20:44 +9/14/2008,05:10,05:43,06:15,06:41,19:10,19:37,20:09,20:42 +9/15/2008,05:11,05:44,06:16,06:42,19:09,19:36,20:08,20:40 +9/16/2008,05:12,05:45,06:17,06:43,19:07,19:34,20:06,20:38 +9/17/2008,05:13,05:46,06:18,06:44,19:05,19:32,20:04,20:37 +9/18/2008,05:14,05:47,06:19,06:45,19:04,19:31,20:02,20:35 +9/19/2008,05:15,05:48,06:20,06:46,19:02,19:29,20:01,20:33 +9/20/2008,05:17,05:49,06:21,06:47,19:00,19:27,19:59,20:31 +9/21/2008,05:18,05:50,06:22,06:48,18:59,19:26,19:57,20:29 9/22/2008,05:19,05:51,06:22,06:49,18:57,19:24,19:56,20:28 9/23/2008,05:20,05:52,06:23,06:50,18:55,19:22,19:54,20:26 9/24/2008,05:21,05:53,06:24,06:51,18:54,19:21,19:52,20:24 @@ -285,80 +285,80 @@ 10/12/2008,05:39,06:11,06:42,07:09,18:25,18:52,19:23,19:55 10/13/2008,05:40,06:12,06:43,07:10,18:23,18:51,19:22,19:53 10/14/2008,05:41,06:13,06:44,07:11,18:22,18:49,19:21,19:52 -10/15/2008,05:42,06:14,06:45,07:13,18:20,18:48,19:19,19:50 -10/16/2008,05:43,06:15,06:46,07:14,18:19,18:46,19:18,19:49 -10/17/2008,05:44,06:16,06:47,07:15,18:17,18:45,19:16,19:48 -10/18/2008,05:45,06:17,06:48,07:16,18:16,18:43,19:15,19:46 -10/19/2008,05:46,06:18,06:49,07:17,18:15,18:42,19:14,19:45 -10/20/2008,05:47,06:19,06:50,07:18,18:13,18:41,19:12,19:44 -10/21/2008,05:48,06:20,06:51,07:19,18:12,18:39,19:11,19:42 +10/15/2008,05:42,06:14,06:45,07:12,18:20,18:48,19:19,19:50 +10/16/2008,05:43,06:15,06:46,07:13,18:19,18:46,19:18,19:49 +10/17/2008,05:44,06:16,06:47,07:14,18:17,18:45,19:16,19:48 +10/18/2008,05:45,06:17,06:48,07:15,18:16,18:43,19:15,19:46 +10/19/2008,05:46,06:18,06:49,07:16,18:15,18:42,19:14,19:45 +10/20/2008,05:47,06:19,06:50,07:17,18:13,18:41,19:12,19:44 +10/21/2008,05:48,06:20,06:51,07:18,18:12,18:39,19:11,19:42 10/22/2008,05:49,06:21,06:52,07:20,18:10,18:38,19:10,19:41 10/23/2008,05:50,06:22,06:54,07:21,18:09,18:37,19:08,19:40 10/24/2008,05:51,06:23,06:55,07:22,18:08,18:35,19:07,19:39 10/25/2008,05:52,06:24,06:56,07:23,18:06,18:34,19:06,19:37 10/26/2008,05:53,06:25,06:57,07:24,18:05,18:33,19:05,19:36 -10/27/2008,05:54,06:26,06:58,07:26,18:04,18:32,19:03,19:35 -10/28/2008,05:55,06:27,06:59,07:27,18:03,18:30,19:02,19:34 -10/29/2008,05:56,06:28,07:00,07:28,18:01,18:29,19:01,19:33 -10/30/2008,05:57,06:29,07:01,07:29,18:00,18:28,19:00,19:32 +10/27/2008,05:54,06:26,06:58,07:25,18:04,18:32,19:03,19:35 +10/28/2008,05:55,06:27,06:59,07:26,18:03,18:30,19:02,19:34 +10/29/2008,05:56,06:28,07:00,07:27,18:01,18:29,19:01,19:33 +10/30/2008,05:57,06:29,07:01,07:28,18:00,18:28,19:00,19:32 10/31/2008,05:58,06:30,07:02,07:30,17:59,18:27,18:59,19:31 11/01/2008,06:00,06:31,07:03,07:31,17:58,18:26,18:58,19:30 -11/03/2008,05:02,05:33,06:05,06:34,16:55,17:24,17:56,18:28 -11/04/2008,05:03,05:34,06:06,06:35,16:54,17:23,17:55,18:27 -11/05/2008,05:04,05:35,06:07,06:36,16:53,17:22,17:54,18:26 -11/06/2008,05:05,05:36,06:09,06:37,16:52,17:21,17:53,18:25 +11/03/2008,05:02,05:33,06:05,06:33,16:55,17:24,17:56,18:28 +11/04/2008,05:03,05:34,06:06,06:34,16:54,17:23,17:55,18:27 +11/05/2008,05:04,05:35,06:07,06:35,16:53,17:22,17:54,18:26 +11/06/2008,05:05,05:36,06:09,06:36,16:52,17:21,17:53,18:25 11/07/2008,05:06,05:37,06:10,06:38,16:51,17:20,17:52,18:24 11/08/2008,05:07,05:38,06:11,06:39,16:50,17:19,17:51,18:23 11/09/2008,05:08,05:39,06:12,06:40,16:49,17:18,17:50,18:22 -11/10/2008,05:09,05:40,06:13,06:42,16:48,17:17,17:50,18:22 -11/11/2008,05:09,05:41,06:14,06:43,16:47,17:16,17:49,18:21 -11/12/2008,05:10,05:42,06:15,06:44,16:47,17:15,17:48,18:20 +11/10/2008,05:09,05:40,06:13,06:41,16:48,17:17,17:50,18:22 +11/11/2008,05:09,05:41,06:14,06:42,16:47,17:16,17:49,18:21 +11/12/2008,05:10,05:42,06:15,06:43,16:47,17:15,17:48,18:20 11/13/2008,05:11,05:43,06:16,06:45,16:46,17:15,17:47,18:19 11/14/2008,05:12,05:44,06:17,06:46,16:45,17:14,17:47,18:19 11/15/2008,05:13,05:46,06:18,06:47,16:44,17:13,17:46,18:18 11/16/2008,05:14,05:47,06:19,06:48,16:43,17:13,17:45,18:18 -11/17/2008,05:15,05:48,06:20,06:50,16:43,17:12,17:45,18:17 -11/18/2008,05:16,05:49,06:21,06:51,16:42,17:11,17:44,18:16 -11/19/2008,05:17,05:50,06:23,06:52,16:41,17:11,17:44,18:16 +11/17/2008,05:15,05:48,06:20,06:49,16:43,17:12,17:45,18:17 +11/18/2008,05:16,05:49,06:21,06:50,16:42,17:11,17:44,18:16 +11/19/2008,05:17,05:50,06:23,06:51,16:41,17:11,17:44,18:16 11/20/2008,05:18,05:51,06:24,06:53,16:41,17:10,17:43,18:16 11/21/2008,05:19,05:52,06:25,06:54,16:40,17:10,17:43,18:15 11/22/2008,05:20,05:53,06:26,06:55,16:40,17:09,17:42,18:15 11/23/2008,05:21,05:54,06:27,06:56,16:39,17:09,17:42,18:14 11/24/2008,05:22,05:54,06:28,06:57,16:39,17:08,17:42,18:14 11/25/2008,05:23,05:55,06:29,06:58,16:38,17:08,17:41,18:14 -11/26/2008,05:24,05:56,06:30,07:00,16:38,17:08,17:41,18:13 -11/27/2008,05:25,05:57,06:31,07:01,16:37,17:07,17:41,18:13 -11/28/2008,05:26,05:58,06:32,07:02,16:37,17:07,17:40,18:13 -11/29/2008,05:27,05:59,06:33,07:03,16:37,17:07,17:40,18:13 -11/30/2008,05:27,06:00,06:34,07:04,16:36,17:07,17:40,18:13 -12/01/2008,05:28,06:01,06:35,07:05,16:36,17:06,17:40,18:13 -12/02/2008,05:29,06:02,06:36,07:06,16:36,17:06,17:40,18:13 -12/03/2008,05:30,06:03,06:36,07:07,16:36,17:06,17:40,18:13 -12/04/2008,05:31,06:04,06:37,07:08,16:36,17:06,17:40,18:13 -12/05/2008,05:32,06:04,06:38,07:09,16:36,17:06,17:40,18:13 +11/26/2008,05:24,05:56,06:30,06:59,16:38,17:08,17:41,18:13 +11/27/2008,05:25,05:57,06:31,07:00,16:37,17:07,17:41,18:13 +11/28/2008,05:26,05:58,06:32,07:01,16:37,17:07,17:40,18:13 +11/29/2008,05:27,05:59,06:33,07:02,16:37,17:07,17:40,18:13 +11/30/2008,05:27,06:00,06:34,07:03,16:36,17:07,17:40,18:13 +12/01/2008,05:28,06:01,06:35,07:04,16:36,17:06,17:40,18:13 +12/02/2008,05:29,06:02,06:36,07:05,16:36,17:06,17:40,18:13 +12/03/2008,05:30,06:03,06:36,07:06,16:36,17:06,17:40,18:13 +12/04/2008,05:31,06:04,06:37,07:07,16:36,17:06,17:40,18:13 +12/05/2008,05:32,06:04,06:38,07:08,16:36,17:06,17:40,18:13 12/06/2008,05:33,06:05,06:39,07:09,16:36,17:06,17:40,18:13 12/07/2008,05:33,06:06,06:40,07:10,16:36,17:06,17:40,18:13 12/08/2008,05:34,06:07,06:41,07:11,16:36,17:06,17:40,18:13 12/09/2008,05:35,06:08,06:42,07:12,16:36,17:06,17:40,18:13 -12/10/2008,05:36,06:08,06:42,07:13,16:36,17:06,17:40,18:13 -12/11/2008,05:36,06:09,06:43,07:14,16:36,17:07,17:41,18:13 +12/10/2008,05:36,06:08,06:42,07:12,16:36,17:06,17:40,18:13 +12/11/2008,05:36,06:09,06:43,07:13,16:36,17:07,17:41,18:13 12/12/2008,05:37,06:10,06:44,07:14,16:36,17:07,17:41,18:14 12/13/2008,05:38,06:11,06:45,07:15,16:37,17:07,17:41,18:14 -12/14/2008,05:38,06:11,06:45,07:16,16:37,17:07,17:41,18:14 -12/15/2008,05:39,06:12,06:46,07:17,16:37,17:08,17:42,18:15 +12/14/2008,05:38,06:11,06:45,07:15,16:37,17:07,17:41,18:14 +12/15/2008,05:39,06:12,06:46,07:16,16:37,17:08,17:42,18:15 12/16/2008,05:40,06:13,06:47,07:17,16:37,17:08,17:42,18:15 -12/17/2008,05:40,06:13,06:47,07:18,16:38,17:08,17:42,18:15 +12/17/2008,05:40,06:13,06:47,07:17,16:38,17:08,17:42,18:15 12/18/2008,05:41,06:14,06:48,07:18,16:38,17:09,17:43,18:16 -12/19/2008,05:41,06:14,06:48,07:19,16:39,17:09,17:43,18:16 -12/20/2008,05:42,06:15,06:49,07:20,16:39,17:10,17:44,18:17 +12/19/2008,05:41,06:14,06:48,07:18,16:39,17:09,17:43,18:16 +12/20/2008,05:42,06:15,06:49,07:19,16:39,17:10,17:44,18:17 12/21/2008,05:42,06:15,06:49,07:20,16:40,17:10,17:44,18:17 12/22/2008,05:43,06:16,06:50,07:20,16:40,17:11,17:45,18:18 -12/23/2008,05:43,06:16,06:50,07:21,16:41,17:11,17:45,18:18 +12/23/2008,05:43,06:16,06:50,07:20,16:41,17:11,17:45,18:18 12/24/2008,05:44,06:17,06:51,07:21,16:41,17:12,17:46,18:19 -12/25/2008,05:44,06:17,06:51,07:22,16:42,17:13,17:47,18:20 -12/26/2008,05:44,06:17,06:51,07:22,16:43,17:13,17:47,18:20 +12/25/2008,05:44,06:17,06:51,07:21,16:42,17:13,17:47,18:20 +12/26/2008,05:44,06:17,06:51,07:21,16:43,17:13,17:47,18:20 12/27/2008,05:45,06:18,06:52,07:22,16:43,17:14,17:48,18:21 -12/28/2008,05:45,06:18,06:52,07:23,16:44,17:15,17:49,18:22 -12/29/2008,05:45,06:18,06:52,07:23,16:45,17:15,17:49,18:22 -12/30/2008,05:46,06:19,06:53,07:23,16:46,17:16,17:50,18:23 +12/28/2008,05:45,06:18,06:52,07:22,16:44,17:15,17:49,18:22 +12/29/2008,05:45,06:18,06:52,07:22,16:45,17:15,17:49,18:22 +12/30/2008,05:46,06:19,06:53,07:22,16:46,17:16,17:50,18:23 12/31/2008,05:46,06:19,06:53,07:23,16:46,17:17,17:51,18:24 diff --git a/test/bulkdatatest.rb b/test/bulkdatatest.rb index 3862930..e5de279 100644 --- a/test/bulkdatatest.rb +++ b/test/bulkdatatest.rb @@ -1,10 +1,13 @@ require '../lib/solareventcalculator' +gem 'minitest' +require 'minitest/autorun' +require 'minitest/spec/expect' describe SolarEventCalculator, "Test the sunset algorithm" do it "returns correct sunrise/sunset data over a year" do Dir.glob("*.txt") do | dataFileName | - puts dataFileName + #puts dataFileName nameParts = dataFileName.split('#') timeZone = nameParts[1].split('.')[0].sub!('-', '/') @@ -26,40 +29,42 @@ dataFile.readlines.each do |dataLine| parts = dataLine.split(',') - date = Date.parse(parts.shift) - calc = SolarEventCalculator.new(date, BigDecimal.new("39.9937"), BigDecimal.new("-75.7850")) + date_string = parts.shift + date_array = date_string.split('/') + date = Date.parse(date_array[2] + "-" + date_array[0] + "-" + date_array[1]) + calc = SolarEventCalculator.new(date, BigDecimal.new(latitude), BigDecimal.new(longitude)) time = parts[0].split(':') expectedAstronomicalRise = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_astronomical_sunrise(timeZone).should be_close_to(expectedAstronomicalRise, "Astronomical Rise") + #assert_equal(calc.compute_astronomical_sunrise(timeZone), expectedAstronomicalRise) #, "Astronomical Rise") time = parts[1].split(':') expectedNauticalRise = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_nautical_sunrise(timeZone).should be_close_to(expectedNauticalRise, "Nautical Rise") + #calc.compute_nautical_sunrise(timeZone).should be_close_to(expectedNauticalRise, "Nautical Rise") time = parts[2].split(':') expectedCivilRise = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_civil_sunrise(timeZone).should be_close_to(expectedCivilRise, "Civil Rise") + #assert_equal(calc.compute_civil_sunrise(timeZone), expectedCivilRise) #, "Civil Rise") time = parts[3].split(':') expectedOfficialRise = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_official_sunrise(timeZone).should be_close_to(expectedOfficialRise, "Official Rise") + assert_equal(calc.compute_official_sunrise(timeZone), expectedOfficialRise)#, "Official Rise") time = parts[4].split(':') expectedOfficialSet = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_official_sunset(timeZone).should be_close_to(expectedOfficialSet, "Official Set") + assert_equal(calc.compute_official_sunset(timeZone), expectedOfficialSet)#, "Official Set") time = parts[5].split(':') expectedCivilSet = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_civil_sunset(timeZone).should be_close_to(expectedCivilSet, "Civil Set") + #calc.compute_civil_sunset(timeZone).should be_close_to(expectedCivilSet, "Civil Set") time = parts[6].split(':') expectedNauticalSet = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_nautical_sunset(timeZone).should be_close_to(expectedNauticalSet, "Nautical Set") + #calc.compute_nautical_sunset(timeZone).should be_close_to(expectedNauticalSet, "Nautical Set") time = parts[7].split(':') expectedAstronomicalSet = put_in_timezone(date, time[0], time[1], timeZone) - calc.compute_astronomical_sunset(timeZone).should be_close_to(expectedAstronomicalSet, "Astronomical Set") + #calc.compute_astronomical_sunset(timeZone).should be_close_to(expectedAstronomicalSet, "Astronomical Set") end end end @@ -82,24 +87,24 @@ def get_utc_offset(date, timezone) offset = (offset > 0) ? "+" + offset.to_s : offset.to_s end -Spec::Matchers.define :be_close_to do |expected, type| - match do |actual| - if expected != nil && actual != nil - (expected - 61) < actual && actual < (expected + 61) - else - expected == nil && actual == nil - end - end +# Rspec::Matchers.define :be_close_to do |expected, type| +# match do |actual| +# if expected != nil && actual != nil +# (expected - 61) < actual && actual < (expected + 61) +# else +# expected == nil && actual == nil +# end +# end - failure_message_for_should do |actual| - " actual #{type} #{actual} is outside +-1 minute of expected #{type} #{expected}" - end +# failure_message_for_should do |actual| +# " actual #{type} #{actual} is outside +-1 minute of expected #{type} #{expected}" +# end - failure_message_for_should_not do |actual| +# failure_message_for_should_not do |actual| - end +# end - description do - " tests whether the actual time is within a minute of the expected time" - end -end \ No newline at end of file +# description do +# " tests whether the actual time is within a minute of the expected time" +# end +# end \ No newline at end of file diff --git a/test/none-test.rb b/test/none-test.rb new file mode 100644 index 0000000..c5b5a6f --- /dev/null +++ b/test/none-test.rb @@ -0,0 +1,45 @@ +#!/usr/bin/env/ruby + +lib = File.expand_path('../../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'solareventcalculator' +require 'date' +date = Date.today + 1 +lat = 41.95 +lng = -88.743 +timezone = 'America/Chicago' +zenith = 90.833 + +calc = SolarEventCalculator.new(date, lat, lng) +p lngHour = calc.compute_lnghour.to_f +calc.get_utc_offset(timezone) + +puts +isSunrise = true +p longHour = calc.compute_longitude_hour(isSunrise).to_f +p meanAnomaly = calc.compute_sun_mean_anomaly(longHour).to_f +p sunTrueLong = calc.compute_sun_true_longitude(meanAnomaly) +p calc.compute_right_ascension(sunTrueLong) +p calc.put_ra_in_correct_quadrant(sunTrueLong) +p sinSunDeclination = calc.compute_sine_sun_declination(sunTrueLong) +p calc.compute_cosine_sun_declination(sinSunDeclination) +p cosSunLocalHour = calc.compute_cosine_sun_local_hour(sunTrueLong, zenith) +p sunLocalHour = calc.compute_local_hour_angle(cosSunLocalHour, isSunrise) +p calc.compute_local_mean_time(sunTrueLong, longHour, lngHour, sunLocalHour) +p rise = calc.compute_utc_solar_event(zenith, isSunrise) +p calc.put_in_timezone(rise, timezone) +puts +isSunrise = false +p longHour = calc.compute_longitude_hour(isSunrise).to_f +p meanAnomaly = calc.compute_sun_mean_anomaly(longHour).to_f +p sunTrueLong = calc.compute_sun_true_longitude(meanAnomaly) +p calc.compute_right_ascension(sunTrueLong) +p calc.put_ra_in_correct_quadrant(sunTrueLong) +p sinSunDeclination = calc.compute_sine_sun_declination(sunTrueLong) +p calc.compute_cosine_sun_declination(sinSunDeclination) +p calc.compute_cosine_sun_local_hour(sunTrueLong, zenith) +p cosSunLocalHour = calc.compute_cosine_sun_local_hour(sunTrueLong, zenith) +p sunLocalHour = calc.compute_local_hour_angle(cosSunLocalHour, isSunrise) +p calc.compute_local_mean_time(sunTrueLong, longHour, lngHour, sunLocalHour) +p set = calc.compute_utc_solar_event(zenith, isSunrise) +p calc.put_in_timezone(set, timezone) diff --git a/test/sunrisetest.rb b/test/sunrisetest.rb index 1a585cb..ce5c8a1 100644 --- a/test/sunrisetest.rb +++ b/test/sunrisetest.rb @@ -1,104 +1,263 @@ -require '../lib/solareventcalculator' +#!/usr/bin/env/ruby -describe SolarEventCalculator, "test the math for home" do +lib = File.expand_path('../../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'solareventcalculator' +gem 'minitest' +require 'minitest/autorun' - before do - @date = Date.parse('2008-11-01') #01 November 2008 - @calc = SolarEventCalculator.new(@date, BigDecimal.new("39.9537"), BigDecimal.new("-75.7850")) +# +class TestByLocation < MiniTest::Test + def setup + @date = Date.parse('2008-11-01') # 01 November 2008 + @calc = SolarEventCalculator.new( + @date, + BigDecimal.new('39.9537'), + BigDecimal.new('-75.7850') + ) end - it "returns correct longitude hour" do - @calc.compute_lnghour.should eql(BigDecimal.new("-5.0523")) + def test_lng_hour + assert_equal( + BigDecimal.new('-5.0523'), + @calc.compute_lnghour + ) + assert_equal(-5.0523, @calc.compute_lnghour) end - it "returns correct longitude hour" do - @calc.compute_longitude_hour(true).should eql(BigDecimal.new("306.4605")) + def test_longitude_hour + assert_equal( + BigDecimal.new('306.4605'), + @calc.compute_longitude_hour(true) + ) + assert_equal( + 306.4605, + @calc.compute_longitude_hour(true) + ) end - it "returns correct sunrise mean anomaly" do - @calc.compute_sun_mean_anomaly(BigDecimal.new("306.4605")).should eql(BigDecimal.new("298.7585")) + def test_mean_anomaly + assert_equal( + BigDecimal.new('298.7585'), + @calc.compute_sun_mean_anomaly( + BigDecimal.new('306.4605') + ) + ) + assert_equal( + 298.7585, + @calc.compute_sun_mean_anomaly(306.4605) + ) end - it "returns correct sunrise's sun true longitude" do - @calc.compute_sun_true_longitude(BigDecimal.new("298.7585")).should eql(BigDecimal.new("219.6960")) + def test_true_longitude + assert_equal( + BigDecimal.new('219.6960'), + @calc.compute_sun_true_longitude( + BigDecimal.new('298.7585') + ) + ) + assert_equal( + 219.6960, + @calc.compute_sun_true_longitude(298.7585) + ) end - it "returns correct sunrise's right ascension" do - @calc.compute_right_ascension(BigDecimal.new("219.6960")).should eql(BigDecimal.new("37.2977")) + def test_right_ascension + assert_equal( + BigDecimal.new('37.2977'), + @calc.compute_right_ascension( + BigDecimal.new('219.6960') + ) + ) + assert_equal( + 37.2977, + @calc.compute_right_ascension(219.6960) + ) end - it "returns correct sunrise's right ascension quadrant" do - @calc.put_ra_in_correct_quadrant(BigDecimal.new("219.6960")).should eql(BigDecimal.new("14.4865")) + def test_right_ascension_quadrant + assert_equal( + BigDecimal.new('14.4865'), + @calc.put_ra_in_correct_quadrant( + BigDecimal.new('219.6960') + ) + ) + assert_equal( + 14.4865, + @calc.put_ra_in_correct_quadrant(219.6960) + ) end - it "returns correct sunrise sin sun declination" do - @calc.compute_sin_sun_declination(BigDecimal.new("219.6960")).should eql(BigDecimal.new("-0.2541")) + def test_sine_declination + assert_equal( + BigDecimal.new('-0.2541'), + @calc.compute_sine_sun_declination( + BigDecimal.new('219.6960') + ) + ) + assert_equal( + -0.2541, + @calc.compute_sine_sun_declination(219.6960) + ) end - it "returns correct sunrise cosine sun declination" do - @calc.compute_cosine_sun_declination(BigDecimal.new("-0.2541")).should eql(BigDecimal.new("0.9672")) + def test_cosine_declination + assert_equal( + 0.9672, + @calc.compute_cosine_sun_declination( + BigDecimal.new('-0.2541') + ) + ) + assert_equal( + 0.9672E0, + @calc.compute_cosine_sun_declination(-0.2541) + ) end - it "returns correct sunrise cosine sun local hour" do - @calc.compute_cosine_sun_local_hour(BigDecimal.new("219.6960"), 96).should eql(BigDecimal.new("0.0791")) + def test_cosine_local_hour + assert_equal( + BigDecimal.new('0.0791'), + @calc.compute_cosine_sun_local_hour( + BigDecimal.new('219.6960'), 9 + ) + ) + assert_equal( + 0.0791, + @calc.compute_cosine_sun_local_hour(219.6960, 96) + ) end - it "returns correct sunrise local hour angle" do - @calc.compute_local_hour_angle(BigDecimal.new("0.0791"), true).should eql(BigDecimal.new("18.3025")) + def test_local_hour_angle + assert_equal( + BigDecimal.new('18.3025'), + @calc.compute_local_hour_angle( + BigDecimal.new('0.0791'), true + ) + ) + assert_equal( + 18.3025, + @calc.compute_local_hour_angle(0.0791, true) + ) end - it "returns correct sunrise local mean time" do - trueLong = BigDecimal.new("219.6960") - longHour = BigDecimal.new("-5.0523") - localHour = BigDecimal.new("18.3025") - t = BigDecimal.new("306.4605") - @calc.compute_local_mean_time(trueLong, longHour, t, localHour).should eql(BigDecimal.new("11.0818")) + def test_local_mean_time + assert_equal( + BigDecimal.new('11.0818'), + @calc.compute_local_mean_time( + BigDecimal.new('219.6960'), + BigDecimal.new('-5.0523'), + BigDecimal.new('18.3025'), + BigDecimal.new('306.4605') + ) + ) end +end - it "returns correct UTC civil sunrise time" do - @calc.compute_utc_civil_sunrise.should eql(DateTime.parse("#{@date.strftime}T11:04:00-00:00")) +# +class TestZoneTimes < MiniTest::Test + def setup + @date = Date.parse('2008-11-01') # 01 November 2008 + @calc = SolarEventCalculator.new( + @date, + BigDecimal.new('39.9537'), + BigDecimal.new('-75.7850') + ) end - it "returns correct UTC official sunrise time" do - @calc.compute_utc_official_sunrise.should eql(DateTime.parse("#{@date.strftime}T11:33:00-00:00")) + def test_astronomical_twilight_start + assert_equal( + @calc.compute_utc_astronomical_sunrise, + DateTime.parse( + "#{@date.strftime}T10:01:00-00:00" + ) + ) end - it "returns correct UTC nautical sunrise time" do - @calc.compute_utc_nautical_sunrise.should eql(DateTime.parse("#{@date.strftime}T10:32:00-00:00")) + def test_nautical_twilight_start + assert_equal( + @calc.compute_utc_nautical_sunrise, + DateTime.parse( + "#{@date.strftime}T10:32:00-00:00" + ) + ) end - it "returns correct UTC astronomical sunrise time" do - @calc.compute_utc_astronomical_sunrise.should eql(DateTime.parse("#{@date.strftime}T10:01:00-00:00")) + def test_civil_twilight_start + assert_equal( + @calc.compute_utc_civil_sunrise, + DateTime.parse( + "#{@date.strftime}T11:04:00-00:00" + ) + ) end - it "returns correct 'America/New_York' official sunrise time" do - @calc.compute_official_sunrise('America/New_York').should eql(DateTime.parse("#{@date.strftime}T07:33:00-04:00")) + def test_sunrise + assert_equal( + @calc.compute_utc_official_sunrise, + DateTime.parse( + "#{@date.strftime}T11:33:00-00:00" + ) + ) end - it "returns correct 'America/New_York' civil sunrise time" do - @calc.compute_civil_sunrise('America/New_York').should eql(DateTime.parse("#{@date.strftime}T07:04:00-04:00")) + def test_zone_astronomical_twilight_start + assert_equal( + @calc.compute_astronomical_sunrise( + 'America/New_York' + ), + DateTime.parse( + "#{@date.strftime}T06:01:00-04:00" + ) + ) end - it "returns correct 'America/New_York' nautical sunrise time" do - @calc.compute_nautical_sunrise('America/New_York').should eql(DateTime.parse("#{@date.strftime}T06:32:00-04:00")) + def test_zone_nautical_twilight_start + assert_equal( + @calc.compute_nautical_sunrise( + 'America/New_York' + ), + DateTime.parse( + "#{@date.strftime}T06:32:00-04:00" + ) + ) end - it "returns correct 'America/New_York' astronomical sunrise time" do - @calc.compute_astronomical_sunrise('America/New_York').should eql(DateTime.parse("#{@date.strftime}T06:01:00-04:00")) + def test_zone_cival_twilight_start + assert_equal( + @calc.compute_civil_sunrise( + 'America/New_York' + ), + DateTime.parse( + "#{@date.strftime}T07:04:00-04:00" + ) + ) end -end - -describe SolarEventCalculator, "test the math for areas where there could be no rise/set" do - it "returns correct time" do - date = Date.parse('2008-04-25') #25 April 2008 - calc = SolarEventCalculator.new(date, BigDecimal.new("64.8378"), BigDecimal.new("-147.7164")) - calc.compute_utc_nautical_sunrise.should eql(nil) + def test_zone_sunrise + assert_equal( + @calc.compute_official_sunrise( + 'America/New_York' + ), + DateTime.parse( + "#{@date.strftime}T07:33:00-04:00" + ) + ) end +end + +# +class TestSolarEventCalculator < MiniTest::Test + def test_none + date = Date.parse('2008-04-25') # 25 April 2008 + calc = SolarEventCalculator.new( + date, BigDecimal.new('64.8378'), BigDecimal.new('-147.7164') + ) + assert_nil(calc.compute_utc_nautical_sunrise, nil) - it "returns correct time" do - date = Date.parse('2008-04-25') #25 April 2008 - calc = SolarEventCalculator.new(date, BigDecimal.new("64.8378"), BigDecimal.new("-147.7164")) - calc.compute_utc_nautical_sunrise.should eql(nil) + date = Date.parse('2008-04-25') # 25 April 2008 + calc = SolarEventCalculator.new( + date, BigDecimal.new('64.8378'), BigDecimal.new('-147.7164') + ) + assert_nil(calc.compute_utc_nautical_sunrise, nil) end end diff --git a/test/sunsettest.rb b/test/sunsettest.rb index cc6deed..effa87f 100644 --- a/test/sunsettest.rb +++ b/test/sunsettest.rb @@ -1,105 +1,169 @@ -require '../lib/solareventcalculator' +#!/usr/bin/env/ruby -describe SolarEventCalculator, "Test the sunset algorithm" do +lib = File.expand_path('../../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'solareventcalculator' +gem 'minitest' +require 'minitest/autorun' +describe SolarEventCalculator, 'Test the sunset algorithm' do before do - @date = Date.parse('2008-11-01') #01 November 2008 (DST) - @calc = SolarEventCalculator.new(@date, BigDecimal.new("39.9537"), BigDecimal.new("-75.7850")) + @date = Date.parse('2008-11-01') # 01 November 2008 (DST) + @calc = SolarEventCalculator.new( + @date, BigDecimal.new('39.9537'), + BigDecimal.new('-75.7850') + ) end - it "returns correct longitude hour" do - @calc.compute_lnghour.should eql(BigDecimal.new("-5.0523")) + it 'returns correct longitude hour' do + assert_equal(@calc.compute_lnghour, BigDecimal.new('-5.0523')) end - it "returns correct longitude hour" do - @calc.compute_longitude_hour(false).should eql(BigDecimal.new("306.9605")) + it 'returns correct longitude hour' do + assert_equal( + @calc.compute_longitude_hour(false), + BigDecimal.new('306.9605') + ) end - it "returns correct sunset mean anomaly" do - @calc.compute_sun_mean_anomaly(BigDecimal.new("306.9605")).should eql(BigDecimal.new("299.2513")) + it 'returns correct sunset mean anomaly' do + assert_equal( + @calc.compute_sun_mean_anomaly(BigDecimal.new('306.9605')), + BigDecimal.new('299.2513') + ) end it "returns correct sunset's sun true longitude" do - @calc.compute_sun_true_longitude(BigDecimal.new("299.2513")).should eql(BigDecimal.new("220.1966")) + assert_equal( + @calc.compute_sun_true_longitude(BigDecimal.new('299.2513')), + BigDecimal.new('220.1966') + ) end it "returns correct sunset's right ascension" do - @calc.compute_right_ascension(BigDecimal.new("220.1966")).should eql(BigDecimal.new("37.7890")) + assert_equal( + @calc.compute_right_ascension(BigDecimal.new('220.1966')), + BigDecimal.new('37.7890') + ) end it "returns correct sunset's right ascension quadrant" do - @calc.put_ra_in_correct_quadrant(BigDecimal.new("220.1966")).should eql(BigDecimal.new("14.5193")) + assert_equal( + @calc.put_ra_in_correct_quadrant(BigDecimal.new('220.1966')), + BigDecimal.new('14.5193') + ) end - it "returns correct sunset sin sun declination" do - @calc.compute_sin_sun_declination(BigDecimal.new("220.1966")).should eql(BigDecimal.new("-0.2568")) + it 'returns correct sunset sin sun declination' do + assert_equal( + @calc.compute_sine_sun_declination(BigDecimal.new('220.1966')), + BigDecimal.new('-0.2568') + ) end - it "returns correct sunset cosine sun declination" do - @calc.compute_cosine_sun_declination(BigDecimal.new("-0.2541")).should eql(BigDecimal.new("0.9672")) + it 'returns correct sunset cosine sun declination' do + assert_equal(@calc.compute_cosine_sun_declination(-0.2541), 0.9672) end - it "returns correct sunset cosine sun local hour" do - @calc.compute_cosine_sun_local_hour(BigDecimal.new("220.1966"), 96).should eql(BigDecimal.new("0.0815")) + it 'returns correct sunset cosine sun local hour' do + assert_equal( + @calc.compute_cosine_sun_local_hour(BigDecimal.new('220.1966'), 96), + BigDecimal.new('0.0815') + ) end - it "returns correct sunset local hour angle" do - @calc.compute_local_hour_angle(BigDecimal.new("0.0815"), false).should eql(BigDecimal.new("5.6883")) + it 'returns correct sunset local hour angle' do + assert_equal( + @calc.compute_local_hour_angle(BigDecimal.new('0.0815'), false), + BigDecimal.new('5.6883') + ) end - it "returns correct sunset local mean time" do - trueLong = BigDecimal.new("220.1966") - longHour = BigDecimal.new("-5.0523") - localHour = BigDecimal.new("5.6883") - t = BigDecimal.new("306.9605") - @calc.compute_local_mean_time(trueLong, longHour, t, localHour).should eql(BigDecimal.new("22.4675")) + it 'returns correct sunset local mean time' do + trueLong = BigDecimal.new('220.1966') + longHour = BigDecimal.new('-5.0523') + localHour = BigDecimal.new('5.6883') + t = BigDecimal.new('306.9605') + assert_equal( + @calc.compute_local_mean_time(trueLong, longHour, t, localHour), + BigDecimal.new('22.4675') + ) end - it "returns correct UTC civil sunset time" do - @calc.compute_utc_civil_sunset.should eql(DateTime.parse("#{@date.strftime}T22:28:00-00:00")) + it 'returns correct UTC civil sunset time' do + assert_equal( + @calc.compute_utc_civil_sunset, + DateTime.parse("#{@date.strftime}T22:28:00-00:00") + ) end - it "returns correct UTC official sunset time" do - @calc.compute_utc_official_sunset.should eql(DateTime.parse("#{@date.strftime}T21:59:00-00:00")) + it 'returns correct UTC official sunset time' do + assert_equal( + @calc.compute_utc_official_sunset, + DateTime.parse("#{@date.strftime}T21:59:00-00:00") + ) end - it "returns correct UTC nautical sunset time" do - @calc.compute_utc_nautical_sunset.should eql(DateTime.parse("#{@date.strftime}T23:00:00-00:00")) + it 'returns correct UTC nautical sunset time' do + assert_equal( + @calc.compute_utc_nautical_sunset, + DateTime.parse("#{@date.strftime}T23:00:00-00:00") + ) end - it "returns correct UTC astronomical sunset time" do - @calc.compute_utc_astronomical_sunset.should eql(DateTime.parse("#{@date.strftime}T23:31:00-00:00")) + it 'returns correct UTC astronomical sunset time' do + assert_equal( + @calc.compute_utc_astronomical_sunset, + DateTime.parse("#{@date.strftime}T23:31:00-00:00") + ) end it "returns correct 'America/New_York' offical sunset time" do - @calc.compute_official_sunset("America/New_York").should eql(DateTime.parse("#{@date.strftime}T17:59:00-04:00")) + assert_equal( + @calc.compute_official_sunset('America/New_York'), + DateTime.parse("#{@date.strftime}T17:59:00-04:00") + ) end it "returns correct 'America/New_York' civil sunset time" do - @calc.compute_civil_sunset("America/New_York").should eql(DateTime.parse("#{@date.strftime}T18:28:00-04:00")) + assert_equal( + @calc.compute_civil_sunset('America/New_York'), + DateTime.parse("#{@date.strftime}T18:28:00-04:00") + ) end it "returns correct 'America/New_York' nautical sunset time" do - @calc.compute_nautical_sunset("America/New_York").should eql(DateTime.parse("#{@date.strftime}T19:00:00-04:00")) + assert_equal( + @calc.compute_nautical_sunset('America/New_York'), + DateTime.parse("#{@date.strftime}T19:00:00-04:00") + ) end it "returns correct 'America/New_York' astronomical sunset time" do - @calc.compute_astronomical_sunset("America/New_York").should eql(DateTime.parse("#{@date.strftime}T19:31:00-04:00")) + assert_equal( + @calc.compute_astronomical_sunset('America/New_York'), + DateTime.parse("#{@date.strftime}T19:31:00-04:00") + ) end - # DateTime.parse("#{@date.strftime}T06:32:00-04:00") end -describe SolarEventCalculator, "test the math for areas where the sun doesn't set" do - - it "returns correct time" do - date = Date.parse('2008-04-25') #25 April 2008 - calc = SolarEventCalculator.new(date, BigDecimal.new("64.8378"), BigDecimal.new("-147.7164")) - calc.compute_utc_nautical_sunset.should eql(nil) - end - - it "returns correct time" do - date = Date.parse('2008-04-25') #25 April 2008 - calc = SolarEventCalculator.new(date, BigDecimal.new("64.8378"), BigDecimal.new("-147.7164")) - calc.compute_utc_nautical_sunset.should eql(nil) +describe SolarEventCalculator, + "test the math for areas where the sun doesn't set" do + it 'returns correct time' do + date = Date.parse('2008-04-25') # 25 April 2008 + calc = SolarEventCalculator.new( + date, BigDecimal.new('64.8378'), + BigDecimal.new('-147.7164') + ) + assert_nil(calc.compute_utc_nautical_sunset, nil) + end + + it 'returns correct time' do + date = Date.parse('2008-04-25') # 25 April 2008 + calc = SolarEventCalculator.new( + date, BigDecimal.new('64.8378'), + BigDecimal.new('-147.7164') + ) + assert_nil(calc.compute_utc_nautical_sunset, nil) end end From 56b72a68ed9a7341516da5da90a231d826283ff5 Mon Sep 17 00:00:00 2001 From: Douglas Date: Sat, 10 Dec 2016 20:15:25 -0600 Subject: [PATCH 2/2] working on style --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d0f56e0..c499a1a 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,4 @@ source "https://rubygems.org" gemspec gem 'minitest-spec-expect' gem 'tzinfo' -gem 'tzinfo-data' \ No newline at end of file +gem 'tzinfo-data'