four-pillars 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d987f64867a28d0a64cea6886aee79a61476b53c1cf91c93559da858f59227
-  data.tar.gz: d7f44a5de0f4964f10b5b6e5c0c675fb4af548dfb311e294816df976f2abcea8
+  metadata.gz: 3b752a4fd5772f51f9e52f6ab16e73ad42f44b62fe4f2f054e92f970149198eb
+  data.tar.gz: e0c672183c4899d6081151d5c454a51b0ada0e4896280f954e8b3a30560f6387
 SHA512:
-  metadata.gz: 536e40e55e5048294c7860db6248c7952ad4fab6df5744e94d08ed9268f991b3e26c064d63dd153eba058ab702ebab45413da8d3bf6e49627ec135d59a973f33
-  data.tar.gz: 599bf9f4f3f340d1869ae934229c544afab4d9a0a20c4d6ea9096d83175790ee6947c0a203f6518cf466cbb4fd63b584639cdabb4666eb4c07c8779440720275
+  metadata.gz: 53e3160379f66a383cdb6d9ac16b5dd360c56341e8cd5a860906bd4149ee2ff6f36bc57a82a76c8f89c1f2f7fc9ba0623142cd04fb84d920557a1ce346c35a0d
+  data.tar.gz: e6f4931e6fa5ebee31103d2961436394ebafa393b2a0f97d35acdcebfd48873189836cd9e6cc3d1986ec2a585db46129a0dcc81c4a772367a5fe2c4aad76ba7f

data/lib/four-pillars.rb

@@ -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
@@ -313,11 +337,159 @@ class FourPillarsLogic
     return arr
   end
 
+  # 守護神
   def shugoshin
     # 日柱の十干と月柱の十二支
     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:下段
+    k = kanshi.map {|v| v[1] } # 日,月,年柱の干支
+    if t[0].include? k[2]
+      s += ["生年中殺"]
+    end
+    if t[0].include? k[1]
+      s += ["生月中殺"]
+    end
+    if t[1].include? k[0]
+      s += ["生日中殺"]
+    end
+    f = false
+    f = true if kanshi_as_number.include? 11 #甲戌
+    f = true if kanshi_as_number.include? 12 #乙亥
+    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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Yosei Ito
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies: []
 description: A class which tells fortune by Four Pillar astrology(四柱推命).
 email: y-itou@lumber-mill.co.jp
@@ -22,7 +22,7 @@ homepage: https://github.com/lumbermill/four-pillars
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -37,8 +37,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Four Pillar astrology
 test_files: []