four-pillars 0.1.7 → 0.1.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/four-pillars.rb +11 -6
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3b752a4fd5772f51f9e52f6ab16e73ad42f44b62fe4f2f054e92f970149198eb
4
- data.tar.gz: e0c672183c4899d6081151d5c454a51b0ada0e4896280f954e8b3a30560f6387
3
+ metadata.gz: 6661078196b447ada01fff77f6318bd22dbf5820412e7ba3f62b5fa1f5c53fd1
4
+ data.tar.gz: 975caa949f0bfbe47b3d2b170b92f6eb64fcae50928d7be21099b4b55793a35a
5
5
  SHA512:
6
- metadata.gz: 53e3160379f66a383cdb6d9ac16b5dd360c56341e8cd5a860906bd4149ee2ff6f36bc57a82a76c8f89c1f2f7fc9ba0623142cd04fb84d920557a1ce346c35a0d
7
- data.tar.gz: e6f4931e6fa5ebee31103d2961436394ebafa393b2a0f97d35acdcebfd48873189836cd9e6cc3d1986ec2a585db46129a0dcc81c4a772367a5fe2c4aad76ba7f
6
+ metadata.gz: bdbc3dd26e68999d5a933ddf1895eda9ccf7bce7676a59b6e31ef6b16131d0d76ddb2aee56b24bd081cd25f6e55e926e762508047b56dbba0aed1074cb157fcc
7
+ data.tar.gz: 2f6e174e5bad2dc1669404b89f9eb2329f74ba926498b4a0bf56b8da4ac48678f1e5b22660023ff542053d0b8b7317402df8a0a9978e58b54c27daa2b93d6a29
data/lib/four-pillars.rb CHANGED
@@ -14,9 +14,9 @@ class FourPillarsLogic
14
14
  ["庚丁壬","癸丙","壬甲","甲庚","甲丙癸","丙甲癸","甲丁","壬甲","甲庚","丙甲辛"],
15
15
  ["癸庚丁","癸辛","壬庚","甲庚","甲癸丙","癸丙辛","壬戊丙","壬癸甲","壬庚辛","辛壬"],
16
16
  ["癸丁庚","癸丙","壬庚","壬庚","壬甲丙","癸丙辛","壬癸庚","壬癸乙","癸庚辛","辛壬"],
17
- ["癸","癸丙甲","壬庚","甲壬","丙癸甲","癸丙","丁甲","壬甲庚","辛甲","辛壬癸"],
17
+ ["癸","癸丙甲","壬庚","甲壬","癸丙甲","癸丙","丁甲","壬甲庚","辛甲","辛壬癸"],
18
18
  ["庚丁壬","丙癸","壬戊","甲庚丙","丙癸甲","丙癸","丁甲","壬甲","戊丁","丁甲"],
19
- ["癸庚丁甲","丙癸","壬","甲庚丙","丙癸","丙癸","丁甲丙","壬","甲庚","辛丙"],
19
+ ["庚丁丙癸","丙癸","壬","甲庚丙","丙癸","丙癸","丁甲丙","壬","甲庚","辛丙"],
20
20
  ["癸庚丁甲","癸辛甲","甲壬","甲庚","甲丙癸","甲丙","甲壬","壬甲","甲丙戊","辛甲癸"],
21
21
  ["癸丁丙戊","丙戊","甲戊庚","甲庚","甲丙","丙甲戊","丁甲丙","壬丙","戊丙庚","辛戊"]]
22
22
 
@@ -86,8 +86,7 @@ class FourPillarsLogic
86
86
 
87
87
  # 通変星
88
88
  def self.tsuhensei(j_day,j_src) # 日柱の十干、月柱または年柱の十干
89
- j = JIKKAN.index(j_day)
90
- if j % 2 == 0 # 陽
89
+ if plus_jikkan?(j_day) # 陽
91
90
  jikkan = JIKKAN
92
91
  else # 陰
93
92
  jikkan = JIKKAN_IN
@@ -109,10 +108,15 @@ class FourPillarsLogic
109
108
  JYUNIUNSEI[(ji + offset) % 12]
110
109
  end
111
110
 
112
- # TODO エネルギー
111
+ # 十干の陰陽 陽:true 陰:false
112
+ def self.plus_jikkan?(jikkan)
113
+ i = JIKKAN.index(jikkan)
114
+ raise "Invalid jikkan: #{jikkan}" if i.nil?
115
+ return i % 2 == 0
116
+ end
113
117
 
114
118
  # 生年月日時間, 性別(大運の向きに使用)
115
- attr_reader :birth_dt,:gender
119
+ attr_reader :birth_dt, :gender
116
120
 
117
121
  def initialize(birth_dt,gender)
118
122
  @birth_dt = birth_dt.map {|v| v.to_i }
@@ -292,6 +296,7 @@ class FourPillarsLogic
292
296
  [d,m,y]
293
297
  end
294
298
 
299
+ # 十二運星エネルギー
295
300
  def jyuniunsei_energy
296
301
  jyuniunsei.map {|v| JYUNIUNSEI_ENERGY[v] }
297
302
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: four-pillars
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.7
4
+ version: 0.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yosei Ito
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-19 00:00:00.000000000 Z
11
+ date: 2022-11-03 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: A class which tells fortune by Four Pillar astrology(四柱推命).
14
14
  email: y-itou@lumber-mill.co.jp
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
37
37
  - !ruby/object:Gem::Version
38
38
  version: '0'
39
39
  requirements: []
40
- rubygems_version: 3.2.15
40
+ rubygems_version: 3.3.7
41
41
  signing_key:
42
42
  specification_version: 4
43
43
  summary: Four Pillar astrology