Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cf84169

Browse files
author
yuangu
committed
验证反推功能,并完善例子及文档
1 parent 2b7da28 commit cf84169

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

example/main.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,26 @@
8282
else:
8383
print("当天不是节气日")
8484

85+
###==================================================================================
86+
# 四柱反查工具方法
87+
# 实际项目中不要这样子搞哈,因为汉字utf-8,GBK2312不同的编码。建议还是直接使用天干地支的数字索引
88+
def getGZ(gzStr):
89+
tg = -1
90+
dz = -1
91+
for i, v in enumerate(Gan):
92+
if gzStr[0] == v:
93+
tg = i
94+
break
95+
96+
for i, v in enumerate(Zhi):
97+
if gzStr[1] == v:
98+
dz = i
99+
break
100+
return sxtwl.GZ(tg, dz)
101+
###==================================================================================
85102

86103
# 四注反查 分别传的是年天干,月天干,日天干,时天干, 开始查询年,结束查询年 返回满足条件的儒略日数
87-
jds = sxtwl.siZhu2Year(yTG, mTG, dTG, sxtwl.GZ(5, 5), 2003, 2029);
104+
jds = sxtwl.siZhu2Year(getGZ('辛丑'), getGZ('己亥'), getGZ('丙寅'), getGZ('癸巳'), 2003, 2029);
88105
for jd in jds:
89106
t = sxtwl.JD2DD(jd )
90107
print("符合条件的时间:%d-%d-%d %d:%d:%d"%(t.Y, t.M, t.D, t.h, t.m, round(t.s)))

python/README.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ https://pypi.org/project/sxtwl/
2727

2828
### 使用方法
2929

30+
<font color='red'> 注:因为pip上传后不能二次修改,参考事例可能会有错误无法修改,如果发现下面例子不能用,请以为准: [传送门](https://github.com/yuangu/sxtwl_cpp/blob/master/example/main.py) </font>
31+
32+
3033
1. 因为考虑到繁体和简体字的原因,所以本库不以硬编码的形式显示结果。下面是参考的简单索引
3134
```
3235
Gan = ["甲", "乙", "丙", "丁", "戊", "己", "庚", "辛", "壬", "癸"]
@@ -193,8 +196,26 @@ while True:
193196

194197
9. 四柱反查 (好像还有bug,待修复)
195198
```
199+
###==================================================================================
200+
# 四柱反查工具方法
201+
# 实际项目中不要这样子搞哈,因为汉字utf-8,GBK2312不同的编码。建议还是直接使用天干地支的数字索引
202+
def getGZ(gzStr):
203+
tg = -1
204+
dz = -1
205+
for i, v in enumerate(Gan):
206+
if gzStr[0] == v:
207+
tg = i
208+
break
209+
210+
for i, v in enumerate(Zhi):
211+
if gzStr[1] == v:
212+
dz = i
213+
break
214+
return sxtwl.GZ(tg, dz)
215+
###==================================================================================
216+
196217
# 四注反查 分别传的是年天干,月天干,日天干,时天干, 开始查询年,结束查询年 返回满足条件的儒略日数
197-
jds = sxtwl.siZhu2Year(yTG, mTG, dTG, sxtwl.GZ(7, 5), 2003, 2029);
218+
jds = sxtwl.siZhu2Year(getGZ('辛丑'), getGZ('己亥'), getGZ('丙寅'), getGZ('癸巳'), 2003, 2029);
198219
for jd in jds:
199220
t = sxtwl.JD2DD(jd )
200221
print("符合条件的时间:%d-%d-%d %d:%d:%d"%(t.Y, t.M, t.D, t.h, t.m, round(t.s)))

0 commit comments

Comments
 (0)