eph_bpn 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4d07b61557d0bb30302432031cd6526f1f82976
-  data.tar.gz: d192b7b989e391566db05373926a3b66e0bd018f
+  metadata.gz: ce2a6c63fbd4c5e300b97012910cc1af06e96424
+  data.tar.gz: f6215f760899fcae728d33480d286bca5940991a
 SHA512:
-  metadata.gz: 2928724a4faa216e325f8d01984f5a3d3af3b56205d43e0383677852c7fb5a3be9f91751fb4674da812932eb15770ed67c81194a1273b26277c3d0f4da81d0c6
-  data.tar.gz: be8ebf09bad30b1497b1849e87b0add08134537cf8ee3e405dcdc4585176a37b5a7e968e0006e68a4fa54ff7b5198d766722e7622f23425a6e5c0dc1e815f403
+  metadata.gz: c9bdb24ffe144f3f937b4a8d549a800de8bd07cffd5fd35ec3b41b045d7d05a6701674af21cd5b827b686eca230071a5e21d4d355ca954403d6c8b96883c9247
+  data.tar.gz: 972c9eaefaddc8a2644066954235395eac478254a7f9b6557f246e3b987f166d8a997e85f45a610a57ca2566cb92507903c76052e3f111cc9f7878ef7de373a0

data/README.md

@@ -35,20 +35,39 @@ Or install it yourself as:
 
 ### Calculation
 
-    pos_g  = [-0.50787065, 0.80728228, 0.34996714]  # GCRS Coordinate
-    pos_b  = e.apply_bias(pos_g)       # Apply Bias
-    pos_p  = e.apply_prec(pos_b)       # Apply Precession
-    pos_n  = e.apply_nut(pos_p)        # Apply Nutation
-    pos_bp = e.apply_bias_prec(pos_g)  # Apply Bias + Precession
-    puts "TDB: #{e.tdb}"               #=> TDB: 2016-07-23 00:00:00 +0000
-    puts " JD: #{e.jd}"                #=>  JD: 2457592.5
-    puts " JC: #{e.jc}"                #=>  JC: 0.16557152635181382
-    puts "EPS: #{e.eps}"               #=> EPS: 0.40905500411767176
-    p pos_g                            #=> [-0.50787065, 0.80728228, 0.34996714]
-    p pos_b                            #=> [-0.507870315369686, 0.8072824634004779, 0.34996720255697145]
-    p pos_p                            #=> [-0.5114180771311418, 0.8053955471104202, 0.34914730256926324]
-    p pos_n                            #=> [-0.5114180757959449, 0.8053955495119587, 0.34914729898526137]
-    p pos_bp                           #=> [-0.5114184398598124, 0.805395337986056, 0.3491472536550768]
+    pos_g   = [-0.50787065, 0.80728228, 0.34996714]  # GCRS Coordinate
+    pos_b   = e.apply_bias(pos_g)           # Apply Bias
+    pos_bp  = e.apply_bias_prec(pos_g)      # Apply Bias & Precession
+    pos_bpn = e.apply_bias_prec_nut(pos_g)  # Apply Bias & Precession & Nutation
+    pos_p   = e.apply_prec(pos_b)           # Apply Precession
+    pos_pn  = e.apply_prec_nut(pos_b)       # Apply Precession & Nutation
+    pos_n   = e.apply_nut(pos_p)            # Apply Nutation
+    puts "TDB: #{e.tdb}"                    #=> TDB: 2016-07-23 00:00:00 +0000
+    puts " JD: #{e.jd}"                     #=>  JD: 2457592.5
+    puts " JC: #{e.jc}"                     #=>  JC: 0.16557152635181382
+    puts "EPS: #{e.eps}"                    #=> EPS: 0.40905500411767176
+    p e.r_bias                              # Rotation matrix for Bias
+    p e.r_bias_prec                         # Rotation matrix for Bias & Precession
+    p e.r_bias_prec_nut                     # Rotation matrix for Bias & Precession & Nutation
+    p e.r_prec                              # Rotation matrix for Precession
+    p e.r_prec_nut                          # Rotation matrix for Precession & Nutation
+    p e.r_nut                               # Rotation matrix for Nutation
+    puts "SRC: #{pos_g}"                    #=> [-0.50787065, 0.80728228, 0.34996714]
+    puts "  B: #{pos_b}"                    #=> [-0.507870315369686, 0.8072824634004779, 0.34996720255697145]
+    puts " BP: #{pos_bp}"                   #=> [-0.5114184398598124, 0.805395337986056, 0.3491472536550768]
+    puts "BPN: #{pos_bpn}"                  #=> [-0.5114038678325663, 0.8054186649898355, 0.3491147860877318]
+    puts "  P: #{pos_p}"                    #=> [-0.5114180771311418, 0.8053955471104202, 0.34914730256926324]
+    puts " PN: #{pos_pn}"                   #=> [-0.5114035051003876, 0.8054188741108519, 0.34911483499021656]
+    puts "  N: #{pos_n}"                    #=> [-0.5114035051003876, 0.8054188741108514, 0.34911483499021656]
+
+About alias:
+
+* `apply_bias` => apply_b`
+* `apply_bias_prec` => apply_bp`
+* `apply_bias_prec_nut` => apply_bpn`
+* `apply_prec` => apply_p`
+* `apply_prec_nut` => apply_pn`
+* `apply_nut` => apply_n`
 
 ## Development
 

