diff options
author | Alex Auvolat <alex@adnab.me> | 2023-09-25 16:23:04 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2023-09-25 16:23:04 +0200 |
commit | 8c6fe47d809eab3daad2e2b560295ecf4fa12796 (patch) | |
tree | 929eef5993b3ac6a064aa61bff301038c31af702 | |
parent | 12bbe59e89fc5481c21163b7e1cbbb9a72bd470b (diff) | |
download | datagengo-8c6fe47d809eab3daad2e2b560295ecf4fa12796.tar.gz datagengo-8c6fe47d809eab3daad2e2b560295ecf4fa12796.zip |
remove modest quantities of extra vocabulary that also appear in sentences
-rw-r--r-- | data/batches.json | 1189 | ||||
-rw-r--r-- | src/main.rs | 12 |
2 files changed, 9 insertions, 1192 deletions
diff --git a/data/batches.json b/data/batches.json index 1e76209..135c674 100644 --- a/data/batches.json +++ b/data/batches.json @@ -338,25 +338,6 @@ { "level": "N4", "chars": [ - "時", - "間" - ], - "kanji": "時間", - "kana": "じかん", - "en": "time" - }, - { - "level": "N4", - "chars": [ - "長" - ], - "kanji": "長い", - "kana": "ながい", - "en": "long" - }, - { - "level": "N4", - "chars": [ "十", "日" ], @@ -621,16 +602,6 @@ { "level": "N4", "chars": [ - "一", - "人" - ], - "kanji": "一人", - "kana": "ひとり", - "en": "one person" - }, - { - "level": "N4", - "chars": [ "三" ], "kanji": "三つ", @@ -668,15 +639,6 @@ { "level": "N4", "chars": [ - "話" - ], - "kanji": "話す", - "kana": "はなす", - "en": "to speak" - }, - { - "level": "N4", - "chars": [ "四" ], "kanji": "四つ", @@ -899,15 +861,6 @@ { "level": "N4", "chars": [ - "出" - ], - "kanji": "出す", - "kana": "だす", - "en": "to put out" - }, - { - "level": "N4", - "chars": [ "年", "来" ], @@ -927,15 +880,6 @@ { "level": "N4", "chars": [ - "会" - ], - "kanji": "会う", - "kana": "あう", - "en": "to meet" - }, - { - "level": "N4", - "chars": [ "今", "週" ], @@ -1252,16 +1196,6 @@ { "level": "N4", "chars": [ - "上", - "手" - ], - "kanji": "上手", - "kana": "じょうず", - "en": "skillful" - }, - { - "level": "N4", - "chars": [ "先", "月" ], @@ -1316,17 +1250,6 @@ "kanji": "六つ", "kana": "むっつ", "en": "six" - }, - { - "level": "N4", - "chars": [ - "人", - "国", - "外" - ], - "kanji": "外国人", - "kana": "がいこくじん", - "en": "foreigner" } ] }, @@ -1473,16 +1396,6 @@ { "level": "N4", "chars": [ - "名", - "有" - ], - "kanji": "有名", - "kana": "ゆうめい", - "en": "famous" - }, - { - "level": "N4", - "chars": [ "物", "食" ], @@ -1539,15 +1452,6 @@ "kanji": "意見", "kana": "いけん", "en": "opinion" - }, - { - "level": "N3", - "chars": [ - "動" - ], - "kanji": "動く", - "kana": "うごく", - "en": "to move" } ] }, @@ -1964,26 +1868,6 @@ "en": "fat" }, { - "level": "N4", - "chars": [ - "動", - "自", - "車" - ], - "kanji": "自動車", - "kana": "じどうしゃ", - "en": "automobile" - }, - { - "level": "N4", - "chars": [ - "強" - ], - "kanji": "強い", - "kana": "つよい", - "en": "powerful" - }, - { "level": "N3", "chars": [ "考" @@ -2306,17 +2190,6 @@ { "level": "N4", "chars": [ - "土", - "日", - "曜" - ], - "kanji": "土曜日", - "kana": "どようび", - "en": "Saturday" - }, - { - "level": "N4", - "chars": [ "一", "度" ], @@ -2580,16 +2453,6 @@ { "level": "N3", "chars": [ - "学", - "文" - ], - "kanji": "文学", - "kana": "ぶんがく", - "en": "literature" - }, - { - "level": "N3", - "chars": [ "別" ], "kanji": "別れる", @@ -2609,16 +2472,6 @@ { "level": "N3", "chars": [ - "生", - "産" - ], - "kanji": "生産", - "kana": "せいさん・する", - "en": "to produce" - }, - { - "level": "N3", - "chars": [ "写" ], "kanji": "写す", @@ -2640,15 +2493,6 @@ "chars": [ "通" ], - "kanji": "通る", - "kana": "とおる", - "en": "to go through" - }, - { - "level": "N3", - "chars": [ - "通" - ], "kanji": "通う", "kana": "かよう", "en": "to commute" @@ -2873,15 +2717,6 @@ "en": "to wait" }, { - "level": "N4", - "chars": [ - "使" - ], - "kanji": "使う", - "kana": "つかう", - "en": "to use" - }, - { "level": "N3", "chars": [ "工", @@ -2894,16 +2729,6 @@ { "level": "N3", "chars": [ - "別", - "特" - ], - "kanji": "特別", - "kana": "とくべつ", - "en": "special" - }, - { - "level": "N3", - "chars": [ "急", "特" ], @@ -3223,16 +3048,6 @@ { "level": "N4", "chars": [ - "料", - "理" - ], - "kanji": "料理", - "kana": "りょうり", - "en": "cuisine" - }, - { - "level": "N4", - "chars": [ "兄" ], "kanji": "お兄さん", @@ -3457,15 +3272,6 @@ { "level": "N4", "chars": [ - "青" - ], - "kanji": "青い", - "kana": "あおい", - "en": "blue" - }, - { - "level": "N4", - "chars": [ "時", "計" ], @@ -4268,16 +4074,6 @@ { "level": "N2a", "chars": [ - "代", - "近" - ], - "kanji": "近代", - "kana": "きんだい", - "en": "present day" - }, - { - "level": "N2a", - "chars": [ "住", "民" ], @@ -4791,25 +4587,6 @@ ], "extra_vocab": [ { - "level": "N4", - "chars": [ - "速" - ], - "kanji": "速い", - "kana": "はやい", - "en": "quick" - }, - { - "level": "N4", - "chars": [ - "物", - "荷" - ], - "kanji": "荷物", - "kana": "にもつ", - "en": "luggage" - }, - { "level": "N3", "chars": [ "負" @@ -4831,16 +4608,6 @@ { "level": "N3", "chars": [ - "理", - "由" - ], - "kanji": "理由", - "kana": "りゆう", - "en": "reason" - }, - { - "level": "N3", - "chars": [ "勝" ], "kanji": "勝つ", @@ -4916,16 +4683,6 @@ { "level": "N2a", "chars": [ - "特", - "独" - ], - "kanji": "独特", - "kana": "どくとく", - "en": "peculiarity,uniqueness,characteristic" - }, - { - "level": "N2a", - "chars": [ "急", "速" ], @@ -5064,16 +4821,6 @@ { "level": "N2b", "chars": [ - "方", - "針" - ], - "kanji": "方針", - "kana": "ほうしん", - "en": "objective,plan,policy" - }, - { - "level": "N2b", - "chars": [ "時", "速" ], @@ -5103,16 +4850,6 @@ { "level": "N2b", "chars": [ - "金", - "針" - ], - "kanji": "針金", - "kana": "はりがね", - "en": "wire" - }, - { - "level": "N2b", - "chars": [ "付", "見" ], @@ -5428,16 +5165,6 @@ { "level": "N2a", "chars": [ - "客", - "観" - ], - "kanji": "観客", - "kana": "かんきゃく", - "en": "audience,spectator(s)" - }, - { - "level": "N2a", - "chars": [ "小", "麦" ], @@ -5755,15 +5482,6 @@ { "level": "N3", "chars": [ - "美" - ], - "kanji": "美しい", - "kana": "うつくしい", - "en": "beautiful" - }, - { - "level": "N3", - "chars": [ "細" ], "kanji": "細かい", @@ -5803,15 +5521,6 @@ { "level": "N2a", "chars": [ - "全" - ], - "kanji": "全く", - "kana": "まったく", - "en": "really,truly,entirely,completely" - }, - { - "level": "N2a", - "chars": [ "防" ], "kanji": "防ぐ", @@ -6340,16 +6049,6 @@ { "level": "N2a", "chars": [ - "位", - "地" - ], - "kanji": "地位", - "kana": "ちい", - "en": "(social) position,status" - }, - { - "level": "N2a", - "chars": [ "公", "平" ], @@ -6701,15 +6400,6 @@ { "level": "N3", "chars": [ - "変" - ], - "kanji": "変える", - "kana": "かえる", - "en": "to change" - }, - { - "level": "N3", - "chars": [ "後", "最" ], @@ -6818,16 +6508,6 @@ { "level": "N2a", "chars": [ - "最", - "終" - ], - "kanji": "最終", - "kana": "さいしゅう", - "en": "last,final,closing" - }, - { - "level": "N2a", - "chars": [ "単", "語" ], @@ -6847,15 +6527,6 @@ { "level": "N2a", "chars": [ - "最" - ], - "kanji": "最も", - "kana": "もっとも", - "en": "most,extremely" - }, - { - "level": "N2a", - "chars": [ "予", "防" ], @@ -7853,26 +7524,6 @@ { "level": "N2a", "chars": [ - "代", - "現" - ], - "kanji": "現代", - "kana": "げんだい", - "en": "nowadays,modern times,present-day" - }, - { - "level": "N2a", - "chars": [ - "度", - "温" - ], - "kanji": "温度", - "kana": "おんど", - "en": "temperature" - }, - { - "level": "N2a", - "chars": [ "必", "死" ], @@ -7910,16 +7561,6 @@ { "level": "N2a", "chars": [ - "要", - "重" - ], - "kanji": "重要", - "kana": "じゅうよう", - "en": "important,momentous,essential,principal,major" - }, - { - "level": "N2a", - "chars": [ "現", "表" ], @@ -8774,16 +8415,6 @@ { "level": "N2a", "chars": [ - "手", - "相" - ], - "kanji": "相手", - "kana": "あいて", - "en": "companion,partner,company" - }, - { - "level": "N2a", - "chars": [ "成", "長" ], @@ -8843,16 +8474,6 @@ { "level": "N2a", "chars": [ - "予", - "算" - ], - "kanji": "予算", - "kana": "よさん", - "en": "estimate,budget" - }, - { - "level": "N2a", - "chars": [ "服", "装" ], @@ -9303,15 +8924,6 @@ { "level": "N3", "chars": [ - "鳴" - ], - "kanji": "鳴る", - "kana": "なる", - "en": "to sound" - }, - { - "level": "N3", - "chars": [ "水", "泳" ], @@ -9378,16 +8990,6 @@ { "level": "N2a", "chars": [ - "未", - "来" - ], - "kanji": "未来", - "kana": "みらい", - "en": "future (life, tense)" - }, - { - "level": "N2a", - "chars": [ "亡", "死" ], @@ -9428,16 +9030,6 @@ "level": "N2a", "chars": [ "価", - "格" - ], - "kanji": "価格", - "kana": "かかく", - "en": "price,value,cost" - }, - { - "level": "N2a", - "chars": [ - "価", "高" ], "kanji": "高価", @@ -9717,15 +9309,6 @@ "en": "complexity,complication" }, { - "level": "N3", - "chars": [ - "残" - ], - "kanji": "残る", - "kana": "のこる", - "en": "to remain" - }, - { "level": "N2a", "chars": [ "知", @@ -9738,15 +9321,6 @@ { "level": "N2a", "chars": [ - "対" - ], - "kanji": "対する", - "kana": "たいする", - "en": "to face,to confront,to oppose" - }, - { - "level": "N2a", - "chars": [ "残" ], "kanji": "残り", @@ -9776,16 +9350,6 @@ { "level": "N2a", "chars": [ - "商", - "売" - ], - "kanji": "商売", - "kana": "しょうばい", - "en": "trade,business,commerce,transaction,occupation" - }, - { - "level": "N2a", - "chars": [ "望" ], "kanji": "望む", @@ -10740,17 +10304,6 @@ "en": "useful, convenient" }, { - "level": "N4", - "chars": [ - "機", - "行", - "飛" - ], - "kanji": "飛行機", - "kana": "ひこうき", - "en": "aeroplane" - }, - { "level": "N3", "chars": [ "復", @@ -10850,16 +10403,6 @@ { "level": "N2a", "chars": [ - "動", - "活" - ], - "kanji": "活動", - "kana": "かつどう", - "en": "action,activity" - }, - { - "level": "N2a", - "chars": [ "回", "復" ], @@ -10927,16 +10470,6 @@ "en": "to remove,to transfer,to infect" }, { - "level": "N2a", - "chars": [ - "活", - "用" - ], - "kanji": "活用", - "kana": "かつよう", - "en": "conjugation,practical use" - }, - { "level": "N2b", "chars": [ "蒸" @@ -11263,16 +10796,6 @@ { "level": "N2a", "chars": [ - "失", - "業" - ], - "kanji": "失業", - "kana": "しつぎょう", - "en": "unemployment" - }, - { - "level": "N2a", - "chars": [ "失" ], "kanji": "失う", @@ -11776,16 +11299,6 @@ { "level": "N3", "chars": [ - "女", - "性" - ], - "kanji": "女性", - "kana": "じょせい", - "en": "woman" - }, - { - "level": "N3", - "chars": [ "申" ], "kanji": "申す", @@ -11803,15 +11316,6 @@ "en": "male" }, { - "level": "N3", - "chars": [ - "深" - ], - "kanji": "深い", - "kana": "ふかい", - "en": "deep" - }, - { "level": "N2a", "chars": [ "実", @@ -11883,16 +11387,6 @@ { "level": "N2a", "chars": [ - "事", - "実" - ], - "kanji": "事実", - "kana": "じじつ", - "en": "fact,truth,reality" - }, - { - "level": "N2a", - "chars": [ "信" ], "kanji": "信じる", @@ -12211,15 +11705,6 @@ { "level": "N2b", "chars": [ - "燃" - ], - "kanji": "燃やす", - "kana": "もやす", - "en": "to burn" - }, - { - "level": "N2b", - "chars": [ "浴", "衣" ], @@ -12481,16 +11966,6 @@ { "level": "N2a", "chars": [ - "動", - "詞" - ], - "kanji": "動詞", - "kana": "どうし", - "en": "verb" - }, - { - "level": "N2a", - "chars": [ "大", "戦" ], @@ -12801,16 +12276,6 @@ { "level": "N2b", "chars": [ - "公", - "式" - ], - "kanji": "公式", - "kana": "こうしき", - "en": "formula,formality,official" - }, - { - "level": "N2b", - "chars": [ "毛", "糸" ], @@ -13060,16 +12525,6 @@ "en": "last night" }, { - "level": "N4", - "chars": [ - "日", - "昨" - ], - "kanji": "昨日", - "kana": "きのう", - "en": "yesterday" - }, - { "level": "N3", "chars": [ "落" @@ -13653,15 +13108,6 @@ { "level": "N2b", "chars": [ - "混" - ], - "kanji": "混ぜる", - "kana": "まぜる", - "en": "to mix,to stir" - }, - { - "level": "N2b", - "chars": [ "積", "面" ], @@ -14630,16 +14076,6 @@ { "level": "N2a", "chars": [ - "人", - "婦" - ], - "kanji": "婦人", - "kana": "ふじん", - "en": "woman,female" - }, - { - "level": "N2a", - "chars": [ "仲", "間" ], @@ -14650,16 +14086,6 @@ { "level": "N2a", "chars": [ - "合", - "組" - ], - "kanji": "組合", - "kana": "くみあい", - "en": "association,union" - }, - { - "level": "N2a", - "chars": [ "主", "婦" ], @@ -15132,16 +14558,6 @@ { "level": "N2a", "chars": [ - "思", - "想" - ], - "kanji": "思想", - "kana": "しそう", - "en": "thought,idea" - }, - { - "level": "N2a", - "chars": [ "批", "評" ], @@ -15190,16 +14606,6 @@ { "level": "N2a", "chars": [ - "論", - "議" - ], - "kanji": "議論", - "kana": "ぎろん", - "en": "argument,discussion,dispute" - }, - { - "level": "N2a", - "chars": [ "局", "結" ], @@ -15775,15 +15181,6 @@ { "level": "N4", "chars": [ - "居" - ], - "kanji": "居る", - "kana": "いる", - "en": "to be, to have (used for people and animals)" - }, - { - "level": "N4", - "chars": [ "構", "結" ], @@ -16025,15 +15422,6 @@ { "level": "N2a", "chars": [ - "居" - ], - "kanji": "居る", - "kana": "おる", - "en": "to be (animate),to be,to exist" - }, - { - "level": "N2a", - "chars": [ "祝" ], "kanji": "祝う", @@ -16752,15 +16140,6 @@ { "level": "N2a", "chars": [ - "求" - ], - "kanji": "求める", - "kana": "もとめる", - "en": "to seek,to request,to demand,to want,to wish for,to search for,to pursue (pleasure),to hunt (a job)," - }, - { - "level": "N2a", - "chars": [ "感", "覚" ], @@ -17427,16 +16806,6 @@ { "level": "N2a", "chars": [ - "学", - "期" - ], - "kanji": "学期", - "kana": "がっき", - "en": "term (school)" - }, - { - "level": "N2a", - "chars": [ "子", "王" ], @@ -18052,25 +17421,6 @@ { "level": "N2a", "chars": [ - "優", - "女" - ], - "kanji": "女優", - "kana": "じょゆう", - "en": "actress" - }, - { - "level": "N2a", - "chars": [ - "流" - ], - "kanji": "流れ", - "kana": "ながれ", - "en": "stream,current" - }, - { - "level": "N2a", - "chars": [ "連" ], "kanji": "連れ", @@ -19222,16 +18572,6 @@ "en": "preparation" }, { - "level": "N2a", - "chars": [ - "演", - "説" - ], - "kanji": "演説", - "kana": "えんぜつ", - "en": "speech,address" - }, - { "level": "N2b", "chars": [ "張", @@ -20324,15 +19664,6 @@ { "level": "N2a", "chars": [ - "断" - ], - "kanji": "断る", - "kana": "ことわる", - "en": "to refuse,to decline,to dismiss" - }, - { - "level": "N2a", - "chars": [ "判", "断" ], @@ -20431,16 +19762,6 @@ { "level": "N2a", "chars": [ - "連", - "関" - ], - "kanji": "関連", - "kana": "かんれん", - "en": "relation,connection,relevance" - }, - { - "level": "N2a", - "chars": [ "丸" ], "kanji": "丸い", @@ -20940,15 +20261,6 @@ { "level": "N2a", "chars": [ - "喜" - ], - "kanji": "喜び", - "kana": "よろこび", - "en": "(a) joy,(a) delight,rapture,pleasure,gratification,rejoicing,congratulations,felicitations" - }, - { - "level": "N2a", - "chars": [ "師", "技" ], @@ -21387,16 +20699,6 @@ { "level": "N2a", "chars": [ - "然", - "突" - ], - "kanji": "突然", - "kana": "とつぜん", - "en": "abruptly,suddenly,unexpectedly,all at once" - }, - { - "level": "N2a", - "chars": [ "払", "支" ], @@ -21813,15 +21115,6 @@ "en": "age,years" }, { - "level": "N2a", - "chars": [ - "越" - ], - "kanji": "越える", - "kana": "こえる", - "en": "to exceed,to cross over,to cross" - }, - { "level": "N2b", "chars": [ "恋" @@ -22281,15 +21574,6 @@ { "level": "N2a", "chars": [ - "抜" - ], - "kanji": "抜く", - "kana": "ぬく", - "en": "to extract,to omit,to surpass,to draw out,to unplug" - }, - { - "level": "N2a", - "chars": [ "煙", "禁" ], @@ -22348,15 +21632,6 @@ { "level": "N2a", "chars": [ - "倒" - ], - "kanji": "倒す", - "kana": "たおす", - "en": "to throw down,to beat,to bring down,to blow down" - }, - { - "level": "N2a", - "chars": [ "居", "眠" ], @@ -23192,16 +22467,6 @@ "en": "to make a mistake" }, { - "level": "N3", - "chars": [ - "地", - "震" - ], - "kanji": "地震", - "kana": "じしん", - "en": "earthquake" - }, - { "level": "N2a", "chars": [ "恐" @@ -24734,16 +23999,6 @@ ], "extra_vocab": [ { - "level": "N3", - "chars": [ - "故", - "障" - ], - "kanji": "故障", - "kana": "こしょう・する", - "en": "to break-down" - }, - { "level": "N2a", "chars": [ "得", @@ -24766,16 +24021,6 @@ { "level": "N2a", "chars": [ - "故", - "障" - ], - "kanji": "故障", - "kana": "こしょう", - "en": "break-down,failure,accident,out of order" - }, - { - "level": "N2a", - "chars": [ "刺", "激" ], @@ -24989,16 +24234,6 @@ "kanji": "墓地", "kana": "はかち", "en": "cemetery;graveyard" - }, - { - "level": "N1", - "chars": [ - "実", - "忠" - ], - "kanji": "忠実", - "kana": "ちゅうじつ", - "en": "fidelity;faithfulness" } ] }, @@ -25227,15 +24462,6 @@ { "level": "N3", "chars": [ - "厳" - ], - "kanji": "厳しい", - "kana": "きびしい", - "en": "strict" - }, - { - "level": "N3", - "chars": [ "典", "辞" ], @@ -25277,16 +24503,6 @@ { "level": "N2a", "chars": [ - "主", - "義" - ], - "kanji": "主義", - "kana": "しゅぎ", - "en": "doctrine,rule,principle" - }, - { - "level": "N2a", - "chars": [ "典", "型" ], @@ -25384,16 +24600,6 @@ "en": "strict,rigour,severe,firm" }, { - "level": "N2b", - "chars": [ - "任", - "就" - ], - "kanji": "就任", - "kana": "しゅうにん", - "en": "inauguration,assumption of office" - }, - { "level": "N1", "chars": [ "密", @@ -25607,16 +24813,6 @@ { "level": "N1", "chars": [ - "物", - "織" - ], - "kanji": "織物", - "kana": "おりもの", - "en": "textile;fabric" - }, - { - "level": "N1", - "chars": [ "垂" ], "kanji": "垂れる", @@ -26171,16 +25367,6 @@ { "level": "N1", "chars": [ - "治", - "統" - ], - "kanji": "統治", - "kana": "とうじ", - "en": "rule;reign;government;governing" - }, - { - "level": "N1", - "chars": [ "一", "寸" ], @@ -26201,16 +25387,6 @@ { "level": "N1", "chars": [ - "合", - "統" - ], - "kanji": "統合", - "kana": "とうごう", - "en": "integration;unification;synthesis" - }, - { - "level": "N1", - "chars": [ "挙", "選" ], @@ -26624,16 +25800,6 @@ { "level": "N2a", "chars": [ - "博", - "士" - ], - "kanji": "博士", - "kana": "はかせ", - "en": "doctorate,PhD" - }, - { - "level": "N2a", - "chars": [ "馬", "鹿" ], @@ -26899,16 +26065,6 @@ { "level": "N1", "chars": [ - "盟", - "連" - ], - "kanji": "連盟", - "kana": "れんめい", - "en": "league;union;alliance" - }, - { - "level": "N1", - "chars": [ "余", "興" ], @@ -27330,16 +26486,6 @@ { "level": "N2a", "chars": [ - "人", - "詩" - ], - "kanji": "詩人", - "kana": "しじん", - "en": "poet" - }, - { - "level": "N2a", - "chars": [ "奏", "演" ], @@ -27605,16 +26751,6 @@ { "level": "N1", "chars": [ - "全", - "盛" - ], - "kanji": "全盛", - "kana": "ぜんせい", - "en": "height of prosperity" - }, - { - "level": "N1", - "chars": [ "神", "聖" ], @@ -28036,16 +27172,6 @@ { "level": "N2a", "chars": [ - "様", - "模" - ], - "kanji": "模様", - "kana": "もよう", - "en": "pattern,figure,design" - }, - { - "level": "N2a", - "chars": [ "属", "金" ], @@ -28315,15 +27441,6 @@ { "level": "N1", "chars": [ - "酸" - ], - "kanji": "酸っぱい", - "kana": "すっぱい", - "en": "sour;acid" - }, - { - "level": "N1", - "chars": [ "素", "質" ], @@ -28700,16 +27817,6 @@ { "level": "N2a", "chars": [ - "判", - "裁" - ], - "kanji": "裁判", - "kana": "さいばん", - "en": "trial,judgement" - }, - { - "level": "N2a", - "chars": [ "出", "提" ], @@ -28991,17 +28098,6 @@ "kanji": "貴女", "kana": "あなた", "en": "you;lady" - }, - { - "level": "N1", - "chars": [ - "員", - "従", - "業" - ], - "kanji": "従業員", - "kana": "じゅうぎょういん", - "en": "employee;worker" } ] }, @@ -29633,15 +28729,6 @@ ], "extra_vocab": [ { - "level": "N4", - "chars": [ - "嫌" - ], - "kanji": "嫌い", - "kana": "きらい", - "en": "hate" - }, - { "level": "N2a", "chars": [ "手", @@ -29663,16 +28750,6 @@ { "level": "N2a", "chars": [ - "嫌", - "機" - ], - "kanji": "機嫌", - "kana": "きげん", - "en": "humour,temper,mood" - }, - { - "level": "N2a", - "chars": [ "嫌" ], "kanji": "嫌う", @@ -30044,15 +29121,6 @@ { "level": "N3", "chars": [ - "壊" - ], - "kanji": "壊す", - "kana": "こわす", - "en": "to break" - }, - { - "level": "N3", - "chars": [ "冷", "房" ], @@ -30081,16 +29149,6 @@ "en": "stationery" }, { - "level": "N2b", - "chars": [ - "女", - "房" - ], - "kanji": "女房", - "kana": "にょうぼう", - "en": "wife" - }, - { "level": "N1", "chars": [ "融", @@ -31581,15 +30639,6 @@ { "level": "N1", "chars": [ - "添" - ], - "kanji": "添える", - "kana": "そえる", - "en": "to add to;to attach;to append;to accompany;to garnish;to imitate;to annex" - }, - { - "level": "N1", - "chars": [ "疎" ], "kanji": "疎か", @@ -31648,16 +30697,6 @@ { "level": "N1", "chars": [ - "収", - "没" - ], - "kanji": "没収", - "kana": "ぼっしゅう", - "en": "forfeited" - }, - { - "level": "N1", - "chars": [ "療", "診" ], @@ -32367,15 +31406,6 @@ { "level": "N2a", "chars": [ - "離" - ], - "kanji": "離れる", - "kana": "はなれる", - "en": "to be separated from,to leave,to go away,to be a long way off" - }, - { - "level": "N2a", - "chars": [ "履" ], "kanji": "履く", @@ -33072,15 +32102,6 @@ "en": "(1) to invite,to ask,(2) to tempt,to lure,to induce" }, { - "level": "N2a", - "chars": [ - "奪" - ], - "kanji": "奪う", - "kana": "うばう", - "en": "to snatch away" - }, - { "level": "N2b", "chars": [ "倣" @@ -33443,16 +32464,6 @@ { "level": "N1", "chars": [ - "墜", - "落" - ], - "kanji": "墜落", - "kana": "ついらく", - "en": "falling;crashing" - }, - { - "level": "N1", - "chars": [ "老", "衰" ], @@ -34618,16 +33629,6 @@ { "level": "N1", "chars": [ - "励", - "激" - ], - "kanji": "激励", - "kana": "げきれい", - "en": "encouragement" - }, - { - "level": "N1", - "chars": [ "惜" ], "kanji": "惜しむ", @@ -34721,16 +33722,6 @@ { "level": "N1", "chars": [ - "動", - "騒" - ], - "kanji": "騒動", - "kana": "そうどう", - "en": "strife;riot;rebellion" - }, - { - "level": "N1", - "chars": [ "強", "烈" ], @@ -36059,15 +35050,6 @@ ], "extra_vocab": [ { - "level": "N2a", - "chars": [ - "黙" - ], - "kanji": "黙る", - "kana": "だまる", - "en": "to be silent" - }, - { "level": "N2b", "chars": [ "響" @@ -36199,15 +35181,6 @@ { "level": "N1", "chars": [ - "振" - ], - "kanji": "振り", - "kana": "ふり", - "en": "pretence;show;appearance" - }, - { - "level": "N1", - "chars": [ "力", "威" ], @@ -36732,15 +35705,6 @@ { "level": "N1", "chars": [ - "扱" - ], - "kanji": "扱い", - "kana": "あつかい", - "en": "treatment;service" - }, - { - "level": "N1", - "chars": [ "便", "宜" ], @@ -37492,15 +36456,6 @@ { "level": "N2b", "chars": [ - "飾" - ], - "kanji": "飾り", - "kana": "かざり", - "en": "decoration" - }, - { - "level": "N2b", - "chars": [ "品", "必", "需" @@ -38769,16 +37724,6 @@ { "level": "N1", "chars": [ - "列", - "陳" - ], - "kanji": "陳列", - "kana": "ちんれつ", - "en": "exhibition;display;show" - }, - { - "level": "N1", - "chars": [ "充", "補" ], @@ -40955,25 +39900,6 @@ "chars": [ "幾" ], - "kanji": "幾つ", - "kana": "いくつ", - "en": "how many?,how old?" - }, - { - "level": "N2a", - "chars": [ - "大", - "抵" - ], - "kanji": "大抵", - "kana": "たいてい", - "en": "usually,generally" - }, - { - "level": "N2a", - "chars": [ - "幾" - ], "kanji": "幾ら", "kana": "いくら", "en": "how much?,how many?" @@ -41941,15 +40867,6 @@ { "level": "N1", "chars": [ - "遣" - ], - "kanji": "遣る", - "kana": "やる", - "en": "to do;to have sexual intercourse;to kill;to give (to inferiors animals etc.);to dispatch (a letter" - }, - { - "level": "N1", - "chars": [ "記", "載" ], @@ -42555,16 +41472,6 @@ { "level": "N2a", "chars": [ - "徴", - "特" - ], - "kanji": "特徴", - "kana": "とくちょう", - "en": "feature,characteristic" - }, - { - "level": "N2a", - "chars": [ "怠" ], "kanji": "怠ける", @@ -43516,16 +42423,6 @@ { "level": "N1", "chars": [ - "否", - "拒" - ], - "kanji": "拒否", - "kana": "きょひ", - "en": "denial;veto;rejection;refusal" - }, - { - "level": "N1", - "chars": [ "取", "締" ], @@ -43900,16 +42797,6 @@ { "level": "N2a", "chars": [ - "微", - "笑" - ], - "kanji": "微笑む", - "kana": "ほほえむ", - "en": "to smile" - }, - { - "level": "N2a", - "chars": [ "哀" ], "kanji": "哀れ", @@ -44007,16 +42894,6 @@ "level": "N1", "chars": [ "微", - "笑" - ], - "kanji": "微笑", - "kana": "びしょう", - "en": "smile" - }, - { - "level": "N1", - "chars": [ - "微", "量" ], "kanji": "微量", @@ -48264,15 +47141,6 @@ { "level": "N1", "chars": [ - "其" - ], - "kanji": "其れ", - "kana": "それ", - "en": "it;that" - }, - { - "level": "N1", - "chars": [ "臥", "草" ], @@ -48292,16 +47160,6 @@ { "level": "N1", "chars": [ - "共", - "其" - ], - "kanji": "其れ共", - "kana": "それとも", - "en": "or;or else" - }, - { - "level": "N1", - "chars": [ "嘗" ], "kanji": "嘗める", @@ -49923,15 +48781,6 @@ { "level": "N1", "chars": [ - "此" - ], - "kanji": "此れ", - "kana": "これ", - "en": "this" - }, - { - "level": "N1", - "chars": [ "馴" ], "kanji": "馴らす", @@ -49950,15 +48799,6 @@ { "level": "N1", "chars": [ - "此" - ], - "kanji": "此の", - "kana": "この", - "en": "this" - }, - { - "level": "N1", - "chars": [ "揃" ], "kanji": "揃い", @@ -49998,16 +48838,6 @@ { "level": "N1", "chars": [ - "此", - "等" - ], - "kanji": "此れ等", - "kana": "これら", - "en": "these" - }, - { - "level": "N1", - "chars": [ "着", "辿" ], @@ -50608,16 +49438,6 @@ "level": "N1", "chars": [ "呆", - "然" - ], - "kanji": "呆然", - "kana": "ぼうぜん", - "en": "dumbfounded;overcome with surprise;in blank amazement" - }, - { - "level": "N1", - "chars": [ - "呆", "気" ], "kanji": "呆気ない", @@ -51237,15 +50057,6 @@ { "level": "N1", "chars": [ - "噛" - ], - "kanji": "噛る", - "kana": "かじる", - "en": "to chew;to bite (at);to gnaw;to nibble;to munch;to crunch;to have a smattering of" - }, - { - "level": "N1", - "chars": [ "引", "掻" ], diff --git a/src/main.rs b/src/main.rs index 9cc72fb..533f157 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1025,17 +1025,19 @@ fn add_vocab(all_batches: &mut [Batch], vocab: &[JlptVocab]) { }; let mut done = Charset::default(); - for (i, batch) in all_batches.iter_mut().enumerate() { + let mut extra_vocab = vec![]; + for (i, batch) in all_batches.iter().enumerate() { let done_after = done.union(&batch.chars); - batch.extra_vocab = vocab + let batch_extra_vocab = vocab .iter() .filter(|v| v.chars.inter_len(&batch.chars) > 0) .filter(|v| match_level(batch, &v.level)) .filter(|v| v.chars.diff(&done_after).len() == 0) - .filter(|v| !batch.examples.iter().any(|ex| ex.ja.contains(&v.kanji) || ex.expl.contains(&v.kanji))) + .filter(|v| !all_batches[i..std::cmp::min(all_batches.len(), i+10)].iter().any(|b| b.examples.iter().any(|ex| ex.ja.contains(&v.kanji) || ex.expl.contains(&v.kanji)))) .cloned() .collect::<Vec<_>>(); + extra_vocab.push(batch_extra_vocab); println!("---- BATCH #{:03} ----", i); for v in batch.extra_vocab.iter() { @@ -1044,6 +1046,10 @@ fn add_vocab(all_batches: &mut [Batch], vocab: &[JlptVocab]) { done = done_after; } + + for (batch, vocab) in all_batches.iter_mut().zip(extra_vocab.into_iter()) { + batch.extra_vocab = vocab; + } } // ===================================================================== |