mk_cal_jpl 0.2.6 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/mk_cal_jpl/compute.rb +30 -16
- data/lib/mk_cal_jpl/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 162ca81bf4ccb40c5b84fb2373b968dd7908af3ce749fe44054f33d3ea0edbaa
|
4
|
+
data.tar.gz: 14f6f8073700d9329f1552166488c3cfc7271107e08b23a25a844e97ed10fbdb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 725420d3c04ed928704584a368c09a66140a435f22627b3365c9f23005cf70569b4f30b83a142292ca555a22ba48375624c0a67a8d07f00c07005a00f66f5d53
|
7
|
+
data.tar.gz: de1fbff88637d4ce1ccb00da6f8ba1d6be6f8ffffe426f7aa0722c3971198fc32f1b04f1647bb0afc0716c1f406aadd1a105fe5854715a265d9292b8cff8bf55
|
data/lib/mk_cal_jpl/compute.rb
CHANGED
@@ -156,12 +156,16 @@ module MkCalJpl
|
|
156
156
|
lsun_today = compute_lambda(jd)
|
157
157
|
# 計算対象日の翌日の太陽の黄経
|
158
158
|
lsun_tomorrow = compute_lambda(jd + 1)
|
159
|
+
# ====[ 190919:DEL ]===>
|
159
160
|
# 計算対象日の5日前の太陽の黄経(社日計算用)
|
160
|
-
lsun_before_5 = compute_lambda(jd - 5)
|
161
|
+
#lsun_before_5 = compute_lambda(jd - 5)
|
162
|
+
# <===[ 190919:DEL ]====
|
161
163
|
# 計算対象日の4日前の太陽の黄経(社日計算用)
|
162
164
|
lsun_before_4 = compute_lambda(jd - 4)
|
165
|
+
# ====[ 190919:DEL ]===>
|
163
166
|
# 計算対象日の5日後の太陽の黄経(社日計算用)
|
164
|
-
lsun_after_5 = compute_lambda(jd + 5)
|
167
|
+
#lsun_after_5 = compute_lambda(jd + 5)
|
168
|
+
# <===[ 190919:DEL ]====
|
165
169
|
# 計算対象日の6日後の太陽の黄経(社日計算用)
|
166
170
|
lsun_after_6 = compute_lambda(jd + 6)
|
167
171
|
# 太陽の黄経の整数部分( 土用, 入梅, 半夏生 計算用 )
|
@@ -205,14 +209,19 @@ module MkCalJpl
|
|
205
209
|
if compute_sekki_24(jd + 5) == "春分"
|
206
210
|
# 春分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
|
207
211
|
# 0度(360度)以上なら、春分点が午前と判断
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
# 春分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
|
213
|
-
# 0度(360度)未満なら、春分点が午後と判断
|
214
|
-
zassetsu << 4 if (lsun_before_4 + lsun_before_5 + 360) / 2.0 < 360
|
212
|
+
# ====[ 190919:UPD ]===>
|
213
|
+
#zassetsu << 4 if (lsun_after_5 + lsun_after_6 + 360) / 2.0 >= 360
|
214
|
+
zassetsu << 4
|
215
|
+
# <===[ 190919:UPD ]===~
|
215
216
|
end
|
217
|
+
# ====[ 190919:DEL ]===>
|
218
|
+
## [ 5日前 ]
|
219
|
+
#if compute_sekki_24(jd - 5) == "春分"
|
220
|
+
# # 春分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
|
221
|
+
# # 0度(360度)未満なら、春分点が午後と判断
|
222
|
+
# zassetsu << 4 if (lsun_before_4 + lsun_before_5 + 360) / 2.0 < 360
|
223
|
+
#end
|
224
|
+
# <===[ 190919:DEL ]===~
|
216
225
|
end
|
217
226
|
# 5:土用入(春) ( 黄経(太陽) = 27度 )
|
218
227
|
unless lsun_today0 == lsun_tomorrow0
|
@@ -270,14 +279,19 @@ module MkCalJpl
|
|
270
279
|
if compute_sekki_24(jd + 5) == "秋分"
|
271
280
|
# 秋分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
|
272
281
|
# 180度以上なら、秋分点が午前と判断
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
# 秋分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
|
278
|
-
# 180度未満なら、秋分点が午後と判断
|
279
|
-
zassetsu << 15 if (lsun_before_4 + lsun_before_5) / 2.0 < 180
|
282
|
+
# ====[ 190919:UPD ]===>
|
283
|
+
#zassetsu << 15 if (lsun_after_5 + lsun_after_6) / 2.0 >= 180
|
284
|
+
zassetsu << 15
|
285
|
+
# <===[ 190919:UPD ]====
|
280
286
|
end
|
287
|
+
# ====[ 190919:DEL ]===>
|
288
|
+
## [ 5日前 ]
|
289
|
+
#if compute_sekki_24(jd - 5) == "秋分"
|
290
|
+
# # 秋分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
|
291
|
+
# # 180度未満なら、秋分点が午後と判断
|
292
|
+
# zassetsu << 15 if (lsun_before_4 + lsun_before_5) / 2.0 < 180
|
293
|
+
#end
|
294
|
+
# <===[ 190919:DEL ]====
|
281
295
|
end
|
282
296
|
# 16:土用入(秋) ( 黄経(太陽) = 207度 )
|
283
297
|
unless lsun_today0 == lsun_tomorrow0
|
data/lib/mk_cal_jpl/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mk_cal_jpl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- komasaru
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-09-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mk_apos
|
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
128
128
|
- !ruby/object:Gem::Version
|
129
129
|
version: '0'
|
130
130
|
requirements: []
|
131
|
-
rubygems_version: 3.0.
|
131
|
+
rubygems_version: 3.0.6
|
132
132
|
signing_key:
|
133
133
|
specification_version: 4
|
134
134
|
summary: Calendar library including Japan's old-calendar, using JPL DE430.
|