four-pillars 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df9278f927d44ce10526177dd5525427f429b9da2357683c00612ee00591950a
-  data.tar.gz: 8ee588fe565c0a5fa0fd9a1be13a039f1882c1ae4de115a9d624f05ce1303629
+  metadata.gz: 41fdb5b30e28ee0b2b8be1d7bc0cc58dbe672f035a268d384e4398d6a6cbd760
+  data.tar.gz: f02566969d22fce3073674a84ac6e3cace539b85de464bf8aa1d56b014b0f91f
 SHA512:
-  metadata.gz: cb9c9c92a8d3b8dbd13f40f9bcf6981a4ce37cf2ad4e318851bc539654c922c30da2839cc606f1d1b4bfd70848c84596bc132ad861946cfc8ae3857fb78204fe
-  data.tar.gz: 397bb11c87ea091baac4c0039d90ab6fbd34b3c9d8669b697cb7c2e5fc3426de73a0b010ea346d90747d09a9cdbb02ac5ec4cd73c13399c40cde8e20d0af549f
+  metadata.gz: 8de4a9a086a69ffbb9f64ebf85b5cda0181b62e47740aebb7ae698a56e7f88af3fde518d95d4d70ef7cccc53347f822d67ce5821924015480e5745e63749b159
+  data.tar.gz: 24f4212abf99ee7d10c34dae35f41f196097a5fb00f829118e372abb8318e2b15438a4a9f59f43c5ebb6ca3442413b449371ac84ffd8dbd6350fc9ed39efbb99

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
 
   # 干支(数字)
@@ -262,49 +283,83 @@ 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]
+    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])
+      [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
 
   # 蔵干通変星
   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])
+      t_time = j_time - j
+      t_time += 10 if t_time < 0
+      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]]
+    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
+    t = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[0][1])
+    [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
 
@@ -324,7 +379,7 @@ class FourPillarsLogic
   # 五行(十干)
   def gogyo_jikkan
     arr = []
-    3.times do |i|
+    kanshi.length.times do |i|
       j = JIKKAN.index(kanshi[i][0])
       arr += [(j % 2 == 0 ? "+" : "-") + GOGYO[j / 2]]
     end
@@ -335,7 +390,7 @@ class FourPillarsLogic
   def gogyo_jyunishi
     arr = []
     gogyo_j = ["水","土","木","木","土","火","火","土","金","金","土","水"]
-    3.times do |i|
+    kanshi.length.times do |i|
       j = JYUNISHI.index(kanshi[i][1])
       arr += [(j % 2 == 0 ? "+" : "-") + gogyo_j[j]]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Yosei Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2024-08-20 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