four-pillars 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41fdb5b30e28ee0b2b8be1d7bc0cc58dbe672f035a268d384e4398d6a6cbd760
-  data.tar.gz: f02566969d22fce3073674a84ac6e3cace539b85de464bf8aa1d56b014b0f91f
+  metadata.gz: c3208005abb1c52cad09b0e9b335a22351553193308d8716b535eedde2ffd9aa
+  data.tar.gz: 570bf5d0a00163dc68202f42f76d07a7f746f2a54d52c6309e95ca01094dfc7c
 SHA512:
-  metadata.gz: 8de4a9a086a69ffbb9f64ebf85b5cda0181b62e47740aebb7ae698a56e7f88af3fde518d95d4d70ef7cccc53347f822d67ce5821924015480e5745e63749b159
-  data.tar.gz: 24f4212abf99ee7d10c34dae35f41f196097a5fb00f829118e372abb8318e2b15438a4a9f59f43c5ebb6ca3442413b449371ac84ffd8dbd6350fc9ed39efbb99
+  metadata.gz: c60b16002946f6e495eb72e2abe5230285e4b25b2ed6c5cc784cd26a28c02e70e97d4f66e6918b16b16273650add5c9047a0e2d1181e459e5b689cf142d3300f
+  data.tar.gz: 5c9f536213509c42325111551d35f3c9aa1e0891fde699ab358c0ee5f464e9e6a215659d62c98a0a6d967ee841d8f11e2ab59b128f7dc78437e6aa561bf8efa2

data/lib/four-pillars.rb

@@ -257,7 +257,7 @@ class FourPillarsLogic
     zn = zokan_number
     z = []
     kanshi.each do |k|
-      j = k[1] # 十二支
+      j = k&.slice(1) # 十二支
       if zokan_hash1.keys.include? j
         z += [zokan_hash1[j]]
       elsif zokan_hash2.keys.include? j
@@ -276,6 +276,8 @@ class FourPillarsLogic
         else
           z += [arr[4]]
         end
+      else # j == nil
+        z += [nil]
       end
     end
     return z
@@ -283,14 +285,18 @@ class FourPillarsLogic
 
   # 通変星(nil,月,年)
   def tsuhensei
+    o = @with_time ? 1 : 0
+    m = FourPillarsLogic::tsuhensei(kanshi[o][0],kanshi[o + 1][0])
+    y = FourPillarsLogic::tsuhensei(kanshi[o][0],kanshi[o + 2][0])
     if @with_time
-      m = FourPillarsLogic::tsuhensei(kanshi[1][0],kanshi[2][0])
-      y = FourPillarsLogic::tsuhensei(kanshi[1][0],kanshi[3][0])
-      t = FourPillarsLogic::tsuhensei(kanshi[1][0],kanshi[0][0])
+      tk = kanshi[0]&.slice(0)
+      if tk.nil?
+        t = nil
+      else
+        t = FourPillarsLogic::tsuhensei(kanshi[o][0],tk)
+      end
       [t,nil,m,y]
     else
-      m = FourPillarsLogic::tsuhensei(kanshi[0][0],kanshi[1][0])
-      y = FourPillarsLogic::tsuhensei(kanshi[0][0],kanshi[2][0])
       [nil,m,y]
     end
   end
@@ -309,15 +315,19 @@ class FourPillarsLogic
       j_day = jikkan.index(zokan[1])
       j_month = jikkan.index(zokan[2])
       j_year = jikkan.index(zokan[3])
-      t_time = j_time - j
-      t_time += 10 if t_time < 0
+      if j_time.nil?
+        t_time = nil
+      else
+        t_time = j_time - j
+        t_time += 10 if t_time < 0
+      end
       t_day = j_day - j
       t_day += 10 if t_day < 0
       t_month = j_month - j
       t_month += 10 if t_month < 0
       t_year = j_year - j
       t_year += 10 if t_year < 0
-      [TSUHENSEI[t_time],TSUHENSEI[t_day],TSUHENSEI[t_month],TSUHENSEI[t_year]]
+      [(t_time.nil? ? nil : TSUHENSEI[t_time]),TSUHENSEI[t_day],TSUHENSEI[t_month],TSUHENSEI[t_year]]
     else
       j = JIKKAN.index(kanshi[0][0])
       if j % 2 == 0 # 陽
@@ -346,7 +356,11 @@ class FourPillarsLogic
     m = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[1 + o][1])
     y = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[2 + o][1])
     return [d,m,y] unless @with_time
-    t = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[0][1])
+    if @birth_dt[3].nil? # when hour is nil
+      t = nil
+    else
+      t = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[0][1])
+    end
     [t,d,m,y]
   end
 
@@ -363,6 +377,11 @@ class FourPillarsLogic
     [KUUBOU[k_day],KUUBOU[k_year]]
   end
 