data/exe/eph_bpn

@@ -3,22 +3,28 @@
 require "eph_bpn"
 
 e = EphBpn.new(ARGV[0])
-pos_g  = [-0.50787065, 0.80728228, 0.34996714]  # GCRS Coordinate
-pos_b  = e.apply_bias(pos_g)       # Apply Bias
-pos_p  = e.apply_prec(pos_b)       # Apply Precession
-pos_n  = e.apply_nut(pos_p)        # Apply Nutation
-pos_bp = e.apply_bias_prec(pos_g)  # Apply Bias + Precession
-puts "TDB: #{e.tdb}"               #=> TDB: 2016-07-23 00:00:00 +0000
-puts " JD: #{e.jd}"                #=>  JD: 2457592.5
-puts " JC: #{e.jc}"                #=>  JC: 0.16557152635181382
-puts "EPS: #{e.eps}"               #=> EPS: 0.40905500411767176
-p e.r_bias                         # Rotation matrix for Bias
-p e.r_prec                         # Rotation matrix for Precession
-p e.r_nut                          # Rotation matrix for Nutation
-p e.r_bias_prec                    # Rotation matrix for Bias & precession
-p pos_g                            #=> [-0.50787065, 0.80728228, 0.34996714]
-p pos_b                            #=> [-0.507870315369686, 0.8072824634004779, 0.34996720255697145]
-p pos_p                            #=> [-0.5114180771311418, 0.8053955471104202, 0.34914730256926324]
-p pos_n                            #=> [-0.5114180757959449, 0.8053955495119587, 0.34914729898526137]
-p pos_bp                           #=> [-0.5114184398598124, 0.805395337986056, 0.3491472536550768]
+pos_g   = [-0.50787065, 0.80728228, 0.34996714]  # GCRS Coordinate
+pos_b   = e.apply_bias(pos_g)           # Apply Bias
+pos_bp  = e.apply_bias_prec(pos_g)      # Apply Bias & Precession
+pos_bpn = e.apply_bias_prec_nut(pos_g)  # Apply Bias & Precession & Nutation
+pos_p   = e.apply_prec(pos_b)           # Apply Precession
+pos_pn  = e.apply_prec_nut(pos_b)       # Apply Precession & Nutation
+pos_n   = e.apply_nut(pos_p)            # Apply Nutation
+puts "TDB: #{e.tdb}"                    #=> TDB: 2016-07-23 00:00:00 +0000
+puts " JD: #{e.jd}"                     #=>  JD: 2457592.5
+puts " JC: #{e.jc}"                     #=>  JC: 0.16557152635181382
+puts "EPS: #{e.eps}"                    #=> EPS: 0.40905500411767176
+p e.r_bias                              # Rotation matrix for Bias
+p e.r_bias_prec                         # Rotation matrix for Bias & Precession
+p e.r_bias_prec_nut                     # Rotation matrix for Bias & Precession & Nutation
+p e.r_prec                              # Rotation matrix for Precession
+p e.r_prec_nut                          # Rotation matrix for Precession & Nutation
+p e.r_nut                               # Rotation matrix for Nutation
+puts "SRC: #{pos_g}"                    #=> [-0.50787065, 0.80728228, 0.34996714]
+puts "  B: #{pos_b}"                    #=> [-0.507870315369686, 0.8072824634004779, 0.34996720255697145]
+puts " BP: #{pos_bp}"                   #=> [-0.5114184398598124, 0.805395337986056, 0.3491472536550768]
+puts "BPN: #{pos_bpn}"                  #=> [-0.5114038678325663, 0.8054186649898355, 0.3491147860877318]
+puts "  P: #{pos_p}"                    #=> [-0.5114180771311418, 0.8053955471104202, 0.34914730256926324]
+puts " PN: #{pos_pn}"                   #=> [-0.5114035051003876, 0.8054188741108519, 0.34911483499021656]
+puts "  N: #{pos_n}"                    #=> [-0.5114035051003876, 0.8054188741108514, 0.34911483499021656]
 

