four-pillars 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6eefa515e7dfb952f9bdbe39d8b13c98f7877fe2c199de4f5194a64d39d1a67
-  data.tar.gz: 2f7d0f8273fb44a68281e921586fc235f54b8e3ea967d4158ba9a2a0f7638ec9
+  metadata.gz: 8cae18ae8469d23ee4f7114902d3bc722621bf2d6b09392968ad8854d4f8676a
+  data.tar.gz: 30ff71bb5aa3e3cdf255fbef1e1d99e76656673cdf49e5a3b2bb8222ebbab576
 SHA512:
-  metadata.gz: 2d642d0f265a32094ac7c52463cb87262ef3b24618a76aeeff267fb58c734a5a7bd1e54c16968db943e4f8a3617c3521b6ed6117ba6fb2ab23e4b935f5caaee3
-  data.tar.gz: 79f754b9f7f38ba34da0038caca8b4b19c70e5b1bf92756ed543d3bffd55a7bf7cfd377caff3d31a87529a91cf502d86e65059dc47581178fb7204aa03e0d04a
+  metadata.gz: 6a83c3eb9bf581259d968063279c1b9c1904f1eb59ab78df5144fbdbda0364d362afd05073287af5b653dbdf021dd8eab021d3a5c5b980f9af8a6edc8078d810
+  data.tar.gz: 251f178751f795ce3d171e3e61cbcaa36155caa4596649478fb373a7ed1ec5183e6dc32ed4c366c36e51bd0ac39099031c11b5c1e602d3d0adb2510d2e418e4a

data/lib/four-pillars.rb

@@ -84,6 +84,33 @@ 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
 
@@ -231,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
 
   # 蔵干通変星
@@ -270,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
@@ -457,6 +463,33 @@ class FourPillarsLogic
     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 = 0 if k < 0 || 59 < k
+    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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Yosei Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 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