+  # 日柱のインデックス 時柱を求める場合は1になる
+  def offset_for_day
+    @with_time ? 1 : 0
+  end
+
   # テーブル表示用に配列にして返す (デバッグ用)
   # 0:干支, 1:干支数字, 2:蔵干, 3:通変星, 4:蔵干通変星, 5:十二運星
   # 五行、天中殺、十二運星エネルギーは別途
@@ -380,8 +399,13 @@ class FourPillarsLogic
   def gogyo_jikkan
     arr = []
     kanshi.length.times do |i|
-      j = JIKKAN.index(kanshi[i][0])
-      arr += [(j % 2 == 0 ? "+" : "-") + GOGYO[j / 2]]
+      k = kanshi[i]&.slice(0)
+      if k.nil?
+        arr += [nil]
+      else
+        j = JIKKAN.index(k)
+        arr += [(j % 2 == 0 ? "+" : "-") + GOGYO[j / 2]]
+      end
     end
     return arr
   end
@@ -391,8 +415,13 @@ class FourPillarsLogic
     arr = []
     gogyo_j = ["水","土","木","木","土","火","火","土","金","金","土","水"]
     kanshi.length.times do |i|
-      j = JYUNISHI.index(kanshi[i][1])
-      arr += [(j % 2 == 0 ? "+" : "-") + gogyo_j[j]]
+      jj = kanshi[i]&.slice(1)
+      if jj.nil?
+        arr += [nil]
+      else
+        j = JYUNISHI.index(jj)
+        arr += [(j % 2 == 0 ? "+" : "-") + gogyo_j[j]]
+      end
     end
     return arr
   end
@@ -400,8 +429,8 @@ class FourPillarsLogic
   # 守護神
   def shugoshin
     # 日柱の十干と月柱の十二支
-    x = JIKKAN.index(kanshi[0][0])
-    y = JYUNISHI.index(kanshi[1][1])
+    x = JIKKAN.index(kanshi[0 + offset_for_day][0])
+    y = JYUNISHI.index(kanshi[1 + offset_for_day][1])
     SHUGOSHIN[y][x].split("")
   end
 
@@ -409,7 +438,9 @@ class FourPillarsLogic
   def shukumei
     s = []
     t = kuubou # 天中殺 0:上段, 1:下段
-    k = kanshi.map {|v| v[1] } # 日,月,年柱の干支
+    ka = kanshi
+    ka.delete_at(0) if @with_time
+    k = ka.map {|v| v[1] } # 日,月,年柱の干支
     if t[0].include? k[2]
       s += ["生年中殺"]
     end
@@ -427,10 +458,10 @@ class FourPillarsLogic
   end
 
   def equivalent_kanshi(only_jikkan=false)
+    k = kanshi
+    k.delete_at(0) if @with_time
     if only_jikkan
-      k = kanshi.map {|v| v[0] } # 日,月,年柱の十干
-    else
-      k = kanshi
+      k = k.map {|v| v[0] } # 日,月,年柱の十干
     end
     if k[0] == k[1] && k[1] == k[2]
       return [[0,1],[0,2],[1,2]]
@@ -462,8 +493,8 @@ class FourPillarsLogic
     v = []
     eq = equivalent_kanshi(true)
     eq.each do |e|
-      k0 = kanshi[e[0]][1]
-      k1 = kanshi[e[1]][1]
+      k0 = kanshi[e[0] + offset_for_day][1]
+      k1 = kanshi[e[1] + offset_for_day][1]
       v += [e] if on_distance?(k0,k1,6)
     end
     return v
@@ -475,13 +506,13 @@ class FourPillarsLogic
     v = []
     eq = equivalent_kanshi(true)
     eq.each do |e|
-      k0 = kanshi[e[0]][1]
-      k1 = kanshi[e[1]][1]
+      k0 = kanshi[e[0] + offset_for_day][1]
+      k1 = kanshi[e[1] + offset_for_day][1]
       v += [e] if on_distance?(k0,k1,4)
     end
     eq.each do |e|
-      k0 = kanshi[e[0]][1]
-      k1 = kanshi[e[1]][1]
+      k0 = kanshi[e[0] + offset_for_day][1]
+      k1 = kanshi[e[1] + offset_for_day][1]
       v += [e] if on_distance?(k0,k1,8)
     end
     return v
@@ -491,6 +522,7 @@ class FourPillarsLogic
   def taiun
     return [nil,nil] unless ['m','f'].include? @gender
     k = gogyo_jikkan[2][0]
+    # TODO: 時刻不明の場合は？
     t = @birth_dt[3] * 60 + @birth_dt[4] # 生まれた時間
     if (@gender == 'm' && k == "+") || (@gender == 'f' && k == '-')
       order = "順行"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Yosei Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies: []
 description: A class which tells fortune by Four Pillar astrology(四柱推命).
 email: y-itou@lumber-mill.co.jp