data/lib/eph_bpn/compute.rb

@@ -116,6 +116,54 @@ module EphBpn
       raise
     end
 
+    #=========================================================================
+    # Bias + Precession 変換行列
+    #
+    # * IAU 2006 (Fukushima-Williams 4-angle formulation) 理論
+    #
+    # @param:  <none>
+    # @return: r  (変換行列)
+    #=========================================================================
+    def comp_r_bias_prec
+      gamma = comp_gamma_bp
+      phi   = comp_phi_bp
+      psi   = comp_psi_bp
+      r = r_z(gamma)
+      r = r_x(phi,   r)
+      r = r_z(-psi,  r)
+      r = r_x(-@eps, r)
+      return r
+    rescue => e
+      raise
+    end
+
+    #=========================================================================
+    # Bias + Precession + Nutation 変換行列
+    #
+    # * IAU 2006 (Fukushima-Williams 4-angle formulation) 理論
+    #
+    # @param:  <none>
+    # @return: r  (変換行列)
+    #=========================================================================
+    def comp_r_bias_prec_nut
+      gamma = comp_gamma_bp
+      phi   = comp_phi_bp
+      psi   = comp_psi_bp
+      fj2 = -2.7774e-6 * @jc
+      dpsi_ls, deps_ls = compute_lunisolar
+      dpsi_pl, deps_pl = compute_planetary
+      dpsi, deps = dpsi_ls + dpsi_pl, deps_ls + deps_pl
+      dpsi += dpsi * (0.4697e-6 + fj2)
+      deps += deps * fj2
+      r = r_z(gamma)
+      r = r_x(phi,          r)
+      r = r_z(-psi - dpsi,  r)
+      r = r_x(-@eps - deps, r)
+      return r
+    rescue => e
+      raise
+    end
+
     #=========================================================================
     # precession（歳差）変換行列（J2000.0 用）
     #
@@ -142,25 +190,9 @@ module EphBpn
     # @return: r  (変換行列)
     #=========================================================================
     def comp_r_prec
