solcal 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9a9149546523840d9f583cc54dd93730f27e554
-  data.tar.gz: 2b1259db753c028063767183077c320bb2611ae6
+  metadata.gz: 998c5512e1382263fc0c8c515f822fa4ef755dd1
+  data.tar.gz: 0f39caa6a8a38eb83cb12a80cb1bf1776c2a85bf
 SHA512:
-  metadata.gz: f12c2a9a6004f71f8e3335490aae846a229e694057062ed9197aa00dd1b9eb3a3955fa8b932f66c93a55a11826ea1427e05deead54d71ffa914011c65848244c
-  data.tar.gz: e582c6243c7a22c613da22342edac15ab885a2d2c118a910be0eedd8baefe276bd285f7a8016f633f2eb183cf886208a96de801ed01db455f52f5dcaadda6e55
+  metadata.gz: c3a2bec3619b102c6e063caf5c6031731cf6d36e5de1eab169ee90776a79be85d5ba379ea432127cb66d540fa54cc4fc1ca3f8cc09a64091b752cc4e71154f62
+  data.tar.gz: fa457d6e259578f642ff13239ae63015ba6bc0615cde5c53c536a8f6dfbf5ddb1104b9c1930df082d92ab2e417bce0ed7f28840b4216e3dfa60397f8acf94f9e

data/lib/solcal/commands.rb

@@ -27,6 +27,7 @@ module SolCal
 		autoload :HaAngleToZenithCommand,		'solcal/commands/ha_angle_to_zenith_command'
 		autoload :TimeToAngleFromZenithCommand,	'solcal/commands/time_to_angle_from_zenith_command'
 		autoload :OppositeTimeToAngleFromZenithCommand,	'solcal/commands/opposite_time_to_angle_from_zenith_command'
+		autoload :AngleToZenithAtTimeCommand, 'solcal/commands/angle_to_zenith_at_time_command'
 
 		extend NamingConvention
 

data/lib/solcal/commands/angle_to_zenith_at_time_command.rb

@@ -0,0 +1,15 @@
+module SolCal
+	module Commands
+		class AngleToZenithAtTimeCommand < BaseCommand
+			protected
+			def do_execute
+				ha_angle_at_time = Angle.from_deg((solar_noon - at_time)*1440/4)
+				d = Math.cos(ha_angle_at_time.to_rad)
+				b = Math.cos(latitude.to_rad)*Math.cos(declination.to_rad)
+				c = Math.tan(latitude.to_rad)*Math.tan(declination.to_rad)
+				a = (d+c)*b
+				Angle.from_rad(Math.acos(a))			
+			end
+		end
+	end
+end

data/lib/solcal/commands/julian_century_command.rb

@@ -4,11 +4,12 @@ module SolCal
 			def initialize(data)
 				super(data)
 				@year,@month,@day = data[:date].year, data[:date].month, data[:date].day
+				@hour,@min,@sec = 12,0,0
 			end
 
 			protected
-			def do_execute
-				(DateTime.new(@year,@month,@day,12,0,0,time_zone).jd.to_f - 2451545)/36525
+			def do_execute				
+				(DateTime.new(@year,@month,@day,@hour,@min,@sec,time_zone).jd.to_f - 2451545)/36525
 			end
 		end
 	end

data/lib/solcal/location.rb

@@ -26,6 +26,13 @@ module SolCal
 			results
 		end
 
+		def angle_to_zenith_at_time(year, month, day, hour, minute, time_zone)
+			results = create_data(year, month, day, time_zone)
+			results[:at_time] = (hour*60.0+minute)/(24*60.0)
+			Commands.run(:angle_to_zenith_at_time, results)
+			results
+		end
+
 		def date_pair(year, month, day, time_zone)
 			results = create_data(year,month,day, time_zone)
 			Commands.run(:duration, results)

data/lib/solcal/time_of_day.rb

@@ -1,10 +1,11 @@
 module SolCal
 	class TimeOfDay
-		attr_accessor :hour, :minute
+		attr_accessor :hour, :minute, :second
 
 		def initialize(num)
 			@hour = (num*24).to_i
 			@minute = (num*24-hour)*60
+			@second = 0
 		end
 
 		def to_s

data/lib/solcal/version.rb

