four-pillars 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df9278f927d44ce10526177dd5525427f429b9da2357683c00612ee00591950a
-  data.tar.gz: 8ee588fe565c0a5fa0fd9a1be13a039f1882c1ae4de115a9d624f05ce1303629
+  metadata.gz: c3208005abb1c52cad09b0e9b335a22351553193308d8716b535eedde2ffd9aa
+  data.tar.gz: 570bf5d0a00163dc68202f42f76d07a7f746f2a54d52c6309e95ca01094dfc7c
 SHA512:
-  metadata.gz: cb9c9c92a8d3b8dbd13f40f9bcf6981a4ce37cf2ad4e318851bc539654c922c30da2839cc606f1d1b4bfd70848c84596bc132ad861946cfc8ae3857fb78204fe
-  data.tar.gz: 397bb11c87ea091baac4c0039d90ab6fbd34b3c9d8669b697cb7c2e5fc3426de73a0b010ea346d90747d09a9cdbb02ac5ec4cd73c13399c40cde8e20d0af549f
+  metadata.gz: c60b16002946f6e495eb72e2abe5230285e4b25b2ed6c5cc784cd26a28c02e70e97d4f66e6918b16b16273650add5c9047a0e2d1181e459e5b689cf142d3300f
+  data.tar.gz: 5c9f536213509c42325111551d35f3c9aa1e0891fde699ab358c0ee5f464e9e6a215659d62c98a0a6d967ee841d8f11e2ab59b128f7dc78437e6aa561bf8efa2

data/lib/four-pillars.rb

@@ -118,12 +118,17 @@ class FourPillarsLogic
   # 生年月日時間, 性別(大運の向きに使用)
   attr_reader :birth_dt, :gender
 
-  def initialize(birth_dt,gender)
-    @birth_dt = birth_dt.map {|v| v.to_i }
+  def initialize(birth_dt,gender,with_time:false)
+    @birth_dt = birth_dt.map {|v| v.nil? ? nil : v.to_i }
     @gender = gender
+    @with_time = with_time
     raise "Incorrect birth date: #{birth_dt}" if @birth_dt.count != 5
     raise "Gender must be m,f or o(other): #{gender}" unless ['o','m','f'].include? @gender
     raise "Year must be larger than 1863" if @birth_dt[0] < 1864
+    h = @birth_dt[3]
+    if !h.nil? && (h < 0 || h > 23)
+      raise "Invalid hour: #{birth_dt}"
+    end
   end
 
   # 生年月日と性別
@@ -137,7 +142,12 @@ class FourPillarsLogic
     else
       g = ""
     end
-    "#{y}年#{m}月#{d}日#{h}時#{i}分生 #{g}"
+    if h.nil? || i.nil?
+      t = ""
+    else
+      t = "#{h}時#{i}分"
+    end
+    "#{y}年#{m}月#{d}日#{t}生 #{g}"
   end
 
   # 前月の日数
@@ -196,7 +206,8 @@ class FourPillarsLogic
     setsuiri[0] == d
   end
 
-  # 干支(日,月,年)
+  # 干支((時,)日,月,年)
+  # with_time=trueの時、時柱を含め長さ4の配列を返す
   def kanshi
     y,m,d,h,i = @birth_dt
     sd, st = setsuiri
@@ -206,7 +217,17 @@ class FourPillarsLogic
     md -= 1 if d < sd || (d == sd && h*60+i < st)
     dd = Date.new(y,m,d) - Date.new(1863,12,31) # 1923.10.18 = 甲子
 
-    return [KANSHI_ARRAY[dd % 60],KANSHI_ARRAY[md % 60],KANSHI_ARRAY[yd % 60]]
+    return [KANSHI_ARRAY[dd % 60],KANSHI_ARRAY[md % 60],KANSHI_ARRAY[yd % 60]] unless @with_time
+
+    dp = KANSHI_ARRAY[dd % 60] # 日柱
+    if h.nil?
+      tp = nil
+    else
+      jyunishi_idx = h == 23 ? 0 : ((h + 1) / 2)
+      jikkan_idx = ((JIKKAN.index(dp[0]) % 5) * 2 + jyunishi_idx) % 10
+      tp = JIKKAN[jikkan_idx] + JYUNISHI[jyunishi_idx]
+    end
+    return [tp,dp,KANSHI_ARRAY[md % 60],KANSHI_ARRAY[yd % 60]]
   end
 
   # 干支(数字)
@@ -236,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
@@ -255,6 +276,8 @@ class FourPillarsLogic
         else
           z += [arr[4]]
         end
+      else # j == nil
+        z += [nil]
       end
     end
     return z
