mk_apos 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5aec6b75740e22d2c7100f319dc71369609c23f6
-  data.tar.gz: 194418ed217b4b657be08dbfca45a3f5ba19167f
+SHA256:
+  metadata.gz: 837c66b936249ba907cbe6718b49c249c88db3407bfcf0a95598bbe5e86d9be1
+  data.tar.gz: 28237ce6ea17a306c287fa22ae55618d5cf30d7d07d4bd73c797febddbcbc0c7
 SHA512:
-  metadata.gz: 2214911afab0f5900c0d8cda039de3de463611bed6c87ab2c279e83b7eafd8d4c4da8822b72ca22ed774b0a98546ffd140f14a72abbc8f96509cb340f60da425
-  data.tar.gz: b9ed0e8a9e15908fe4d464447363fd0f80ce0cd6297a678ec8dfa7aba72d4a4be8beff379c4cea4eaa99949a32c33d34cf4a2d1f290c57c02193ce5cd1dfb7b7
+  metadata.gz: 62e2d6e5413d502778b9ba5ac9816f51b96f599b46964545508c2b9ade0c1ea12c0de15d65f080b235b66b3559f126d0daed8ddf66766b34bbb0c386f7802070
+  data.tar.gz: a8594715220b2a773b09d53b9dc5451e8d6c40211fa570a4c17da315de55667693d1e36d9eb88e8eee1bfa805a6470a69265963471f5ab5ff41d7e914f503ae2

data/lib/mk_apos/apos.rb

@@ -15,13 +15,19 @@ module MkApos
       Const::BODIES.each { |k, v| @icrs_2[k] = get_icrs(v, @jd_tdb) }
       # === 時刻 t2(= TDB) における地球と太陽・月の距離
       @r_e = get_r_e
+      # === 太陽／月／地球の半径取得
+      e = EphJpl.new(@bin_path, 11, 3, @jd_tdb)
+      @asun = e.bin[:cvals][e.bin[:cnams].index("ASUN")]
+      @am   = e.bin[:cvals][e.bin[:cnams].index("AM")]
+      @re   = e.bin[:cvals][e.bin[:cnams].index("RE")]
     end
 
     #=========================================================================
     # SUN
     #
     # @param:  <none>
-    # @return: [lambda, beta, d]  (太陽視黄経、視黄緯、地心距離)
+    # @return: [[lambda, beta, d], [alpha, delta, d], [apparent_radius, parallax]]
+    #          (太陽視黄経、視黄緯、地心距離、視赤経、視赤緯、地心距離、視半径、視差))
     #=========================================================================
     def sun
       return compute_sun
@@ -31,7 +37,8 @@ module MkApos
     # MOON
     #
     # @param:  <none>
-    # @return: [alpha, delta]  (月視黄経、視黄緯、地心距離)
+    # @return: [[lambda, beta, d], [alpha, delta, d], [apparent_radius, parallax]]
+    #          (月視黄経、視黄緯、地心距離、視赤経、視赤緯、地心距離、視半径、視差))
     #=========================================================================
     def moon
       return compute_moon

data/lib/mk_apos/compute.rb

@@ -82,7 +82,7 @@ module MkApos
     # 視黄経・視黄緯の計算（太陽）
     #
     # @param:  <none>
-    # @return: [[視赤経, 視赤緯, 地心距離], [視黄経, 視黄緯, 地心距離]]
+    # @return: [[視赤経, 視赤緯, 地心距離], [視黄経, 視黄緯, 地心距離], [視半径, 視差]]
     #=========================================================================
     def compute_sun
       # === 太陽が光を発した時刻 t1(JD) の計算
@@ -101,7 +101,12 @@ module MkApos
       eq_pol_s  = MkCoord.rect2pol(pos_sun_bpn)
       ec_rect_s = MkCoord.rect_eq2ec(pos_sun_bpn, bpn.eps)
       ec_pol_s  = MkCoord.rect2pol(ec_rect_s)
-      return [eq_pol_s, ec_pol_s]
+      # === 視半径／（地平）視差計算
+      radius = Math.asin(@asun / (eq_pol_s[2] * Const::AU / 1000))
+      radius *= 180 / Math::PI * 3600
+      parallax = Math.asin(@re / (eq_pol_s[2] * Const::AU / 1000))
+      parallax *= 180 / Math::PI * 3600
+      return [eq_pol_s, ec_pol_s, [radius, parallax]]
     rescue => e
       raise
     end
@@ -110,7 +115,7 @@ module MkApos
     # 視黄経・視黄緯の計算（月）
     #
     # @param:  <none>
-    # @return: [[視赤経, 視赤緯, 地心距離], [視黄経, 視黄緯, 地心距離]]
+    # @return: [[視赤経, 視赤緯, 地心距離], [視黄経, 視黄緯, 地心距離], [視半径, 視差]]
     #=========================================================================
     def compute_moon
       # === 月が光を発した時刻 t1(jd) の計算
@@ -129,7 +134,12 @@ module MkApos
       eq_pol_m  = MkCoord.rect2pol(pos_moon_bpn)
       ec_rect_m = MkCoord.rect_eq2ec(pos_moon_bpn, bpn.eps)
       ec_pol_m  = MkCoord.rect2pol(ec_rect_m)
-      return [eq_pol_m, ec_pol_m]
+      # === 視半径／（地平）視差計算
+      radius = Math.asin(@am / (eq_pol_m[2] * Const::AU / 1000))
+      radius *= 180 / Math::PI * 3600
+      parallax = Math.asin(@re / (eq_pol_m[2] * Const::AU / 1000))
+      parallax *= 180 / Math::PI * 3600
+      return [eq_pol_m, ec_pol_m, [radius, parallax]]
     rescue => e
       raise
     end

data/lib/mk_apos/version.rb

@@ -1,3 +1,3 @@
 module MkApos
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mk_apos
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - komasaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eph_bpn
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Apparent position calculation tool.