mk_apos 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa8ede1b3c58383c1fc41348959bedb24e34c72f
-  data.tar.gz: da78fd2c8b82bc794e3986ccbcebc2d4118e0a99
+SHA256:
+  metadata.gz: a7e77bfad4e9fc932ae2a28c072926cf08f2f290b0fe26cd6933c7ceae350f26
+  data.tar.gz: bf32b745440ef0c312bfe918a594d2260b48472413db5e8e26daa85400ec20d3
 SHA512:
-  metadata.gz: f6473dd4869c17c5f1881ec19881de77acab0738a81d4abfdbf0253071c9503df892f37b9922be14bb9ad6b22ec34aeea402212de64269c343bcbbeaa587d963
-  data.tar.gz: 570c104c39aca9be932492d883e247ff17960b43b9a248422ceb1d1534b4bba8721d7c95250ee0c4e50961d7df21c2ab8dc7f030ef8201e90c796d7aea572654
+  metadata.gz: 91d96455290ff35d3b70c440beee1ee086057479e831fc01d9481d2550df8192c19dba3b8abcbfa7c74d6ee0c20febd48d5a91855c4bc8dd09999e6d87f5fca2
+  data.tar.gz: 05a88b3e92064649c0e2b50e182d22f5de25e913507df1faef5fab8f184221f7c4d5704afa804ca92e92f42052fc628380782401534fdcc8cb9bad9e6a314e6c

data/README.md

@@ -38,7 +38,7 @@ Or install it yourself as:
     a = MkApos.new("/path/to/<JPLEPH binary>")
 
 * You can set UTC formatted `YYYYMMDD` or `YYYYMMDDHHMMSS` or `YYYYMMDDHHMMSSU...` as an argument. (`U` is microsecond)
-* If you don't set a second argument, this class considers the system time to have been set as a second argument.
+* If you don't set a second argument, this class considers the system time to have been set as a second argument(UTC).
 
 ### Calculation
 

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

@@ -21,7 +21,7 @@ module MkApos
     # @return: jd  (Julian Day(Numeric))
     #=========================================================================
     def get_jd(t)
-      return MkTime.new(t.strftime("%Y%m%d%H%M%S")).jd
+      return MkTime.new(t.strftime("%Y%m%d%H%M%S%6N")).jd
     rescue => e
       raise
     end
@@ -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
@@ -150,7 +160,7 @@ module MkApos
       t_2 = t_1
       pv_1 = @icrs_2[target]
       df, m = 1.0, 0
-      while df > 1.0e-10 || m > 10
+      while df > 1.0e-10
         r_12 = (0..2).map { |i| pv_1[i] - @icrs_2[:earth][i] }
         r_12_d = calc_dist(pv_1, @icrs_2[:earth])
         df = (Const::C * Const::DAYSEC / Const::AU) * (t_2 - t_1) - r_12_d
@@ -158,6 +168,7 @@ module MkApos
         df /= ((Const::C * Const::DAYSEC / Const::AU) + (df_wk) / r_12_d)
         t_1 += df
         m += 1
+        raise Const::MSG_ERR_5 if m > 10
         pv_1 = get_icrs(Const::BODIES[target], t_1)
       end
       return t_1

data/lib/mk_apos/const.rb

@@ -4,6 +4,7 @@ module MkApos
     MSG_ERR_2 = "[ERROR] Format: YYYYMMDD or YYYYMMDDHHMMSS or YYYYMMDDHHMMSSU..."
     MSG_ERR_3 = "[ERROR] Invalid date-time!"
     MSG_ERR_4 = "[ERROR] Binary file is not found!"
+    MSG_ERR_5 = "[ERROR] Newton method error!"
     BODIES    = {earth: 3, moon: 10, sun: 11}  # 天体名と JPL での天体番号
     AU        = 149597870700                   # 1天文単位 (m)
     C         = 299792458                      # 光速 (m/s)

data/lib/mk_apos/version.rb

@@ -1,3 +1,3 @@
 module MkApos
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/mk_apos.gemspec

@@ -31,7 +31,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "eph_jpl"
   spec.add_dependency "mk_coord"
   spec.add_dependency "mk_time"
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  #spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  #spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mk_apos
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - komasaru
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eph_bpn
@@ -70,30 +70,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ homepage: https://github.com/komasaru/mk_apos
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
 summary: Apparent position calculation tool.
 test_files: []