-      gamma = ((10.556403    + \
-               (0.4932044    + \
-               (-0.00031238  + \
-               (-0.000002788 + \
-               (0.0000000260)  \
-               * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
-      phi   =  (84381.406000    + \
-               (  -46.811015    + \
-               (    0.0511269   + \
-               (    0.00053289  + \
-               (   -0.000000440 + \
-               (   -0.0000000176) \
-               * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
-      psi   = (( 5038.481507    + \
-               (    1.5584176   + \
-               (   -0.00018522  + \
-               (   -0.000026452 + \
-               (   -0.0000000148) \
-               * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+      gamma = comp_gamma_p
+      phi   = comp_phi_p
+      psi   = comp_psi_p
       r = r_z(gamma)
       r = r_x(phi,   r)
       r = r_z(-psi,  r)
@@ -171,39 +203,27 @@ module EphBpn
     end
 
     #=========================================================================
-    # Bias + Precession 変換行列
+    # Precession + Nutation 変換行列
     #
-    # * IAU 2006 (Fukushima-Williams 4-angle formulation) 理論
+    # * IAU 2000A nutation with adjustments to match the IAU 2006 precession.
     #
     # @param:  <none>
     # @return: r  (変換行列)
     #=========================================================================
-    def comp_r_bias_prec
-      gamma = (-0.052928    + \
-              (10.556378    + \
-              ( 0.4932044   + \
-              (-0.00031238  + \
-              (-0.000002788 + \
-              ( 0.0000000260) \
-              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
-      phi   = (84381.412819    + \
-              (  -46.811016    + \
-              (    0.0511268   + \
-              (    0.00053289  + \
-              (   -0.000000440 + \
-              (   -0.0000000176) \
-              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
-      psi   = (  -0.041775    + \
-              (5038.481484    + \
-              (   1.5584175   + \
-              (  -0.00018522  + \
-              (  -0.000026452 + \
-              (  -0.0000000148) \
-              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+    def comp_r_prec_nut
+      gamma = comp_gamma_p
+      phi   = comp_phi_p
+      psi   = comp_psi_p
+      fj2 = -2.7774e-6 * @jc
+      dpsi_ls, deps_ls = compute_lunisolar
+      dpsi_pl, deps_pl = compute_planetary
+      dpsi, deps = dpsi_ls + dpsi_pl, deps_ls + deps_pl
+      dpsi += dpsi * (0.4697e-6 + fj2)
+      deps += deps * fj2
       r = r_z(gamma)
-      r = r_x(phi,   r)
-      r = r_z(-psi,  r)
-      r = r_x(-@eps, r)
+      r = r_x(phi,          r)
+      r = r_z(-psi - dpsi,  r)
+      r = r_x(-@eps - deps, r)
       return r
     rescue => e
       raise
@@ -232,6 +252,112 @@ module EphBpn
       raise
     end
 
+    #=========================================================================
+    # 歳差変換行列用 gamma 計算
+    #
+    # @param:  <none>
+    # @return: gamma
+    #=========================================================================
+    def comp_gamma_p
+      return ((10.556403    + \
+              ( 0.4932044   + \
+              (-0.00031238  + \
+              (-0.000002788 + \
+              ( 0.0000000260) \
+              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+    rescue => e
+      raise
+    end
+
+    #=========================================================================
+    # 歳差変換行列用 phi 計算
+    #
+    # @param:  <none>
+    # @return: phi
+    #=========================================================================
+    def comp_phi_p
+      return (84381.406000    + \
+             (  -46.811015    + \
+             (    0.0511269   + \
+             (    0.00053289  + \
+             (   -0.000000440 + \
+             (   -0.0000000176) \
+             * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+    rescue => e
+      raise
+    end
+
+    #=========================================================================
+    # 歳差変換行列用 psi 計算
+    #
+    # @param:  <none>
+    # @return: psi
+    #=========================================================================
+    def comp_psi_p
+      return (( 5038.481507    + \
+              (    1.5584176   + \
+              (   -0.00018522  + \
+              (   -0.000026452 + \
+              (   -0.0000000148) \
+              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+    rescue => e
+      raise
+    end
+
+    #=========================================================================
+    # バイアス＆歳差変換行列用 gamma 計算
+    #
+    # @param:  <none>
+    # @return: gamma
+    #=========================================================================
+    def comp_gamma_bp
+      gamma = (-0.052928    + \
+              (10.556378    + \
+              ( 0.4932044   + \
+              (-0.00031238  + \
+              (-0.000002788 + \
+              ( 0.0000000260) \
+              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+    rescue => e
+      raise
+    end
+
+    #=========================================================================
+    # バイアス＆歳差変換行列用 phi 計算
+    #
+    # @param:  <none>
+    # @return: phi
+    #=========================================================================
+    def comp_phi_bp
+      phi   = (84381.412819    + \
+              (  -46.811016    + \
+              (    0.0511268   + \
+              (    0.00053289  + \
+              (   -0.000000440 + \
+              (   -0.0000000176) \
+              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+    rescue => e
+      raise
+    end
+
+    #=========================================================================
+    # バイアス＆歳差変換行列用 psi 計算
+    #
+    # @param:  <none>
+    # @return: psi
+    #=========================================================================
+    def comp_psi_bp
+      psi   = (  -0.041775    + \
+              (5038.481484    + \
+              (   1.5584175   + \
+              (  -0.00018522  + \
+              (  -0.000026452 + \
+              (  -0.0000000148) \
+              * @jc) * @jc) * @jc) * @jc) * @jc) * Const::AS2R
+    rescue => e
+      raise
+    end
+
     #=========================================================================
     # 日月章動(luni-solar nutation)の計算
     #

data/lib/eph_bpn/ephemeris.rb

@@ -1,18 +1,22 @@
 module EphBpn
+
   class Ephemeris
     attr_reader :tdb, :jd, :jc, :eps,
-                :r_bias, :r_prec, :r_nut, :r_bias_prec
+                :r_bias, :r_bias_prec, :r_bias_prec_nut,
+                :r_prec, :r_prec_nut, :r_nut
     include Compute
 
     def initialize(tdb)
-      @tdb = tdb                     # 太陽系力学時
-      @jd  = gc2jd(@tdb)             # TDB -> JD（ユリウス日）
-      @jc  = jd2jc(@jd)              # ユリウス世紀
-      @eps = compute_obliquity(@jc)  # 平均黄道傾斜角
-      @r_bias      = comp_r_bias       # 回転行列（バイアス）
-      @r_prec      = comp_r_prec       # 回転行列（歳差）
-      @r_nut       = comp_r_nut        # 回転行列（章動）
-      @r_bias_prec = comp_r_bias_prec  # 回転行列（バイアス＆歳差）
+      @tdb = tdb                               # 太陽系力学時
+      @jd  = gc2jd(@tdb)                       # TDB -> JD（ユリウス日）
+      @jc  = jd2jc(@jd)                        # ユリウス世紀
+      @eps = compute_obliquity(@jc)            # 平均黄道傾斜角
+      @r_bias          = comp_r_bias           # 回転行列（バイアス）
+      @r_bias_prec     = comp_r_bias_prec      # 回転行列（バイアス＆歳差）
+      @r_bias_prec_nut = comp_r_bias_prec_nut  # 回転行列（バイアス＆歳差＆章動）
+      @r_prec          = comp_r_prec           # 回転行列（歳差）
+      @r_prec_nut      = comp_r_prec_nut       # 回転行列（歳差＆章動）
+      @r_nut           = comp_r_nut            # 回転行列（章動）
     end
 
     #=========================================================================
@@ -24,6 +28,29 @@ module EphBpn
     def apply_bias(pos)
       return rotate(@r_bias, pos)
     end
+    alias :apply_b :apply_bias
+
+    #=========================================================================
+    # Bias + Precession（歳差） 適用
+    #
+    # @param:  pos    (適用前直角座標)
+    # @return: pos_p  (適用後直角座標)
+    #=========================================================================
+    def apply_bias_prec(pos)
+      return rotate(@r_bias_prec, pos)
+    end
+    alias :apply_bp :apply_bias_prec
+
+    #=========================================================================
+    # Bias + Precession（歳差） + Nutation（章動） 適用
+    #
+    # @param:  pos    (適用前直角座標)
+    # @return: pos_p  (適用後直角座標)
+    #=========================================================================
+    def apply_bias_prec_nut(pos)
+      return rotate(@r_bias_prec_nut, pos)
+    end
+    alias :apply_bpn :apply_bias_prec_nut
 
     #=========================================================================
     # Precession（歳差） 適用
@@ -34,26 +61,29 @@ module EphBpn
     def apply_prec(pos)
       return rotate(@r_prec, pos)
     end
+    alias :apply_p :apply_prec
 
     #=========================================================================
-    # Nutation（章動） 適用
+    # Precession（歳差） + Nutation（章動） 適用
     #
     # @param:  pos    (適用前直角座標)
-    # @return: pos_n  (適用後直角座標)
+    # @return: pos_p  (適用後直角座標)
     #=========================================================================
-    def apply_nut(pos)
-      return rotate(@r_nut, pos)
+    def apply_prec_nut(pos)
+      return rotate(@r_prec_nut, pos)
     end
+    alias :apply_pn :apply_prec_nut
 
     #=========================================================================
-    # Bias + Precession（歳差） 適用
+    # Nutation（章動） 適用
     #
     # @param:  pos    (適用前直角座標)
-    # @return: pos_p  (適用後直角座標)
+    # @return: pos_n  (適用後直角座標)
     #=========================================================================
-    def apply_bias_prec(pos)
-      return rotate(@r_bias_prec, pos)  # IAU 2006 (Fukushima-Williams) 理論
+    def apply_nut(pos)
+      return rotate(@r_nut, pos)
     end
+    alias :apply_n :apply_nut
   end
 end
 

data/lib/eph_bpn/version.rb

@@ -1,3 +1,3 @@
 module EphBpn
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eph_bpn
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - komasaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler