diff --git a/LunarSolarConverter.py b/LunarSolarConverter.py new file mode 100644 index 0000000..19b90ae --- /dev/null +++ b/LunarSolarConverter.py @@ -0,0 +1,222 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# @Time : 2017/12/11 11:08 +# @Author : zhm +# @File : LunarSolarConverter.py +# @Software: PyCharm +from pprint import pprint + + +class Lunar: + def __init__(self, lunarYear, lunarMonth, lunarDay, isleap): + self.isleap = isleap + self.lunarDay = lunarDay + self.lunarMonth = lunarMonth + self.lunarYear = lunarYear + + +class Solar: + def __init__(self, solarYear, solarMonth, solarDay): + self.solarDay = solarDay + self.solarMonth = solarMonth + self.solarYear = solarYear + + +def GetBitInt(data, length, shift): + return (data & (((1 << length) - 1) << shift)) >> shift + + +def SolarToInt(y, m, d): + m = (m + 9) % 12 + y -= m / 10 + return 365 * y + y / 4 - y / 100 + y / 400 + (m * 306 + 5) / 10 + (d - 1) + + +def SolarFromInt(g): + y = (10000 * g + 14780) / 3652425 + ddd = g - (365 * y + y / 4 - y / 100 + y / 400) + if ddd < 0: + y -= 1 + ddd = g - (365 * y + y / 4 - y / 100 + y / 400) + + mi = (100 * ddd + 52) / 3060 + mm = (mi + 2) % 12 + 1 + y += (mi + 2) / 12 + dd = ddd - (mi * 306 + 5) / 10 + 1 + solar = Solar(y, mm, dd) + return solar + + +class LunarSolarConverter: + ##################################################################################### + # 1888~2111年农历数据表 + # 农历数据 每个元素的存储格式如下: + # 16~13 12 11~0 + # 闰几月 闰月日数 1~12月份农历日数(大小月) + # 注:1、bit0表示农历1月份日数,为1表示30天,为0表示29天。bit1表示农历2月份日数,依次类推。 + # 2、bit12表示闰月日数,1为30天,0为29天。bit16~bit13表示第几月是闰月(注:为0表示该年无闰月) + # 数据来源参考: http://data.weather.gov.hk/gts/time/conversion1_text_c.htm + ##################################################################################### + lunar_month_days = [1887, 0x1694, 0x16aa, 0x4ad5, 0xab6, 0xc4b7, 0x4ae, 0xa56, 0xb52a, + 0x1d2a, 0xd54, 0x75aa, 0x156a, 0x1096d, 0x95c, 0x14ae, 0xaa4d, 0x1a4c, 0x1b2a, 0x8d55, + 0xad4, 0x135a, 0x495d, + 0x95c, 0xd49b, 0x149a, 0x1a4a, 0xbaa5, 0x16a8, 0x1ad4, 0x52da, 0x12b6, 0xe937, 0x92e, + 0x1496, 0xb64b, 0xd4a, + 0xda8, 0x95b5, 0x56c, 0x12ae, 0x492f, 0x92e, 0xcc96, 0x1a94, 0x1d4a, 0xada9, 0xb5a, 0x56c, + 0x726e, 0x125c, + 0xf92d, 0x192a, 0x1a94, 0xdb4a, 0x16aa, 0xad4, 0x955b, 0x4ba, 0x125a, 0x592b, 0x152a, + 0xf695, 0xd94, 0x16aa, + 0xaab5, 0x9b4, 0x14b6, 0x6a57, 0xa56, 0x1152a, 0x1d2a, 0xd54, 0xd5aa, 0x156a, 0x96c, + 0x94ae, 0x14ae, 0xa4c, + 0x7d26, 0x1b2a, 0xeb55, 0xad4, 0x12da, 0xa95d, 0x95a, 0x149a, 0x9a4d, 0x1a4a, 0x11aa5, + 0x16a8, 0x16d4, + 0xd2da, 0x12b6, 0x936, 0x9497, 0x1496, 0x1564b, 0xd4a, 0xda8, 0xd5b4, 0x156c, 0x12ae, + 0xa92f, 0x92e, 0xc96, + 0x6d4a, 0x1d4a, 0x10d65, 0xb58, 0x156c, 0xb26d, 0x125c, 0x192c, 0x9a95, 0x1a94, 0x1b4a, + 0x4b55, 0xad4, + 0xf55b, 0x4ba, 0x125a, 0xb92b, 0x152a, 0x1694, 0x96aa, 0x15aa, 0x12ab5, 0x974, 0x14b6, + 0xca57, 0xa56, 0x1526, + 0x8e95, 0xd54, 0x15aa, 0x49b5, 0x96c, 0xd4ae, 0x149c, 0x1a4c, 0xbd26, 0x1aa6, 0xb54, + 0x6d6a, 0x12da, 0x1695d, + 0x95a, 0x149a, 0xda4b, 0x1a4a, 0x1aa4, 0xbb54, 0x16b4, 0xada, 0x495b, 0x936, 0xf497, + 0x1496, 0x154a, 0xb6a5, + 0xda4, 0x15b4, 0x6ab6, 0x126e, 0x1092f, 0x92e, 0xc96, 0xcd4a, 0x1d4a, 0xd64, 0x956c, + 0x155c, 0x125c, 0x792e, + 0x192c, 0xfa95, 0x1a94, 0x1b4a, 0xab55, 0xad4, 0x14da, 0x8a5d, 0xa5a, 0x1152b, 0x152a, + 0x1694, 0xd6aa, + 0x15aa, 0xab4, 0x94ba, 0x14b6, 0xa56, 0x7527, 0xd26, 0xee53, 0xd54, 0x15aa, 0xa9b5, 0x96c, + 0x14ae, 0x8a4e, + 0x1a4c, 0x11d26, 0x1aa4, 0x1b54, 0xcd6a, 0xada, 0x95c, 0x949d, 0x149a, 0x1a2a, 0x5b25, + 0x1aa4, 0xfb52, + 0x16b4, 0xaba, 0xa95b, 0x936, 0x1496, 0x9a4b, 0x154a, 0x136a5, 0xda4, 0x15ac] + # 额外添加数据,方便快速计算阴历转阳历 每个元素的存储格式如下: + # 12~7 6~5 4~0 + # 离元旦多少天 春节月 春节日 + ##################################################################################### + solar_1_1 = [1887, 0xec04c, 0xec23f, 0xec435, 0xec649, 0xec83e, 0xeca51, 0xecc46, 0xece3a, + 0xed04d, 0xed242, 0xed436, 0xed64a, 0xed83f, 0xeda53, 0xedc48, 0xede3d, 0xee050, 0xee244, 0xee439, + 0xee64d, + 0xee842, 0xeea36, 0xeec4a, 0xeee3e, 0xef052, 0xef246, 0xef43a, 0xef64e, 0xef843, 0xefa37, 0xefc4b, + 0xefe41, + 0xf0054, 0xf0248, 0xf043c, 0xf0650, 0xf0845, 0xf0a38, 0xf0c4d, 0xf0e42, 0xf1037, 0xf124a, 0xf143e, + 0xf1651, + 0xf1846, 0xf1a3a, 0xf1c4e, 0xf1e44, 0xf2038, 0xf224b, 0xf243f, 0xf2653, 0xf2848, 0xf2a3b, 0xf2c4f, + 0xf2e45, + 0xf3039, 0xf324d, 0xf3442, 0xf3636, 0xf384a, 0xf3a3d, 0xf3c51, 0xf3e46, 0xf403b, 0xf424e, 0xf4443, + 0xf4638, + 0xf484c, 0xf4a3f, 0xf4c52, 0xf4e48, 0xf503c, 0xf524f, 0xf5445, 0xf5639, 0xf584d, 0xf5a42, 0xf5c35, + 0xf5e49, + 0xf603e, 0xf6251, 0xf6446, 0xf663b, 0xf684f, 0xf6a43, 0xf6c37, 0xf6e4b, 0xf703f, 0xf7252, 0xf7447, + 0xf763c, + 0xf7850, 0xf7a45, 0xf7c39, 0xf7e4d, 0xf8042, 0xf8254, 0xf8449, 0xf863d, 0xf8851, 0xf8a46, 0xf8c3b, + 0xf8e4f, + 0xf9044, 0xf9237, 0xf944a, 0xf963f, 0xf9853, 0xf9a47, 0xf9c3c, 0xf9e50, 0xfa045, 0xfa238, 0xfa44c, + 0xfa641, + 0xfa836, 0xfaa49, 0xfac3d, 0xfae52, 0xfb047, 0xfb23a, 0xfb44e, 0xfb643, 0xfb837, 0xfba4a, 0xfbc3f, + 0xfbe53, + 0xfc048, 0xfc23c, 0xfc450, 0xfc645, 0xfc839, 0xfca4c, 0xfcc41, 0xfce36, 0xfd04a, 0xfd23d, 0xfd451, + 0xfd646, + 0xfd83a, 0xfda4d, 0xfdc43, 0xfde37, 0xfe04b, 0xfe23f, 0xfe453, 0xfe648, 0xfe83c, 0xfea4f, 0xfec44, + 0xfee38, + 0xff04c, 0xff241, 0xff436, 0xff64a, 0xff83e, 0xffa51, 0xffc46, 0xffe3a, 0x10004e, 0x100242, + 0x100437, + 0x10064b, 0x100841, 0x100a53, 0x100c48, 0x100e3c, 0x10104f, 0x101244, 0x101438, 0x10164c, + 0x101842, 0x101a35, + 0x101c49, 0x101e3d, 0x102051, 0x102245, 0x10243a, 0x10264e, 0x102843, 0x102a37, 0x102c4b, + 0x102e3f, 0x103053, + 0x103247, 0x10343b, 0x10364f, 0x103845, 0x103a38, 0x103c4c, 0x103e42, 0x104036, 0x104249, + 0x10443d, 0x104651, + 0x104846, 0x104a3a, 0x104c4e, 0x104e43, 0x105038, 0x10524a, 0x10543e, 0x105652, 0x105847, + 0x105a3b, 0x105c4f, + 0x105e45, 0x106039, 0x10624c, 0x106441, 0x106635, 0x106849, 0x106a3d, 0x106c51, 0x106e47, + 0x10703c, 0x10724f, + 0x107444, 0x107638, 0x10784c, 0x107a3f, 0x107c53, 0x107e48] + + def LunarToSolar(self, lunar): + days = LunarSolarConverter.lunar_month_days[lunar.lunarYear - LunarSolarConverter.lunar_month_days[0]] + leap = GetBitInt(days, 4, 13) + offset = 0 + loopend = leap + if not lunar.isleap: + + if lunar.lunarMonth <= leap or leap == 0: + + loopend = lunar.lunarMonth - 1 + + else: + + loopend = lunar.lunarMonth + + for i in range(0, loopend): + offset += GetBitInt(days, 1, 12 - i) == 1 and 30 or 29 + + offset += lunar.lunarDay + + solar11 = LunarSolarConverter.solar_1_1[lunar.lunarYear - LunarSolarConverter.solar_1_1[0]] + + y = GetBitInt(solar11, 12, 9) + m = GetBitInt(solar11, 4, 5) + d = GetBitInt(solar11, 5, 0) + + return SolarFromInt(SolarToInt(y, m, d) + offset - 1) + + def SolarToLunar(self, solar): + + lunar = Lunar(0, 0, 0, False) + index = solar.solarYear - LunarSolarConverter.solar_1_1[0] + data = (solar.solarYear << 9) | (solar.solarMonth << 5) | solar.solarDay + if LunarSolarConverter.solar_1_1[index] > data: + index -= 1 + + solar11 = LunarSolarConverter.solar_1_1[index] + y = GetBitInt(solar11, 12, 9) + m = GetBitInt(solar11, 4, 5) + d = GetBitInt(solar11, 5, 0) + offset = SolarToInt(solar.solarYear, solar.solarMonth, solar.solarDay) - SolarToInt(y, m, d) + + days = LunarSolarConverter.lunar_month_days[index] + leap = GetBitInt(days, 4, 13) + + lunarY = index + LunarSolarConverter.solar_1_1[0] + lunarM = 1 + offset += 1 + + for i in range(0, 13): + + dm = GetBitInt(days, 1, 12 - i) == 1 and 30 or 29 + if offset > dm: + + lunarM += 1 + offset -= dm + + else: + + break + + lunarD = int(offset) + lunar.lunarYear = lunarY + lunar.lunarMonth = lunarM + lunar.isleap = False + if leap != 0 and lunarM > leap: + + lunar.lunarMonth = lunarM - 1 + if lunarM == leap + 1: + lunar.isleap = True + + lunar.lunarDay = lunarD + return lunar + + def __init__(self): + pass + + +if __name__ == '__main__': + converter = LunarSolarConverter() + solar = Solar(2111, 1, 25) + pprint(vars(solar)) + lunar = converter.SolarToLunar(solar) + pprint(vars(lunar)) + solar = converter.LunarToSolar(lunar) + pprint(vars(solar)) + print(len(converter.solar_1_1)) + print("Done") \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..0a36923 --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +## 说明: +Time-NLP的python3版本,由于原作者sunfiyes的是python2版本,无法在python3上使用,故修改部分代码,使其可在Python3上使用(本人新手,可能有bug) +原项目地址:https://github.com/sunfiyes/Time-NLPY + +## 安装方式: +1) cd到当前目录 +2) python setup.py install + +PS~ : +window下可能出现安装regex错误,可到 +https://www.lfd.uci.edu/~gohlke/pythonlibs/#regex +下载对应版本的regex手动安装。 + +## 使用方法 +将中文时间描述转换为三种标准的时间格式的时间字符串: +1) 时间点(timestamp,表示某一具体时间时间描述); +2) 时间量(timedelta,表示时间的增量的时间描述); +3) 时间区间(timespan,有具体起始和结束时间点的时间区间)。 +调用示例见Test.py + +关于节假日的增加方法: +1) 在resource目录下的holi_lunar(阴历)或holi_solar(阳历)文件内按照格式加入新增的节日名称和日期 +2) 在resource目录下的regex.txt文件内加入相应节日的正则匹配,并删除regex.pkl缓存文件 +3) 在TimeUnit类中的norm_setHoliday方法同样加入节日的正则匹配 \ No newline at end of file diff --git a/RangeTimeEnum.py b/RangeTimeEnum.py new file mode 100644 index 0000000..7040102 --- /dev/null +++ b/RangeTimeEnum.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# @Time : 2017/11/20 16:27 +# @Author : zhm +# @File : RangeTimeEnum.py +# @Software: PyCharm + + + +# 范围时间的默认时间点 +class RangeTimeEnum(): + day_break = 3 # 黎明 + early_morning = 8 # 早 + morning = 10 # 上午 + noon = 12 # 中午、午间 + afternoon = 15 # 下午、午后 + night = 18 # 晚上、傍晚 + lateNight = 20 # 晚、晚间 + midNight = 23 # 深夜 + + +if __name__ == "__main__": + print(RangeTimeEnum.afternoon) diff --git a/StringPreHandler.py b/StringPreHandler.py new file mode 100644 index 0000000..2d24c03 --- /dev/null +++ b/StringPreHandler.py @@ -0,0 +1,183 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# @Time : 2017/11/20 15:42 +# @Author : zhm +# @File : StringPreHandler.py +# @Software: PyCharm +import regex as re + +# * 字符串预处理模块,为分析器TimeNormalizer提供相应的字符串预处理服务 +class StringPreHandler: + @classmethod + def delKeyword(cls, target, rules): + """ + 该方法删除一字符串中所有匹配某一规则字串 + 可用于清理一个字符串中的空白符和语气助词 + :param target: 待处理字符串 + :param rules: 删除规则 + :return: 清理工作完成后的字符串 + """ + pattern = re.compile(rules) + res = pattern.sub('', target) + # print res + return res + + + @classmethod + def numberTranslator(cls, target): + """ + 该方法可以将字符串中所有的用汉字表示的数字转化为用阿拉伯数字表示的数字 + 如"这里有一千两百个人,六百零五个来自中国"可以转化为 + "这里有1200个人,605个来自中国" + 此外添加支持了部分不规则表达方法 + 如两万零六百五可转化为20650 + 两百一十四和两百十四都可以转化为214 + 一六零加一五八可以转化为160+158 + 该方法目前支持的正确转化范围是0-99999999 + 该功能模块具有良好的复用性 + :param target: 待转化的字符串 + :return: 转化完毕后的字符串 + """ + pattern = re.compile("[一二两三四五六七八九123456789]万[一二两三四五六七八九123456789](?!(千|百|十))") + match = pattern.finditer(target) + for m in match: + group = m.group() + s = group.split("万") + s = [_f for _f in s if _f] + num = 0 + if len(s) == 2: + num += cls.wordToNumber(s[0]) * 10000 + cls.wordToNumber(s[1]) * 1000 + target = pattern.sub(str(num), target, 1) + + pattern = re.compile("[一二两三四五六七八九123456789]千[一二两三四五六七八九123456789](?!(百|十))") + match = pattern.finditer(target) + for m in match: + group = m.group() + s = group.split("千") + s = [_f for _f in s if _f] + num = 0 + if len(s) == 2: + num += cls.wordToNumber(s[0]) * 1000 + cls.wordToNumber(s[1]) * 100 + target = pattern.sub(str(num), target, 1) + + pattern = re.compile("[一二两三四五六七八九123456789]百[一二两三四五六七八九123456789](?!十)") + match = pattern.finditer(target) + for m in match: + group = m.group() + s = group.split("百") + s = [_f for _f in s if _f] + num = 0 + if len(s) == 2: + num += cls.wordToNumber(s[0]) * 100 + cls.wordToNumber(s[1]) * 10 + target = pattern.sub(str(num), target, 1) + + pattern = re.compile("[零一二两三四五六七八九]") + match = pattern.finditer(target) + for m in match: + target = pattern.sub(str(cls.wordToNumber(m.group())), target, 1) + + pattern = re.compile("(?<=(周|星期))[末天日]") + match = pattern.finditer(target) + for m in match: + target = pattern.sub(str(cls.wordToNumber(m.group())), target, 1) + + pattern = re.compile("(?> file_out, json.dumps(out, indent=2, ensure_ascii=False).encode('utf-8') +# +# with open('resource/holi_lunar.json') as file_out: +# print json.load(file_out) + + +# dset = [] +# with open('C:/Users/zhm/Desktop/test.txt') as testfile: +# for each in testfile: +# dset.append(each) +# +# def run(query): +# tn = TimeNormalizer() +# res = tn.parse(target=query, timeBase='2013-02-28 16:30:29') +# print res +# if __name__ == '__main__': +# while True: +# query = random.choice(dset) +# lp = LineProfiler() +# lp_wrapper = lp(run) +# lp_wrapper(query) +# lp.print_stats() +# cProfile.run("run(query)") + +# with open(os.path.dirname(__file__) + '/resource/regex.txt', 'wb') as f: +# f.write(u'((前|昨|今|明|后)(天|日)?(早|晚)(晨|上|间)?)|(\\d+个?[年月日天][以之]?[前后])|(\\d+个?半?(小时|钟头|h|H))|(半个?(小时|钟头))|(\\d+(分钟|min))|([13]刻钟)|((上|这|本|下)+(周|星期)([一二三四五六七天日]|[1-7])?)|((周|星期)([一二三四五六七天日]|[1-7]))|((早|晚)?([0-2]?[0-9](点|时)半)(am|AM|pm|PM)?)|((早|晚)?(\\d+[::]\\d+([::]\\d+)*)\\s*(am|AM|pm|PM)?)|((早|晚)?([0-2]?[0-9](点|时)[13一三]刻)(am|AM|pm|PM)?)|((早|晚)?(\\d+[时点](\\d+)?分?(\\d+秒?)?)\\s*(am|AM|pm|PM)?)|(大+(前|后)天)|(([零一二三四五六七八九十百千万]+|\\d+)世)|([0-9]?[0-9]?[0-9]{2}\\.((10)|(11)|(12)|([1-9]))\\.((? 0: + days += 365 * self.tp.tunit[0] + if self.tp.tunit[1] > 0: + days += 30 * self.tp.tunit[1] + if self.tp.tunit[2] > 0: + days += self.tp.tunit[2] + tunit = self.tp.tunit + for i in range(3, 6): + if self.tp.tunit[i] < 0: + tunit[i] = 0 + seconds = tunit[3] * 3600 + tunit[4] * 60 + tunit[5] + if seconds == 0 and days == 0: + self.normalizer.invalidSpan = True + self.normalizer.timeSpan = self.genSpan(days, seconds) + return + + time_grid = self.normalizer.timeBase.split('-') + tunitpointer = 5 + while tunitpointer >= 0 and self.tp.tunit[tunitpointer] < 0: + tunitpointer -= 1 + for i in range(0, tunitpointer): + if self.tp.tunit[i] < 0: + self.tp.tunit[i] = int(time_grid[i]) + + self.time = self.genTime(self.tp.tunit) + + def genSpan(self, days, seconds): + day = seconds // (3600*24) + h = (seconds % (3600*24)) // 3600 + m = ((seconds % (3600*24)) % 3600) // 60 + s = ((seconds % (3600*24)) % 3600) % 60 + return str(days+day) + ' days, ' + "%d:%02d:%02d" % (h, m, s) + + def genTime(self, tunit): + time = arrow.get('1970-01-01 00:00:00') + if tunit[0] > 0: + time = time.replace(year=tunit[0]) + if tunit[1] > 0: + time = time.replace(month=tunit[1]) + if tunit[2] > 0: + time = time.replace(day=tunit[2]) + if tunit[3] > 0: + time = time.replace(hour=tunit[3]) + if tunit[4] > 0: + time = time.replace(minute=tunit[4]) + if tunit[5] > 0: + time = time.replace(second=tunit[5]) + return time + + def norm_setyear(self): + """ + 年-规范化方法--该方法识别时间表达式单元的年字段 + :return: + """ + # 一位数表示的年份 + rule = "(? weekday: + cur = cur.shift(days=7) + return cur + + def preferFuture(self, checkTimeIndex): + """ + 如果用户选项是倾向于未来时间,检查checkTimeIndex所指的时间是否是过去的时间,如果是的话,将大一级的时间设为当前时间的+1。 + 如在晚上说“早上8点看书”,则识别为明天早上; + 12月31日说“3号买菜”,则识别为明年1月的3号。 + :param checkTimeIndex: _tp.tunit时间数组的下标 + :return: + """ + # 1. 检查被检查的时间级别之前,是否没有更高级的已经确定的时间,如果有,则不进行处理. + for i in range(0, checkTimeIndex): + if self.tp.tunit[i] != -1: + return + # 2. 根据上下文补充时间 + self.checkContextTime(checkTimeIndex) + # 3. 根据上下文补充时间后再次检查被检查的时间级别之前,是否没有更高级的已经确定的时间,如果有,则不进行倾向处理. + for i in range(0, checkTimeIndex): + if self.tp.tunit[i] != -1: + return + # 4. 确认用户选项 + if not self.normalizer.isPreferFuture: + return + # 5. 获取当前时间,如果识别到的时间小于当前时间,则将其上的所有级别时间设置为当前时间,并且其上一级的时间步长+1 + time_arr = self.normalizer.timeBase.split('-') + cur = arrow.get(self.normalizer.timeBase, "YYYY-M-D-H-m-s") + cur_unit = int(time_arr[checkTimeIndex]) + if cur_unit < self.tp.tunit[checkTimeIndex]: + return + # 准备增加的时间单位是被检查的时间的上一级,将上一级时间+1 + cur = self.addTime(cur, checkTimeIndex - 1) + time_arr = cur.format("YYYY-M-D-H-m-s").split('-') + for i in range(0, checkTimeIndex): + self.tp.tunit[i] = int(time_arr[i]) + # if i == 1: + # self.tp.tunit[i] += 1 + + def checkContextTime(self, checkTimeIndex): + """ + 根据上下文时间补充时间信息 + :param checkTimeIndex: + :return: + """ + for i in range(0, checkTimeIndex): + if self.tp.tunit[i] == -1 and self.tp_origin.tunit[i] != -1: + self.tp.tunit[i] = self.tp_origin.tunit[i] + # 在处理小时这个级别时,如果上文时间是下午的且下文没有主动声明小时级别以上的时间,则也把下文时间设为下午 + if self.isFirstTimeSolveContext is True and checkTimeIndex == 3 and self.tp_origin.tunit[ + checkTimeIndex] >= 12 and self.tp.tunit[checkTimeIndex] < 12: + self.tp.tunit[checkTimeIndex] += 12 + self.isFirstTimeSolveContext = False + + def addTime(self, cur, fore_unit): + if fore_unit == 0: + cur = cur.shift(years=1) + elif fore_unit == 1: + cur = cur.shift(months=1) + elif fore_unit == 2: + cur = cur.shift(days=1) + elif fore_unit == 3: + cur = cur.shift(hours=1) + elif fore_unit == 4: + cur = cur.shift(minutes=1) + elif fore_unit == 5: + cur = cur.shift(seconds=1) + return cur diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..ce9ccd7 --- /dev/null +++ b/__init__.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# @Time : 2017/11/23 13:22 +# @Author : zhm +# @File : __init__.py +# @Software: PyCharm \ No newline at end of file diff --git a/resource/__init__.py b/resource/__init__.py new file mode 100644 index 0000000..065f46b --- /dev/null +++ b/resource/__init__.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# @Time : 2017/12/5 17:29 +# @Author : zhm +# @File : __init__.py +# @Software: PyCharm \ No newline at end of file diff --git a/resource/holi_lunar.json b/resource/holi_lunar.json new file mode 100644 index 0000000..ec58527 --- /dev/null +++ b/resource/holi_lunar.json @@ -0,0 +1,10 @@ +{ + "中和节": "02-02", + "中秋节": "08-15", + "中元节": "07-15", + "端午节": "05-05", + "春节": "01-01", + "元宵节": "01-15", + "重阳节": "09-09", + "七夕节": "07-07" +} diff --git a/resource/holi_solar.json b/resource/holi_solar.json new file mode 100644 index 0000000..729c4b3 --- /dev/null +++ b/resource/holi_solar.json @@ -0,0 +1,15 @@ +{ + "植树节": "03-12", + "圣诞节": "12-25", + "青年节": "05-04", + "教师节": "09-10", + "儿童节": "06-01", + "元旦节": "01-01", + "国庆节": "10-01", + "劳动节": "05-01", + "妇女节": "03-08", + "建军节": "08-01", + "航海日节": "07-11", + "建党节": "07-01", + "记者节": "11-08" +} diff --git a/resource/reg.pkl b/resource/reg.pkl new file mode 100644 index 0000000..0798ac8 Binary files /dev/null and b/resource/reg.pkl differ diff --git a/resource/regex.txt b/resource/regex.txt new file mode 100644 index 0000000..7afef24 --- /dev/null +++ b/resource/regex.txt @@ -0,0 +1 @@ +((前|昨|今|明|后)(天|日)?(早|晚)(晨|上|间)?)|(\d+个?[年月日天][以之]?[前后])|(\d+个?半?(小时|钟头|h|H))|(半个?(小时|钟头))|(\d+(分钟|min))|([13]刻钟)|((上|这|本|下)+(周|星期)([一二三四五六七天日]|[1-7])?)|((周|星期)([一二三四五六七天日]|[1-7]))|((早|晚)?([0-2]?[0-9](点|时)半)(am|AM|pm|PM)?)|((早|晚)?(\d+[::]\d+([::]\d+)*)\s*(am|AM|pm|PM)?)|((早|晚)?([0-2]?[0-9](点|时)[13一三]刻)(am|AM|pm|PM)?)|((早|晚)?(\d+[时点](\d+)?分?(\d+秒?)?)\s*(am|AM|pm|PM)?)|(大+(前|后)天)|(([零一二三四五六七八九十百千万]+|\d+)世)|([0-9]?[0-9]?[0-9]{2}\.((10)|(11)|(12)|([1-9]))\.((?=2017', + 'arrow>=0.10'], + zip_safe=False, + classifiers=[ + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7' + ] +) \ No newline at end of file