Commit 58880c7f authored by Koichi Yasuoka's avatar Koichi Yasuoka
Browse files

simplification rule improved

parent 73849bcc
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -36718,7 +36718,8 @@ EOS
EOS
○	s,記号,一般,*,*,*,○,SYM,*,*
EOS
北海	n,名詞,固定物,地名,*,*,北海,PROPN,Case=Loc|NameType=Geo,[place-name]
北	n,名詞,固定物,関係,*,*,北,NOUN,Case=Loc,north
海	n,名詞,固定物,地形,*,*,海,NOUN,Case=Loc,sea
太	v,動詞,描写,量,*,*,太,VERB,Degree=Pos,very-great
守	n,名詞,人,役割,*,*,守,NOUN,*,guard
朱	n,名詞,人,姓氏,*,*,朱,PROPN,NameType=Sur,[surname]
@@ -67953,7 +67954,8 @@ EOS
官	n,名詞,人,役割,*,*,官,NOUN,*,officer
軍	n,名詞,主体,集団,*,*,軍,NOUN,*,army
EOS
北海	n,名詞,固定物,地名,*,*,北海,PROPN,Case=Loc|NameType=Geo,[place-name]
北	n,名詞,固定物,関係,*,*,北,NOUN,Case=Loc,north
海	n,名詞,固定物,地形,*,*,海,NOUN,Case=Loc,sea
王	n,名詞,人,姓氏,*,*,王,PROPN,NameType=Sur,[surname]
猛	n,名詞,人,名,*,*,猛,PROPN,NameType=Giv,[given-name]
字	n,名詞,不可譲,属性,*,*,字,NOUN,*,polite-name
@@ -74802,7 +74804,8 @@ EOS
還	v,動詞,行為,移動,*,*,還,VERB,*,return
晉陽	n,名詞,固定物,地名,*,*,晉陽,PROPN,Case=Loc|NameType=Geo,[place-name]
EOS
北海	n,名詞,固定物,地名,*,*,北海,PROPN,Case=Loc|NameType=Geo,[place-name]
北	n,名詞,固定物,関係,*,*,北,NOUN,Case=Loc,north
海	n,名詞,固定物,地形,*,*,海,NOUN,Case=Loc,sea
王	n,名詞,人,役割,*,*,王,NOUN,*,king
顥	n,名詞,人,名,*,*,顥,PROPN,NameType=Giv,[given-name]
奔	v,動詞,行為,移動,*,*,奔,VERB,*,run
+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@
屛,0,0,0,v,動詞,行為,設置,*,*,屛,VERB,*,*
屠,0,0,0,n,名詞,行為,*,*,*,屠,NOUN,*,*
屠,0,0,0,v,動詞,行為,動作,*,*,屠,VERB,*,*
層,0,0,0,n,名詞,可搬,伝達,*,*,層,NOUN,*,*
層,0,0,0,n,名詞,可搬,伝達,*,,層,NOUN,*,*
屯,0,0,0,n,名詞,固定物,建造物,*,*,屯,NOUN,Case=Loc,*
屯,0,0,0,v,動詞,行為,動作,*,*,屯,VERB,*,*
屯,0,0,0,v,動詞,行為,設置,*,*,屯,VERB,*,*
+22 −22
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@
廣深,0,0,0,n,名詞,人,名,*,广深,廣深,PROPN,NameType=Giv,[given-name]
廣源州,0,0,0,n,名詞,固定物,地名,*,广源州,廣源州,PROPN,Case=Loc|NameType=Geo,[place-name]
廣漢,0,0,0,n,名詞,人,名,*,广汉,廣漢,PROPN,NameType=Giv,[given-name]
廣漢,0,0,0,n,名詞,固定物,地名,*,广,廣漢,PROPN,Case=Loc|NameType=Geo,[place-name]
廣漢,0,0,0,n,名詞,固定物,地名,*,广,廣漢,PROPN,Case=Loc|NameType=Geo,[place-name]
廣西,0,0,0,n,名詞,固定物,地名,*,广西,廣西,PROPN,Case=Loc|NameType=Geo,[place-name]
廣陵,0,0,0,n,名詞,固定物,地名,*,广陵,廣陵,PROPN,Case=Loc|NameType=Geo,[place-name]
廣漢,0,0,0,n,名詞,人,名,*,广漢,廣漢,PROPN,NameType=Giv,[given-name]
@@ -1710,7 +1710,7 @@
望,0,0,0,n,名詞,人,名,*,*,望,PROPN,NameType=Giv,[given-name]
望,0,0,0,n,名詞,人,姓氏,*,*,望,PROPN,NameType=Sur,[surname]
望之,0,0,0,n,名詞,人,名,*,*,望之,PROPN,NameType=Giv,[given-name]
望諸,0,0,0,n,名詞,固定物,地名,*,*,望諸,PROPN,Case=Loc|NameType=Geo,[place-name]
望諸,0,0,0,n,名詞,固定物,地名,*,望诸,望諸,PROPN,Case=Loc|NameType=Geo,[place-name]
望諸,0,0,0,n,名詞,固定物,地名,*,*,望諸,PROPN,Case=Loc|NameType=Geo,[place-name]
朝州,0,0,0,n,名詞,固定物,地名,*,*,朝州,PROPN,Case=Loc|NameType=Geo,[place-name]
朝恩,0,0,0,n,名詞,人,名,*,*,朝恩,PROPN,NameType=Giv,[given-name]
@@ -1757,7 +1757,7 @@
東畿,0,0,0,n,名詞,固定物,地名,*,东畿,東畿,PROPN,Case=Loc|NameType=Geo,[place-name]
東萊,0,0,0,n,名詞,人,名,*,东莱,東萊,PROPN,NameType=Giv,[given-name]
東郡,0,0,0,n,名詞,固定物,地名,*,东郡,東郡,PROPN,Case=Loc|NameType=Geo,[place-name]
東都,0,0,0,n,名詞,固定物,地名,*,东,東都,PROPN,Case=Loc|NameType=Geo,[place-name]
東都,0,0,0,n,名詞,固定物,地名,*,东,東都,PROPN,Case=Loc|NameType=Geo,[place-name]
東阿,0,0,0,n,名詞,固定物,地名,*,东阿,東阿,PROPN,Case=Loc|NameType=Geo,[place-name]
東陽,0,0,0,n,名詞,固定物,地名,*,东阳,東陽,PROPN,Case=Loc|NameType=Geo,[place-name]
東都,0,0,0,n,名詞,固定物,地名,*,东都,東都,PROPN,Case=Loc|NameType=Geo,[place-name]
@@ -1916,7 +1916,7 @@
段,0,0,0,n,名詞,人,姓氏,*,*,段,PROPN,NameType=Sur,[surname]
殷,0,0,0,n,名詞,人,名,*,*,殷,PROPN,NameType=Giv,[given-name]
殷,0,0,0,n,名詞,人,姓氏,*,*,殷,PROPN,NameType=Sur,[surname]
殺胡林,0,0,0,n,名詞,固定物,地名,*,*,殺胡林,PROPN,Case=Loc|NameType=Geo,[place-name]
殺胡林,0,0,0,n,名詞,固定物,地名,*,杀胡林,殺胡林,PROPN,Case=Loc|NameType=Geo,[place-name]
殽函,0,0,0,n,名詞,固定物,地名,*,*,殽函,PROPN,Case=Loc|NameType=Geo,[place-name]
毅,0,0,0,n,名詞,人,名,*,*,毅,PROPN,NameType=Giv,[given-name]
毋丘,0,0,0,n,名詞,人,姓氏,*,*,毋丘,PROPN,NameType=Sur,[surname]
@@ -1950,8 +1950,8 @@
江東,0,0,0,n,名詞,固定物,地名,*,江东,江東,PROPN,Case=Loc|NameType=Geo,[place-name]
江浙,0,0,0,n,名詞,固定物,地名,*,*,江浙,PROPN,Case=Loc|NameType=Geo,[place-name]
江淮,0,0,0,n,名詞,固定物,地名,*,*,江淮,PROPN,Case=Loc|NameType=Geo,[place-name]
江漢,0,0,0,n,名詞,人,名,*,*,江漢,PROPN,NameType=Giv,[given-name]
江漢,0,0,0,n,名詞,固定物,地名,*,*,江漢,PROPN,Case=Loc|NameType=Geo,[place-name]
江漢,0,0,0,n,名詞,人,名,*,江汉,江漢,PROPN,NameType=Giv,[given-name]
江漢,0,0,0,n,名詞,固定物,地名,*,江汉,江漢,PROPN,Case=Loc|NameType=Geo,[place-name]
江西,0,0,0,n,名詞,固定物,地名,*,*,江西,PROPN,Case=Loc|NameType=Geo,[place-name]
江進,0,0,0,n,名詞,人,名,*,江进,江進,PROPN,NameType=Giv,[given-name]
江都,0,0,0,n,名詞,固定物,地名,*,*,江都,PROPN,Case=Loc|NameType=Geo,[place-name]
@@ -2049,7 +2049,7 @@
浩,0,0,0,n,名詞,人,名,*,*,浩,PROPN,NameType=Giv,[given-name]
浮,0,0,0,n,名詞,人,名,*,*,浮,PROPN,NameType=Giv,[given-name]
海南,0,0,0,n,名詞,固定物,地名,*,*,海南,PROPN,Case=Loc|NameType=Geo,[place-name]
海寧州,0,0,0,n,名詞,固定物,地名,*,宁州,海寧州,PROPN,Case=Loc|NameType=Geo,[place-name]
海寧州,0,0,0,n,名詞,固定物,地名,*,宁州,海寧州,PROPN,Case=Loc|NameType=Geo,[place-name]
海迷失,0,0,0,n,名詞,人,名,*,*,海迷失,PROPN,NameType=Giv,[given-name]
海雲,0,0,0,n,名詞,人,名,*,海云,海雲,PROPN,NameType=Giv,[given-name]
涇,0,0,0,n,名詞,固定物,地名,*,泾,涇,PROPN,Case=Loc|NameType=Geo,[place-name]
@@ -2090,7 +2090,7 @@
清,0,0,0,n,名詞,人,名,*,*,清,PROPN,NameType=Giv,[given-name]
清之,0,0,0,n,名詞,人,名,*,*,清之,PROPN,NameType=Giv,[given-name]
清流,0,0,0,n,名詞,固定物,地名,*,*,淸流,PROPN,Case=Loc|NameType=Geo,[place-name]
清節,0,0,0,n,名詞,固定物,地名,*,*,淸節,PROPN,Case=Loc|NameType=Geo,[place-name]
清節,0,0,0,n,名詞,固定物,地名,*,清节,淸節,PROPN,Case=Loc|NameType=Geo,[place-name]
渉,0,0,0,n,名詞,人,名,*,*,渉,PROPN,NameType=Giv,[given-name]
渙,0,0,0,n,名詞,人,名,*,涣,渙,PROPN,NameType=Giv,[given-name]
渝州,0,0,0,n,名詞,固定物,地名,*,*,渝州,PROPN,Case=Loc|NameType=Geo,[place-name]
@@ -2151,12 +2151,12 @@
滸,0,0,0,n,名詞,人,名,*,浒,滸,PROPN,NameType=Giv,[given-name]
漁陽,0,0,0,n,名詞,固定物,地名,*,渔阳,漁陽,PROPN,Case=Loc|NameType=Geo,[place-name]
演,0,0,0,n,名詞,人,名,*,*,演,PROPN,NameType=Giv,[given-name]
漢,0,0,0,n,名詞,人,名,*,*,漢,PROPN,NameType=Giv,[given-name]
漢中,0,0,0,n,名詞,固定物,地名,*,*,漢中,PROPN,Case=Loc|NameType=Geo,[place-name]
漢州,0,0,0,n,名詞,固定物,地名,*,*,漢州,PROPN,Case=Loc|NameType=Geo,[place-name]
漢東,0,0,0,n,名詞,固定物,地名,*,东,漢東,PROPN,Case=Loc|NameType=Geo,[place-name]
漢,0,0,0,n,名詞,人,名,*,,漢,PROPN,NameType=Giv,[given-name]
漢中,0,0,0,n,名詞,固定物,地名,*,汉中,漢中,PROPN,Case=Loc|NameType=Geo,[place-name]
漢州,0,0,0,n,名詞,固定物,地名,*,汉州,漢州,PROPN,Case=Loc|NameType=Geo,[place-name]
漢東,0,0,0,n,名詞,固定物,地名,*,东,漢東,PROPN,Case=Loc|NameType=Geo,[place-name]
漢英,0,0,0,n,名詞,人,名,*,汉英,漢英,PROPN,NameType=Giv,[given-name]
漢陽軍,0,0,0,n,名詞,固定物,地名,*,阳军,漢陽軍,PROPN,Case=Loc|NameType=Geo,[place-name]
漢陽軍,0,0,0,n,名詞,固定物,地名,*,阳军,漢陽軍,PROPN,Case=Loc|NameType=Geo,[place-name]
漳南,0,0,0,n,名詞,固定物,地名,*,*,漳南,PROPN,Case=Loc|NameType=Geo,[place-name]
漼,0,0,0,n,名詞,人,名,*,*,漼,PROPN,NameType=Giv,[given-name]
漿,0,0,0,n,名詞,人,名,*,浆,漿,PROPN,NameType=Giv,[given-name]
@@ -2421,8 +2421,8 @@
盆子,0,0,0,n,名詞,人,名,*,*,盆子,PROPN,NameType=Giv,[given-name]
盈,0,0,0,n,名詞,人,名,*,*,盈,PROPN,NameType=Giv,[given-name]
益州,0,0,0,n,名詞,固定物,地名,*,*,益州,PROPN,Case=Loc|NameType=Geo,[place-name]
益津關,0,0,0,n,名詞,固定物,地名,*,津关,益津關,PROPN,Case=Loc|NameType=Geo,[place-name]
益陽,0,0,0,n,名詞,固定物,地名,*,阳,益陽,PROPN,Case=Loc|NameType=Geo,[place-name]
益津關,0,0,0,n,名詞,固定物,地名,*,津关,益津關,PROPN,Case=Loc|NameType=Geo,[place-name]
益陽,0,0,0,n,名詞,固定物,地名,*,阳,益陽,PROPN,Case=Loc|NameType=Geo,[place-name]
盛,0,0,0,n,名詞,人,名,*,*,盛,PROPN,NameType=Giv,[given-name]
盛,0,0,0,n,名詞,人,姓氏,*,*,盛,PROPN,NameType=Sur,[surname]
盡忠,0,0,0,n,名詞,人,名,*,尽忠,盡忠,PROPN,NameType=Giv,[given-name]
@@ -2565,7 +2565,7 @@
箕子,0,0,0,n,名詞,人,名,*,*,箕子,PROPN,NameType=Giv,[given-name]
管,0,0,0,n,名詞,人,名,*,*,管,PROPN,NameType=Giv,[given-name]
管叔,0,0,0,n,名詞,人,姓氏,*,*,管叔,PROPN,NameType=Sur,[surname]
節,0,0,0,n,名詞,人,名,*,*,節,PROPN,NameType=Giv,[given-name]
節,0,0,0,n,名詞,人,名,*,,節,PROPN,NameType=Giv,[given-name]
範,0,0,0,n,名詞,人,名,*,范,範,PROPN,NameType=Giv,[given-name]
籍,0,0,0,n,名詞,人,名,*,*,籍,PROPN,NameType=Giv,[given-name]
籕,0,0,0,n,名詞,人,名,*,*,籕,PROPN,NameType=Giv,[given-name]
@@ -2825,7 +2825,7 @@
萼,0,0,0,n,名詞,人,名,*,*,萼,PROPN,NameType=Giv,[given-name]
葉,0,0,0,n,名詞,人,姓氏,*,叶,葉,PROPN,NameType=Sur,[surname]
葉護,0,0,0,n,名詞,人,名,*,叶护,葉護,PROPN,NameType=Giv,[given-name]
著,0,0,0,n,名詞,人,名,*,*,著,PROPN,NameType=Giv,[given-name]
著,0,0,0,n,名詞,人,名,*,,著,PROPN,NameType=Giv,[given-name]
葛,0,0,0,n,名詞,人,名,*,*,葛,PROPN,NameType=Giv,[given-name]
葛,0,0,0,n,名詞,人,姓氏,*,*,葛,PROPN,NameType=Sur,[surname]
葛伯,0,0,0,n,名詞,人,名,*,*,葛伯,PROPN,NameType=Giv,[given-name]
@@ -2842,7 +2842,7 @@
蒨,0,0,0,n,名詞,人,名,*,*,蒨,PROPN,NameType=Giv,[given-name]
蒯,0,0,0,n,名詞,人,姓氏,*,*,蒯,PROPN,NameType=Sur,[surname]
蒲,0,0,0,n,名詞,人,姓氏,*,*,蒲,PROPN,NameType=Sur,[surname]
蒲類海,0,0,0,n,名詞,固定物,地名,*,*,蒲類海,PROPN,Case=Loc|NameType=Geo,[place-name]
蒲類海,0,0,0,n,名詞,固定物,地名,*,蒲类海,蒲類海,PROPN,Case=Loc|NameType=Geo,[place-name]
蒲類海,0,0,0,n,名詞,固定物,地名,*,*,蒲類海,PROPN,Case=Loc|NameType=Geo,[place-name]
蒼,0,0,0,n,名詞,人,名,*,苍,蒼,PROPN,NameType=Giv,[given-name]
蒼梧,0,0,0,n,名詞,固定物,地名,*,苍梧,蒼梧,PROPN,Case=Loc|NameType=Geo,[place-name]
@@ -3007,8 +3007,8 @@
諳版孛極烈,0,0,0,n,名詞,人,名,*,谙版孛极烈,諳版孛極烈,PROPN,NameType=Giv,[given-name]
諴,0,0,0,n,名詞,人,名,*,*,諴,PROPN,NameType=Giv,[given-name]
諶,0,0,0,n,名詞,人,名,*,谌,諶,PROPN,NameType=Giv,[given-name]
諸葛,0,0,0,n,名詞,人,姓氏,*,*,諸葛,PROPN,NameType=Sur,[surname]
諸葛,0,0,0,n,名詞,人,姓氏,*,诸葛,諸葛,PROPN,NameType=Sur,[surname]
諸葛,0,0,0,n,名詞,人,姓氏,*,诸葛,諸葛,PROPN,NameType=Sur,[surname]
謂,0,0,0,n,名詞,人,名,*,谓,謂,PROPN,NameType=Giv,[given-name]
謖,0,0,0,n,名詞,人,名,*,谡,謖,PROPN,NameType=Giv,[given-name]
謙之,0,0,0,n,名詞,人,名,*,谦之,謙之,PROPN,NameType=Giv,[given-name]
@@ -3231,7 +3231,7 @@
鄲,0,0,0,n,名詞,固定物,地名,*,郸,鄲,PROPN,Case=Loc|NameType=Geo,[place-name]
鄴,0,0,0,n,名詞,人,名,*,邺,鄴,PROPN,NameType=Giv,[given-name]
鄴,0,0,0,n,名詞,固定物,地名,*,邺,鄴,PROPN,Case=Loc|NameType=Geo,[place-name]
鄴都,0,0,0,n,名詞,固定物,地名,*,邺,鄴都,PROPN,Case=Loc|NameType=Geo,[place-name]
鄴都,0,0,0,n,名詞,固定物,地名,*,邺,鄴都,PROPN,Case=Loc|NameType=Geo,[place-name]
鄴都,0,0,0,n,名詞,固定物,地名,*,邺都,鄴都,PROPN,Case=Loc|NameType=Geo,[place-name]
酇,0,0,0,n,名詞,固定物,地名,*,*,酇,PROPN,Case=Loc|NameType=Geo,[place-name]
酈,0,0,0,n,名詞,人,姓氏,*,郦,酈,PROPN,NameType=Sur,[surname]
@@ -3590,14 +3590,14 @@
黃,0,0,0,n,名詞,人,名,*,黄,黃,PROPN,NameType=Giv,[given-name]
黃,0,0,0,n,名詞,人,姓氏,*,黄,黃,PROPN,NameType=Sur,[surname]
黃州,0,0,0,n,名詞,固定物,地名,*,黄州,黃州,PROPN,Case=Loc|NameType=Geo,[place-name]
黃梅,0,0,0,n,名詞,固定物,地名,*,黄,黃梅,PROPN,Case=Loc|NameType=Geo,[place-name]
黃梅,0,0,0,n,名詞,固定物,地名,*,黄,黃梅,PROPN,Case=Loc|NameType=Geo,[place-name]
黃梅,0,0,0,n,名詞,固定物,地名,*,黄梅,黃梅,PROPN,Case=Loc|NameType=Geo,[place-name]
黄,0,0,0,n,名詞,人,名,*,黄,黃,PROPN,NameType=Giv,[given-name]
黄,0,0,0,n,名詞,人,姓氏,*,*,黄,PROPN,NameType=Sur,[surname]
黄,0,0,0,n,名詞,人,姓氏,*,黄,黃,PROPN,NameType=Sur,[surname]
黄州,0,0,0,n,名詞,固定物,地名,*,黄州,黃州,PROPN,Case=Loc|NameType=Geo,[place-name]
黄帝,0,0,0,n,名詞,人,名,*,*,黄帝,PROPN,NameType=Giv,[given-name]
黄梅,0,0,0,n,名詞,固定物,地名,*,黄梅,黃梅,PROPN,Case=Loc|NameType=Geo,[place-name]
黄梅,0,0,0,n,名詞,固定物,地名,*,*,黃梅,PROPN,Case=Loc|NameType=Geo,[place-name]
黄裳,0,0,0,n,名詞,人,名,*,*,黄裳,PROPN,NameType=Giv,[given-name]
黎,0,0,0,n,名詞,人,姓氏,*,*,黎,PROPN,NameType=Sur,[surname]
黑水靺鞨,0,0,0,n,名詞,固定物,地名,*,*,黑水靺鞨,PROPN,Case=Loc|NameType=Geo,[place-name]
+6 −1
Original line number Diff line number Diff line
@@ -9,7 +9,12 @@ while True:
    quit()
  t=s.split(",")
  if t[9]=="*" or t[9]=="":
    i=t[0] if t[10]=="*" or t[10]=="" else t[10]
    if t[10]=="*" or t[10]=="":
      i=t[0]
    else:
      i=t[10]
      if [j for j in i if ord(j)>63743 and ord(j)<64256]!=[]:
        i=t[0]
    j=mafan.simplify(i)
    if i!=j:
      t[9]=j