@@ -1,3 +1,3 @@
 module Solcal
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/commands/angle_to_zenith_at_time_command_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "AngleToZenithAtTimeCommand" do
+	it "should calculate the angle to the zenith at 8:33am" do
+		result = {julian_century:0.149125142596397, latitude:SolCal::Angle.from_deg(53.5333),declination:SolCal::Angle.from_deg(-21.7958) ,solar_noon:0.515931}
+		result[:at_time] = (8*60+33)/(24*60.0)
+		SolCal::Commands::AngleToZenithAtTimeCommand.new(result).execute
+		expect(result[:angle_to_zenith_at_time].to_deg).to be_within(0.1).of(90.1)
+	end
+
+	it "should calculate the angle to the zenith at 7:10am on 2015-08-05" do
+		result = {julian_century: 0.15592060232717317, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
+		result[:at_time] = (7*60+10)/(24*60.0)
+		SolCal::Commands::AngleToZenithAtTimeCommand.new(result).execute
+		expect(result[:angle_to_zenith_at_time].to_deg.to_f).to be_within(0.1).of(72.0)
+	end
+
+	it "should calculate the angle to zenith at 12:28pm on 2015-12-21" do
+		result = {julian_century:0.15969883641341548, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
+		result[:at_time] = (12*60+28)/(24*60.0)
+		SolCal::Commands::AngleToZenithAtTimeCommand.new(result).execute
+		expect(result[:angle_to_zenith_at_time].to_deg).to be_within(0.1).of(77.0)
+	end
+
+end

data/spec/commands/time_to_angle_from_zenith_command_spec.rb

@@ -15,13 +15,6 @@ describe "TimeToAngleFromZenithCommand" do
 		expect(@result[:time_to_angle_from_zenith].to_s).to eql("07:10")
 	end
 
-	it "should calculate the time the sun will reach a 72deg angle from the zenith on 2015-08-05" do
-		@result = {julian_century:0.15592060, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
-		@result[:angle_from_zenith] = 72
-		SolCal::Commands::TimeToAngleFromZenithCommand.new(@result).execute
-		expect(@result[:time_to_angle_from_zenith].to_s).to eql("07:10")
-	end
-
 	it "should calculate the time the sun will reach max angle on 2015-12-21" do
 		@result = {julian_century:0.15969883641341548, latitude:SolCal::Angle.from_deg(53.5333),longitude:SolCal::Angle.from_deg(-113.5), time_zone: -7}
 		@result[:angle_from_zenith] = 76.97

data/spec/location_spec.rb

@@ -84,18 +84,33 @@ describe "Location" do
 		expect(results[:time_to_angle_from_zenith].to_s).to eql("09:13")
 	end
 
+	it "should calculate angle to zenith of 70deg at 9:13 on 2015-09-06 in Edmonton" do
+		results = @edmonton.angle_to_zenith_at_time(2015, 9, 6, 9, 13, -6)
+		expect(results[:angle_to_zenith_at_time].to_deg).to be_within(0.1).of(70)
+	end
+
 	it "should calculate time to 70deg from zenith on 2015-09-06 in Miami" do
 		results = @miami.time_to_angle_from_zenith(2015, 9, 6, -4, 70)
 		expect(results[:time_to_angle_from_zenith].to_s).to eql("08:35")
 		expect(results[:opposite_time_to_angle_from_zenith].to_s).to eql("18:02")
 	end
 
+	it "should calculate angle from zenith of 70deg at 8:35 on 2015-09-06 in Miami" do
+		results = @miami.angle_to_zenith_at_time(2015, 9, 6, 8, 35, -4)
+		expect(results[:angle_to_zenith_at_time].to_deg).to be_within(0.2).of(70)
+	end
+
 	it "should calculate time to 70deg from zenith on 2015-09-06 in Sydney" do
 		results = @sydney.time_to_angle_from_zenith(2015, 9, 6, +10, 70)
 		expect(results[:time_to_angle_from_zenith].to_s).to eql("07:51")
 		expect(results[:opposite_time_to_angle_from_zenith].to_s).to eql("15:56")
 	end
 
+	it "should calculate angle from zenith of 70deg at 7:51 on 2015-09-06 in Sydney" do
+		results = @sydney.angle_to_zenith_at_time(2015, 9, 6, 7, 51, +10)
+		expect(results[:angle_to_zenith_at_time].to_deg).to be_within(0.1).of(70)
+	end
+
 	it "should return that the sun will never reach 47deg from zenith on 2015-09-06 in Edmonton" do
 		results = @edmonton.time_to_angle_from_zenith(2015, 9, 6, -6, 47)
 		expect(results[:time_to_angle_from_zenith].to_s).to eql("The sun will not reach 47 degrees from zenith today.")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solcal
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Neil Bourgeois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - lib/solcal.rb
 - lib/solcal/angle.rb
 - lib/solcal/commands.rb
+- lib/solcal/commands/angle_to_zenith_at_time_command.rb
 - lib/solcal/commands/app_longitude_command.rb
 - lib/solcal/commands/base_command.rb
 - lib/solcal/commands/civil_dawn_command.rb
@@ -86,6 +87,7 @@ files:
 - lib/solcal/version.rb
 - solcal.gemspec
 - spec/angle_spec.rb
+- spec/commands/angle_to_zenith_at_time_command_spec.rb
 - spec/commands/app_longitude_command_spec.rb
 - spec/commands/base_command_spec.rb
 - spec/commands/civil_dawn_command_spec.rb
@@ -142,6 +144,7 @@ summary: 'Solar Calculator: find sunrise, sunset, solar Noon and solar position
   any place on earth.'
 test_files:
 - spec/angle_spec.rb
+- spec/commands/angle_to_zenith_at_time_command_spec.rb
 - spec/commands/app_longitude_command_spec.rb
 - spec/commands/base_command_spec.rb
 - spec/commands/civil_dawn_command_spec.rb