four-pillars 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f0b8c051671af718c90ac4cc6e63f328b45ab58b1dc66de1bcd5cccec592b51
-  data.tar.gz: b9980ff4b7836ce0f41f625f6d8b7408fb2fdd67eb2e68401c82335f6a0141b3
+  metadata.gz: 05b1b6919825e6f97cd615abbf7ca7d446d031bc15524c7e42a8f17c211bf905
+  data.tar.gz: 2c4f1c1450a8af51b2fd0aaa65dd41559b77de7a8d7fb64d2cc8793109ddf748
 SHA512:
-  metadata.gz: f50990650a105160b856d434a1e775147821005e19ca2e3e49e59145078965363223b1d36c57b0955003799545859142f656a8b0ae9af143567b99d5ebb1a4ec
-  data.tar.gz: 706961821addf96f7fb0aab4142379891e2dbc0d3596174f16a009bfd7735bc93afb9f51b7bce05a4de4e05b7bb394b11b184726c3e6f61aeda72b818c962a02
+  metadata.gz: bce4f1bcec1539c8d75a5a9e1009464fc07f64389f9649becbb69da6e6ea70f3d8fac0ce5e6bbc52dcf150daaf98f68317b4a9c1e509ec9c379fefa2a7ec6d42
+  data.tar.gz: 07333c1ea69b35433eebd12e83b2ddebf0327b866a6c9d765330b3fc585662d4603e639416d3e2222aea0b7cceda9f7aeb9dcb382a3324781e08bec3449c897e

data/lib/four-pillars.rb

@@ -14,9 +14,9 @@ class FourPillarsLogic
                ["庚丁壬","癸丙","壬甲","甲庚","甲丙癸","丙甲癸","甲丁","壬甲","甲庚","丙甲辛"],
                ["癸庚丁","癸辛","壬庚","甲庚","甲癸丙","癸丙辛","壬戊丙","壬癸甲","壬庚辛","辛壬"],
                ["癸丁庚","癸丙","壬庚","壬庚","壬甲丙","癸丙辛","壬癸庚","壬癸乙","癸庚辛","辛壬"],
-               ["癸","癸丙甲","壬庚","甲壬","丙癸甲","癸丙","丁甲","壬甲庚","辛甲","辛壬癸"],
+               ["癸","癸丙甲","壬庚","甲壬","癸丙甲","癸丙","丁甲","壬甲庚","辛甲","辛壬癸"],
                ["庚丁壬","丙癸","壬戊","甲庚丙","丙癸甲","丙癸","丁甲","壬甲","戊丁","丁甲"],
-               ["癸庚丁甲","丙癸","壬","甲庚丙","丙癸","丙癸","丁甲丙","壬","甲庚","辛丙"],
+               ["庚丁丙癸","丙癸","壬","甲庚丙","丙癸","丙癸","丁甲丙","壬","甲庚","辛丙"],
                ["癸庚丁甲","癸辛甲","甲壬","甲庚","甲丙癸","甲丙","甲壬","壬甲","甲丙戊","辛甲癸"],
                ["癸丁丙戊","丙戊","甲戊庚","甲庚","甲丙","丙甲戊","丁甲丙","壬丙","戊丙庚","辛戊"]]
 
@@ -84,7 +84,34 @@ class FourPillarsLogic
   end
   SETSUIRI_HASH, SETSUIRI_LIST = load_setsuiri
 
-  # 生年月日時間, 性別(鑑定には使用しない)
+  # 通変星
+  def self.tsuhensei(j_day,j_src) # 日柱の十干、月柱または年柱の十干
+    j = JIKKAN.index(j_day)
+    if j % 2 == 0 # 陽
+      jikkan = JIKKAN
+    else # 陰
+      jikkan = JIKKAN_IN
+    end
+    t = jikkan.index(j_src) - jikkan.index(j_day)
+    t += 10 if t < 0
+    TSUHENSEI[t]
+  end
+
+  def self.jyuniunsei(j_day,j_src) # 日柱の十干, 十二支
+    j = JIKKAN.index(j_day)
+    if j % 2 == 0 # 陽
+      jyunishi = JYUNISHI
+    else # 陰
+      jyunishi = JYUNISHI_IN
+    end
+    offset = [1,7,10,10,10,10,7,1,4,4][j] # 十二運表より求めたオフセット
+    ji = jyunishi.index(j_src)
+    JYUNIUNSEI[(ji + offset) % 12]
+  end
+
+  # TODO エネルギー
+
+  # 生年月日時間, 性別(大運の向きに使用)
   attr_reader :birth_dt,:gender
 
   def initialize(birth_dt,gender)
@@ -115,6 +142,12 @@ class FourPillarsLogic
     (Date.new(y,m,1) - 1).day
   end
 
+  # 今月の日数
+  def days_of_current_month
+    y,m,d,h,i = @birth_dt
+    Date.new(y,m,1).next_month.prev_day.day
+  end
+
   # 前月の節入日
   def setsuiri_of_previous_month
     y,m,d,h,i = @birth_dt
@@ -127,6 +160,18 @@ class FourPillarsLogic
     SETSUIRI_HASH[y*100+m] || [0,0]
   end
 
+  # 翌月の節入日
+  def setsuiri_of_next_month
+    y,m,d,h,i = @birth_dt
+    if m == 12
+      y += 1
+      m = 1
+    else
+      m += 1
+    end
+    SETSUIRI_HASH[y*100+m] || [0,0]
+  end
+
   # 生年月に対する節入日時を知っているか？
   # このメソッドがfalseを返す場合、干支、蔵干が仮の節入日で計算されています。
   def know_setsuiri?
@@ -213,20 +258,9 @@ class FourPillarsLogic
 
   # 通変星(nil,月,年)
   def tsuhensei
-    j = JIKKAN.index(kanshi[0][0])
-    if j % 2 == 0 # 陽
-      jikkan = JIKKAN
-    else # 陰
-      jikkan = JIKKAN_IN
-    end
-    j = jikkan.index(kanshi[0][0])
-    j_month = jikkan.index(kanshi[1][0])
-    j_year = jikkan.index(kanshi[2][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
-    [nil,TSUHENSEI[t_month],TSUHENSEI[t_year]]
+    m = FourPillarsLogic::tsuhensei(kanshi[0][0],kanshi[1][0])
+    y = FourPillarsLogic::tsuhensei(kanshi[0][0],kanshi[2][0])
+    [nil,m,y]
   end
 
   # 蔵干通変星
@@ -252,20 +286,10 @@ class FourPillarsLogic
 
   # 十二運星
   def jyuniunsei
-    j = JIKKAN.index(kanshi[0][0])
-    if j % 2 == 0 # 陽
-      jyunishi = JYUNISHI
-    else # 陰
-      jyunishi = JYUNISHI_IN
-    end
-    offset = [1,7,10,10,10,10,7,1,4,4][j] # 十二運表より求めたオフセット
-    j_day = jyunishi.index(kanshi[0][1])
-    j_month = jyunishi.index(kanshi[1][1])
-    j_year = jyunishi.index(kanshi[2][1])
-    u_day = (j_day + offset) % 12
-    u_month = (j_month + offset) % 12
-    u_year = (j_year + offset) % 12
-    [JYUNIUNSEI[u_day],JYUNIUNSEI[u_month],JYUNIUNSEI[u_year]]
+    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]
   end
 
   def jyuniunsei_energy
@@ -318,9 +342,10 @@ class FourPillarsLogic
     # 日柱の十干と月柱の十二支
     x = JIKKAN.index(kanshi[0][0])
     y = JYUNISHI.index(kanshi[1][1])
-    SHUGOSHIN[y][x]
+    SHUGOSHIN[y][x].split("")
   end
 
+  # 宿命中殺
   def shukumei
     s = []
     t = kuubou # 天中殺 0:上段, 1:下段
@@ -340,6 +365,132 @@ class FourPillarsLogic
     s += ["日座中殺"] if f
     return s
   end
+
+  def equivalent_kanshi(only_jikkan=false)
+    if only_jikkan
+      k = kanshi.map {|v| v[0] } # 日,月,年柱の十干
+    else
+      k = kanshi
+    end
+    if k[0] == k[1] && k[1] == k[2]
+      return [[0,1],[0,2],[1,2]]
+    elsif k[0] == k[1]
+      return [[0,1]]
+    elsif k[0] == k[2]
+      return [[0,2]]
+    elsif k[1] == k[2]
+      return [[1,2]]
+    else
+      return []
+    end
+  end
+
+  def on_distance?(j1,j2,d=6)
+    i = JYUNISHI.index(j1)
+    return j2 == JYUNISHI[(i+d) % 12]
+  end
+
+  # 律音
+  def ricchin
+    # 干支(十干・十二支)が同じ
+    equivalent_kanshi(false)
+  end
+
+  # 納音
+  def nacchin
+    # 十干が同じで十二支が 沖 の関係にある
+    v = []
+    eq = equivalent_kanshi(true)
+    eq.each do |e|
+      k0 = kanshi[e[0]][1]
+      k1 = kanshi[e[1]][1]
+      v += [e] if on_distance?(k0,k1,6)
+    end
+    return v
+  end
+
+  # 宿命大半会
+  def shukumei_daihankai
+    # 十干が同じで十二支が三合会局の関係にある
+    v = []
+    eq = equivalent_kanshi(true)
+    eq.each do |e|
+      k0 = kanshi[e[0]][1]
+      k1 = kanshi[e[1]][1]
+      v += [e] if on_distance?(k0,k1,4)
+    end
+    eq.each do |e|
+      k0 = kanshi[e[0]][1]
+      k1 = kanshi[e[1]][1]
+      v += [e] if on_distance?(k0,k1,8)
+    end
+    return v
+  end
+
+  # 大運 [順行 or 逆行, year] or [nil,nil](if gender is not male nor female)
+  def taiun
+    return [nil,nil] unless ['m','f'].include? @gender
+    k = gogyo_jikkan[2][0]
+    t = @birth_dt[3] * 60 + @birth_dt[4] # 生まれた時間
+    if (@gender == 'm' && k == "+") || (@gender == 'f' && k == '-')
+      order = "順行"
+      d = setsuiri[0] - birth_dt[2]
+      if d > 0 # A 生まれた日が節入り前の場合 (節入り日―誕生日＋１)÷３
+        year = ((d + 1) / 3.0).round
+      elsif d == 0 # 節入り日
+        #〈順行〉節入時間「前」=1年  「後」=10年
+        if t <= setsuiri[1]
+          year = 1
+        else
+          year = 10
+        end
+      else # B 生まれた日が節入り後の場合  (誕生月の日数―誕生日＋１＋翌月の節入り日)÷３
+        s = days_of_current_month - birth_dt[2] + 1 + setsuiri_of_next_month[0]
+        year = (s / 3.0).round
+      end
+    else
+      order = "逆行"
+      if setsuiri?
+        #〈逆行〉節入時間「前」=10年 「後」=1年
+        if t < setsuiri[1]
+          year = 10
+        else
+          year = 1
+        end
+      else
+        year = (zokan_number / 3.0).round
+      end
+    end
+    return [order,year]
+  end
+
+  def taiun_table
+    order,year = taiun
+    return [] if order.nil?
+    d = order == '順行' ? 1 : -1
+    j_day = kanshi[0][0] # 日柱の十干
+    k = kanshi_as_number[1] - 1 # 月柱の干支番号
+    rows = []
+    # [0,1,"癸亥","偏印","死",2]
+    y1, y2 = 0, year
+    8.times do |i|
+      k_month = KANSHI_ARRAY[k] # 月柱の干支
+      t = FourPillarsLogic::tsuhensei(j_day,k_month[0])
+      j = FourPillarsLogic::jyuniunsei(j_day,k_month[1])
+      je = JYUNIUNSEI_ENERGY[j]
+      rows += [[y1,y2,k_month,t,j,je]]
+      if y1 == 0
+        y1 = year
+      else
+        y1 += 10
+      end
+      y2 += 10
+      k += d
+      k = 59 if k < 0
+      k = 0 if k > 59
+    end
+    return rows
+  end
 end
 
 if __FILE__ == $0

metadata

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