@@ -262,52 +285,103 @@ class FourPillarsLogic
 
   # 通変星(nil,月,年)
   def tsuhensei
-    m = FourPillarsLogic::tsuhensei(kanshi[0][0],kanshi[1][0])
-    y = FourPillarsLogic::tsuhensei(kanshi[0][0],kanshi[2][0])
-    [nil,m,y]
+    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
+      tk = kanshi[0]&.slice(0)
+      if tk.nil?
+        t = nil
+      else
+        t = FourPillarsLogic::tsuhensei(kanshi[o][0],tk)
+      end
+      [t,nil,m,y]
+    else
+      [nil,m,y]
+    end
   end
 
   # 蔵干通変星
   def zokan_tsuhensei
-    j = JIKKAN.index(kanshi[0][0])
-    if j % 2 == 0 # 陽
-      jikkan = JIKKAN
-    else # 陰
-      jikkan = JIKKAN_IN
+    if @with_time
+      j = JIKKAN.index(kanshi[1][0])
+      if j % 2 == 0 # 陽
+        jikkan = JIKKAN
+      else # 陰
+        jikkan = JIKKAN_IN
+      end
+      j = jikkan.index(kanshi[1][0])
+      j_time = jikkan.index(zokan[0])
+      j_day = jikkan.index(zokan[1])
+      j_month = jikkan.index(zokan[2])
+      j_year = jikkan.index(zokan[3])
+      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
+      [(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 # 陽
+        jikkan = JIKKAN
+      else # 陰
+        jikkan = JIKKAN_IN
+      end
+      j = jikkan.index(kanshi[0][0])
+      j_day = jikkan.index(zokan[0])
+      j_month = jikkan.index(zokan[1])
+      j_year = jikkan.index(zokan[2])
+      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_day],TSUHENSEI[t_month],TSUHENSEI[t_year]]
     end
-    j = jikkan.index(kanshi[0][0])
-    j_day = jikkan.index(zokan[0])
-    j_month = jikkan.index(zokan[1])
-    j_year = jikkan.index(zokan[2])
-    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_day],TSUHENSEI[t_month],TSUHENSEI[t_year]]
   end
 
   # 十二運星
   def jyuniunsei
-    d = FourPillarsLogic::jyuniunsei(kanshi[0][0],kanshi[0][1])
-    m = FourPillarsLogic::jyuniunsei(kanshi[0][0],kanshi[1][1])
-    y = FourPillarsLogic::jyuniunsei(kanshi[0][0],kanshi[2][1])
-    [d,m,y]
+    o = @with_time ? 1 : 0
+    d = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[0 + o][1])
+    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
+    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
 
-  # 十二運星エネルギー
+  # 十二運星エネルギー 時中は使わない? 
   def jyuniunsei_energy
     jyuniunsei.map {|v| JYUNIUNSEI_ENERGY[v] }
   end
 
   # 空亡 = 天中殺
   def kuubou
-    k_day = (kanshi_as_number[0] - 1) / 10
-    k_year = (kanshi_as_number[2] - 1) / 10
+    o = @with_time ? 1 : 0
+    k_day = (kanshi_as_number[0 + o] - 1) / 10
+    k_year = (kanshi_as_number[2 + o] - 1) / 10
     [KUUBOU[k_day],KUUBOU[k_year]]
   end
 
+  # 日柱のインデックス 時柱を求める場合は1になる
+  def offset_for_day
+    @with_time ? 1 : 0
+  end
+
   # テーブル表示用に配列にして返す (デバッグ用)
   # 0:干支, 1:干支数字, 2:蔵干, 3:通変星, 4:蔵干通変星, 5:十二運星
   # 五行、天中殺、十二運星エネルギーは別途
@@ -324,9 +398,14 @@ class FourPillarsLogic
   # 五行(十干)
   def gogyo_jikkan
     arr = []
-    3.times do |i|
-      j = JIKKAN.index(kanshi[i][0])
-      arr += [(j % 2 == 0 ? "+" : "-") + GOGYO[j / 2]]
+    kanshi.length.times do |i|
+      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
@@ -335,9 +414,14 @@ class FourPillarsLogic
   def gogyo_jyunishi
     arr = []
     gogyo_j = ["水","土","木","木","土","火","火","土","金","金","土","水"]
-    3.times do |i|
-      j = JYUNISHI.index(kanshi[i][1])
-      arr += [(j % 2 == 0 ? "+" : "-") + gogyo_j[j]]
+    kanshi.length.times do |i|
+      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
@@ -345,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
 
@@ -354,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
@@ -372,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]]
@@ -407,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
@@ -420,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
@@ -436,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.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Yosei Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 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
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Four Pillar astrology