lxm_front/lunar-javascript
1
0
Fork 0
mirror of synced 2025-12-16 18:18:02 +08:00
Code Issues Projects Releases Wiki Activity

v1.2.23 优化算法。

Browse Source
This commit is contained in:
6tail
2022-01-07 20:31:14 +08:00
parent 004899148d
commit 9bfb4ea312
2 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lunar.js
View File

@@ -1209,18 +1209,8 @@
if (index != LunarUtil.getJiaZiIndex(this.getYearInGanZhi()) + 1) { if (index != LunarUtil.getJiaZiIndex(this.getYearInGanZhi()) + 1) {
yearOffset = -1; yearOffset = -1;
} }
var n = 65;
var yuan = Math.floor((this._p.year + yearOffset + 2696) / 60) % 3; var yuan = Math.floor((this._p.year + yearOffset + 2696) / 60) % 3;
switch(yuan){ var offset = (62 + yuan * 3 - index) % 9;
case 2:
n = 68;
break;
case 0:
n = 62;
break;
default:
}
var offset = (n - index) % 9;
if(0 === offset){ if(0 === offset){
offset = 9; offset = 9;
} }
@@ -2130,6 +2120,8 @@
jieQiJulianDays: [] jieQiJulianDays: []
}, },
getYear:function(){return this._p.year;}, getYear:function(){return this._p.year;},
getGanIndex:function(){return this._p.ganIndex;},
getZhiIndex:function(){return this._p.zhiIndex;},
getGan:function(){return LunarUtil.GAN[this._p.ganIndex+1];}, getGan:function(){return LunarUtil.GAN[this._p.ganIndex+1];},
getZhi:function(){return LunarUtil.ZHI[this._p.zhiIndex+1];}, getZhi:function(){return LunarUtil.ZHI[this._p.zhiIndex+1];},
getGanZhi:function(){return this.getGan()+this.getZhi();}, getGanZhi:function(){return this.getGan()+this.getZhi();},
@@ -2216,22 +2208,13 @@
return _YUN[Math.floor((this._p.year+2696)/20)%9]+'运'; return _YUN[Math.floor((this._p.year+2696)/20)%9]+'运';
}, },
getNineStar:function(){ getNineStar:function(){
var index = LunarUtil.getJiaZiIndex(this.getGanZhi())+1; var index = LunarUtil.getJiaZiIndex(this.getGanZhi()) + 1;
var n = 65; var yuan = Math.floor((this._p.year + 2696) / 60) % 3;
switch(this.getYuan()){ var offset = (62 + yuan * 3 - index) % 9;
case '中元': if(0 === offset){
n = 68; offset = 9;
break;
case '下元':
n = 62;
break;
default:
} }
var offset = (n-index)%9; return NineStar.fromIndex(offset - 1);
if(0===offset){
offset=9;
}
return NineStar.fromIndex(offset-1);
}, },
getPositionXi:function(){ getPositionXi:function(){
return LunarUtil.POSITION_XI[this._p.ganIndex+1]; return LunarUtil.POSITION_XI[this._p.ganIndex+1];
@@ -2415,23 +2398,19 @@
getPositionTaiSuiDesc:function(){ getPositionTaiSuiDesc:function(){
return LunarUtil.POSITION_DESC[this.getPositionTaiSui()]; return LunarUtil.POSITION_DESC[this.getPositionTaiSui()];
}, },
getMonthNineStar:function(){ getNineStar:function(){
var n = 12; var index = LunarYear.fromYear(this._p.year).getZhiIndex() % 3;
var yearZhi = LunarYear.fromYear(this._p.year).getZhi();
if ('子午卯酉'.indexOf(yearZhi)>-1) {
n = 18;
} else if ('辰戌丑未'.indexOf(yearZhi)>-1) {
n = 15;
}
var m = this._p.month; var m = this._p.month;
if(m<0){ if (m < 0) {
m = -m; m = -m;
} }
var offset = (n-m)%9; var monthZhiIndex = (13 + m) % 12;
if(0===offset){ var n = 27 - (index * 3);
offset=9; if (monthZhiIndex < LunarUtil.BASE_MONTH_ZHI_INDEX) {
n -= 3;
} }
return NineStar.fromIndex(offset-1); var offset = (n - monthZhiIndex) % 9;
return NineStar.fromIndex(offset);
}, },
toString:function(){return this.getYear()+'年'+(this.isLeap()?'闰':'')+LunarUtil.MONTH[Math.abs(this.getMonth())]+'月('+this.getDayCount()+')天';} toString:function(){return this.getYear()+'年'+(this.isLeap()?'闰':'')+LunarUtil.MONTH[Math.abs(this.getMonth())]+'月('+this.getDayCount()+')天';}
}; };

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "lunar-javascript", "name": "lunar-javascript",
"version": "1.2.22", "version": "1.2.23",
"description": "lunar is a calendar library for Solar and Chinese Lunar.", "description": "lunar is a calendar library for Solar and Chinese Lunar.",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {