From 8c6fe47d809eab3daad2e2b560295ecf4fa12796 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 25 Sep 2023 16:23:04 +0200 Subject: remove modest quantities of extra vocabulary that also appear in sentences --- data/batches.json | 1189 ----------------------------------------------------- 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 @@ -335,25 +335,6 @@ "kana": "だいがく", "en": "university" }, - { - "level": "N4", - "chars": [ - "時", - "間" - ], - "kanji": "時間", - "kana": "じかん", - "en": "time" - }, - { - "level": "N4", - "chars": [ - "長" - ], - "kanji": "長い", - "kana": "ながい", - "en": "long" - }, { "level": "N4", "chars": [ @@ -618,16 +599,6 @@ "kana": "ちいさい", "en": "little" }, - { - "level": "N4", - "chars": [ - "一", - "人" - ], - "kanji": "一人", - "kana": "ひとり", - "en": "one person" - }, { "level": "N4", "chars": [ @@ -665,15 +636,6 @@ "kana": "みっか", "en": "three days, third day of the month" }, - { - "level": "N4", - "chars": [ - "話" - ], - "kanji": "話す", - "kana": "はなす", - "en": "to speak" - }, { "level": "N4", "chars": [ @@ -896,15 +858,6 @@ "kana": "たかい", "en": "tall, expensive" }, - { - "level": "N4", - "chars": [ - "出" - ], - "kanji": "出す", - "kana": "だす", - "en": "to put out" - }, { "level": "N4", "chars": [ @@ -924,15 +877,6 @@ "kana": "うまれる", "en": "to be born" }, - { - "level": "N4", - "chars": [ - "会" - ], - "kanji": "会う", - "kana": "あう", - "en": "to meet" - }, { "level": "N4", "chars": [ @@ -1249,16 +1193,6 @@ "kana": "らいげつ", "en": "next month" }, - { - "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" } ] }, @@ -1470,16 +1393,6 @@ "kana": "だいすき", "en": "to be very likeable" }, - { - "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" } ] }, @@ -1963,26 +1867,6 @@ "kana": "ふとい", "en": "fat" }, - { - "level": "N4", - "chars": [ - "動", - "自", - "車" - ], - "kanji": "自動車", - "kana": "じどうしゃ", - "en": "automobile" - }, - { - "level": "N4", - "chars": [ - "強" - ], - "kanji": "強い", - "kana": "つよい", - "en": "powerful" - }, { "level": "N3", "chars": [ @@ -2303,17 +2187,6 @@ "kana": "すいようび", "en": "Wednesday" }, - { - "level": "N4", - "chars": [ - "土", - "日", - "曜" - ], - "kanji": "土曜日", - "kana": "どようび", - "en": "Saturday" - }, { "level": "N4", "chars": [ @@ -2577,16 +2450,6 @@ "kana": "てがみ", "en": "letter" }, - { - "level": "N3", - "chars": [ - "学", - "文" - ], - "kanji": "文学", - "kana": "ぶんがく", - "en": "literature" - }, { "level": "N3", "chars": [ @@ -2606,16 +2469,6 @@ "kana": "おみやげ", "en": "souvenir" }, - { - "level": "N3", - "chars": [ - "生", - "産" - ], - "kanji": "生産", - "kana": "せいさん・する", - "en": "to produce" - }, { "level": "N3", "chars": [ @@ -2635,15 +2488,6 @@ "kana": "ことり", "en": "small bird" }, - { - "level": "N3", - "chars": [ - "通" - ], - "kanji": "通る", - "kana": "とおる", - "en": "to go through" - }, { "level": "N3", "chars": [ @@ -2872,15 +2716,6 @@ "kana": "まつ", "en": "to wait" }, - { - "level": "N4", - "chars": [ - "使" - ], - "kanji": "使う", - "kana": "つかう", - "en": "to use" - }, { "level": "N3", "chars": [ @@ -2891,16 +2726,6 @@ "kana": "こうぎょう", "en": "the manufacturing industry" }, - { - "level": "N3", - "chars": [ - "別", - "特" - ], - "kanji": "特別", - "kana": "とくべつ", - "en": "special" - }, { "level": "N3", "chars": [ @@ -3220,16 +3045,6 @@ "kana": "さくぶん", "en": "composition,writing" }, - { - "level": "N4", - "chars": [ - "料", - "理" - ], - "kanji": "料理", - "kana": "りょうり", - "en": "cuisine" - }, { "level": "N4", "chars": [ @@ -3454,15 +3269,6 @@ "kana": "たてもの", "en": "building" }, - { - "level": "N4", - "chars": [ - "青" - ], - "kanji": "青い", - "kana": "あおい", - "en": "blue" - }, { "level": "N4", "chars": [ @@ -4265,16 +4071,6 @@ "kana": "しんたい", "en": "the body" }, - { - "level": "N2a", - "chars": [ - "代", - "近" - ], - "kanji": "近代", - "kana": "きんだい", - "en": "present day" - }, { "level": "N2a", "chars": [ @@ -4790,25 +4586,6 @@ } ], "extra_vocab": [ - { - "level": "N4", - "chars": [ - "速" - ], - "kanji": "速い", - "kana": "はやい", - "en": "quick" - }, - { - "level": "N4", - "chars": [ - "物", - "荷" - ], - "kanji": "荷物", - "kana": "にもつ", - "en": "luggage" - }, { "level": "N3", "chars": [ @@ -4828,16 +4605,6 @@ "kana": "ほうそう・する", "en": "to broadcast" }, - { - "level": "N3", - "chars": [ - "理", - "由" - ], - "kanji": "理由", - "kana": "りゆう", - "en": "reason" - }, { "level": "N3", "chars": [ @@ -4913,16 +4680,6 @@ "kana": "あずける", "en": "to give into custody,to entrust,to deposit" }, - { - "level": "N2a", - "chars": [ - "特", - "独" - ], - "kanji": "独特", - "kana": "どくとく", - "en": "peculiarity,uniqueness,characteristic" - }, { "level": "N2a", "chars": [ @@ -5061,16 +4818,6 @@ "kana": "ことづける", "en": "to send word,to send a message" }, - { - "level": "N2b", - "chars": [ - "方", - "針" - ], - "kanji": "方針", - "kana": "ほうしん", - "en": "objective,plan,policy" - }, { "level": "N2b", "chars": [ @@ -5100,16 +4847,6 @@ "kana": "つきあう", "en": "to associate with,to keep company with,to get on with" }, - { - "level": "N2b", - "chars": [ - "金", - "針" - ], - "kanji": "針金", - "kana": "はりがね", - "en": "wire" - }, { "level": "N2b", "chars": [ @@ -5425,16 +5162,6 @@ "kana": "きんこ", "en": "safe,vault,treasury,provider of funds" }, - { - "level": "N2a", - "chars": [ - "客", - "観" - ], - "kanji": "観客", - "kana": "かんきゃく", - "en": "audience,spectator(s)" - }, { "level": "N2a", "chars": [ @@ -5752,15 +5479,6 @@ "kana": "あんぜん", "en": "safety" }, - { - "level": "N3", - "chars": [ - "美" - ], - "kanji": "美しい", - "kana": "うつくしい", - "en": "beautiful" - }, { "level": "N3", "chars": [ @@ -5800,15 +5518,6 @@ "kana": "ぜんこく", "en": "country-wide,nation-wide,whole country,national" }, - { - "level": "N2a", - "chars": [ - "全" - ], - "kanji": "全く", - "kana": "まったく", - "en": "really,truly,entirely,completely" - }, { "level": "N2a", "chars": [ @@ -6337,16 +6046,6 @@ "kana": "こうむいん", "en": "government worker" }, - { - "level": "N2a", - "chars": [ - "位", - "地" - ], - "kanji": "地位", - "kana": "ちい", - "en": "(social) position,status" - }, { "level": "N2a", "chars": [ @@ -6698,15 +6397,6 @@ "kana": "よしゅう", "en": "preparation for a lesson" }, - { - "level": "N3", - "chars": [ - "変" - ], - "kanji": "変える", - "kana": "かえる", - "en": "to change" - }, { "level": "N3", "chars": [ @@ -6815,16 +6505,6 @@ "kana": "せいぜい", "en": "at the most,at best,to the utmost,as much (far) as possible" }, - { - "level": "N2a", - "chars": [ - "最", - "終" - ], - "kanji": "最終", - "kana": "さいしゅう", - "en": "last,final,closing" - }, { "level": "N2a", "chars": [ @@ -6844,15 +6524,6 @@ "kana": "たんに", "en": "simply,merely,only,solely" }, - { - "level": "N2a", - "chars": [ - "最" - ], - "kanji": "最も", - "kana": "もっとも", - "en": "most,extremely" - }, { "level": "N2a", "chars": [ @@ -7850,26 +7521,6 @@ "kana": "しゅよう", "en": "chief,main,principal,major" }, - { - "level": "N2a", - "chars": [ - "代", - "現" - ], - "kanji": "現代", - "kana": "げんだい", - "en": "nowadays,modern times,present-day" - }, - { - "level": "N2a", - "chars": [ - "度", - "温" - ], - "kanji": "温度", - "kana": "おんど", - "en": "temperature" - }, { "level": "N2a", "chars": [ @@ -7907,16 +7558,6 @@ "kana": "あらわれ", "en": "embodiment,materialization" }, - { - "level": "N2a", - "chars": [ - "要", - "重" - ], - "kanji": "重要", - "kana": "じゅうよう", - "en": "important,momentous,essential,principal,major" - }, { "level": "N2a", "chars": [ @@ -8771,16 +8412,6 @@ "kana": "せなか", "en": "back of the body" }, - { - "level": "N2a", - "chars": [ - "手", - "相" - ], - "kanji": "相手", - "kana": "あいて", - "en": "companion,partner,company" - }, { "level": "N2a", "chars": [ @@ -8840,16 +8471,6 @@ "kana": "とざん", "en": "mountain-climbing" }, - { - "level": "N2a", - "chars": [ - "予", - "算" - ], - "kanji": "予算", - "kana": "よさん", - "en": "estimate,budget" - }, { "level": "N2a", "chars": [ @@ -9300,15 +8921,6 @@ "kana": "およぎかた", "en": "way of swimming" }, - { - "level": "N3", - "chars": [ - "鳴" - ], - "kanji": "鳴る", - "kana": "なる", - "en": "to sound" - }, { "level": "N3", "chars": [ @@ -9375,16 +8987,6 @@ "kana": "おろす", "en": "to take down,to launch,to drop" }, - { - "level": "N2a", - "chars": [ - "未", - "来" - ], - "kanji": "未来", - "kana": "みらい", - "en": "future (life, tense)" - }, { "level": "N2a", "chars": [ @@ -9424,16 +9026,6 @@ "kana": "ずつう", "en": "headache" }, - { - "level": "N2a", - "chars": [ - "価", - "格" - ], - "kanji": "価格", - "kana": "かかく", - "en": "price,value,cost" - }, { "level": "N2a", "chars": [ @@ -9716,15 +9308,6 @@ "kana": "ふくざつ", "en": "complexity,complication" }, - { - "level": "N3", - "chars": [ - "残" - ], - "kanji": "残る", - "kana": "のこる", - "en": "to remain" - }, { "level": "N2a", "chars": [ @@ -9735,15 +9318,6 @@ "kana": "ちしき", "en": "knowledge,information" }, - { - "level": "N2a", - "chars": [ - "対" - ], - "kanji": "対する", - "kana": "たいする", - "en": "to face,to confront,to oppose" - }, { "level": "N2a", "chars": [ @@ -9773,16 +9347,6 @@ "kana": "いしき", "en": "consciousness,senses" }, - { - "level": "N2a", - "chars": [ - "商", - "売" - ], - "kanji": "商売", - "kana": "しょうばい", - "en": "trade,business,commerce,transaction,occupation" - }, { "level": "N2a", "chars": [ @@ -10739,17 +10303,6 @@ "kana": "べんり", "en": "useful, convenient" }, - { - "level": "N4", - "chars": [ - "機", - "行", - "飛" - ], - "kanji": "飛行機", - "kana": "ひこうき", - "en": "aeroplane" - }, { "level": "N3", "chars": [ @@ -10847,16 +10400,6 @@ "kana": "いどう", "en": "removal,migration,movement" }, - { - "level": "N2a", - "chars": [ - "動", - "活" - ], - "kanji": "活動", - "kana": "かつどう", - "en": "action,activity" - }, { "level": "N2a", "chars": [ @@ -10926,16 +10469,6 @@ "kana": "うつす", "en": "to remove,to transfer,to infect" }, - { - "level": "N2a", - "chars": [ - "活", - "用" - ], - "kanji": "活用", - "kana": "かつよう", - "en": "conjugation,practical use" - }, { "level": "N2b", "chars": [ @@ -11260,16 +10793,6 @@ "kana": "しょうち・する", "en": "to consent" }, - { - "level": "N2a", - "chars": [ - "失", - "業" - ], - "kanji": "失業", - "kana": "しつぎょう", - "en": "unemployment" - }, { "level": "N2a", "chars": [ @@ -11773,16 +11296,6 @@ "kana": "つとめる", "en": "to work for someone" }, - { - "level": "N3", - "chars": [ - "女", - "性" - ], - "kanji": "女性", - "kana": "じょせい", - "en": "woman" - }, { "level": "N3", "chars": [ @@ -11802,15 +11315,6 @@ "kana": "だんせい", "en": "male" }, - { - "level": "N3", - "chars": [ - "深" - ], - "kanji": "深い", - "kana": "ふかい", - "en": "deep" - }, { "level": "N2a", "chars": [ @@ -11880,16 +11384,6 @@ "kana": "せいかく", "en": "character,personality" }, - { - "level": "N2a", - "chars": [ - "事", - "実" - ], - "kanji": "事実", - "kana": "じじつ", - "en": "fact,truth,reality" - }, { "level": "N2a", "chars": [ @@ -12208,15 +11702,6 @@ "kana": "りがい", "en": "advantages and disadvantages,interest" }, - { - "level": "N2b", - "chars": [ - "燃" - ], - "kanji": "燃やす", - "kana": "もやす", - "en": "to burn" - }, { "level": "N2b", "chars": [ @@ -12478,16 +11963,6 @@ "kana": "たたかい", "en": "battle,fight,struggle,conflict" }, - { - "level": "N2a", - "chars": [ - "動", - "詞" - ], - "kanji": "動詞", - "kana": "どうし", - "en": "verb" - }, { "level": "N2a", "chars": [ @@ -12798,16 +12273,6 @@ "kana": "さかさま", "en": "inversion,upside down" }, - { - "level": "N2b", - "chars": [ - "公", - "式" - ], - "kanji": "公式", - "kana": "こうしき", - "en": "formula,formality,official" - }, { "level": "N2b", "chars": [ @@ -13059,16 +12524,6 @@ "kana": "さくや", "en": "last night" }, - { - "level": "N4", - "chars": [ - "日", - "昨" - ], - "kanji": "昨日", - "kana": "きのう", - "en": "yesterday" - }, { "level": "N3", "chars": [ @@ -13650,15 +13105,6 @@ "kana": "たいせき", "en": "capacity,volume" }, - { - "level": "N2b", - "chars": [ - "混" - ], - "kanji": "混ぜる", - "kana": "まぜる", - "en": "to mix,to stir" - }, { "level": "N2b", "chars": [ @@ -14627,16 +14073,6 @@ "kana": "まかせる", "en": "to entrust to another,to leave to" }, - { - "level": "N2a", - "chars": [ - "人", - "婦" - ], - "kanji": "婦人", - "kana": "ふじん", - "en": "woman,female" - }, { "level": "N2a", "chars": [ @@ -14647,16 +14083,6 @@ "kana": "なかま", "en": "company,fellow,colleague,associate" }, - { - "level": "N2a", - "chars": [ - "合", - "組" - ], - "kanji": "組合", - "kana": "くみあい", - "en": "association,union" - }, { "level": "N2a", "chars": [ @@ -15129,16 +14555,6 @@ "kana": "きねん", "en": "commemoration,memory" }, - { - "level": "N2a", - "chars": [ - "思", - "想" - ], - "kanji": "思想", - "kana": "しそう", - "en": "thought,idea" - }, { "level": "N2a", "chars": [ @@ -15187,16 +14603,6 @@ "kana": "むすぶ", "en": "to tie,to bind,to link" }, - { - "level": "N2a", - "chars": [ - "論", - "議" - ], - "kanji": "議論", - "kana": "ぎろん", - "en": "argument,discussion,dispute" - }, { "level": "N2a", "chars": [ @@ -15772,15 +15178,6 @@ } ], "extra_vocab": [ - { - "level": "N4", - "chars": [ - "居" - ], - "kanji": "居る", - "kana": "いる", - "en": "to be, to have (used for people and animals)" - }, { "level": "N4", "chars": [ @@ -16022,15 +15419,6 @@ "kana": "ます", "en": "to increase,to grow" }, - { - "level": "N2a", - "chars": [ - "居" - ], - "kanji": "居る", - "kana": "おる", - "en": "to be (animate),to be,to exist" - }, { "level": "N2a", "chars": [ @@ -16749,15 +16137,6 @@ "kana": "じっさい", "en": "practical,actual condition,status quo" }, - { - "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": [ @@ -17424,16 +16803,6 @@ "kana": "きたい", "en": "expectation,anticipation,hope" }, - { - "level": "N2a", - "chars": [ - "学", - "期" - ], - "kanji": "学期", - "kana": "がっき", - "en": "term (school)" - }, { "level": "N2a", "chars": [ @@ -18049,25 +17418,6 @@ "kana": "ざいさん", "en": "property,fortune,assets" }, - { - "level": "N2a", - "chars": [ - "優", - "女" - ], - "kanji": "女優", - "kana": "じょゆう", - "en": "actress" - }, - { - "level": "N2a", - "chars": [ - "流" - ], - "kanji": "流れ", - "kana": "ながれ", - "en": "stream,current" - }, { "level": "N2a", "chars": [ @@ -19221,16 +18571,6 @@ "kana": "したく", "en": "preparation" }, - { - "level": "N2a", - "chars": [ - "演", - "説" - ], - "kanji": "演説", - "kana": "えんぜつ", - "en": "speech,address" - }, { "level": "N2b", "chars": [ @@ -20321,15 +19661,6 @@ "kana": "てつどう", "en": "railroad" }, - { - "level": "N2a", - "chars": [ - "断" - ], - "kanji": "断る", - "kana": "ことわる", - "en": "to refuse,to decline,to dismiss" - }, { "level": "N2a", "chars": [ @@ -20428,16 +19759,6 @@ "kana": "かんする", "en": "to concern,to be related" }, - { - "level": "N2a", - "chars": [ - "連", - "関" - ], - "kanji": "関連", - "kana": "かんれん", - "en": "relation,connection,relevance" - }, { "level": "N2a", "chars": [ @@ -20937,15 +20258,6 @@ "kana": "いし", "en": "doctor,physician" }, - { - "level": "N2a", - "chars": [ - "喜" - ], - "kanji": "喜び", - "kana": "よろこび", - "en": "(a) joy,(a) delight,rapture,pleasure,gratification,rejoicing,congratulations,felicitations" - }, { "level": "N2a", "chars": [ @@ -21384,16 +20696,6 @@ "kana": "しはらう", "en": "to pay" }, - { - "level": "N2a", - "chars": [ - "然", - "突" - ], - "kanji": "突然", - "kana": "とつぜん", - "en": "abruptly,suddenly,unexpectedly,all at once" - }, { "level": "N2a", "chars": [ @@ -21812,15 +21114,6 @@ "kana": "ねんれい", "en": "age,years" }, - { - "level": "N2a", - "chars": [ - "越" - ], - "kanji": "越える", - "kana": "こえる", - "en": "to exceed,to cross over,to cross" - }, { "level": "N2b", "chars": [ @@ -22278,15 +21571,6 @@ "kana": "もうしこむ", "en": "to apply for,to make an application" }, - { - "level": "N2a", - "chars": [ - "抜" - ], - "kanji": "抜く", - "kana": "ぬく", - "en": "to extract,to omit,to surpass,to draw out,to unplug" - }, { "level": "N2a", "chars": [ @@ -22345,15 +21629,6 @@ "kana": "ひとごみ", "en": "crowd of people" }, - { - "level": "N2a", - "chars": [ - "倒" - ], - "kanji": "倒す", - "kana": "たおす", - "en": "to throw down,to beat,to bring down,to blow down" - }, { "level": "N2a", "chars": [ @@ -23191,16 +22466,6 @@ "kana": "まちがえる", "en": "to make a mistake" }, - { - "level": "N3", - "chars": [ - "地", - "震" - ], - "kanji": "地震", - "kana": "じしん", - "en": "earthquake" - }, { "level": "N2a", "chars": [ @@ -24733,16 +23998,6 @@ } ], "extra_vocab": [ - { - "level": "N3", - "chars": [ - "故", - "障" - ], - "kanji": "故障", - "kana": "こしょう・する", - "en": "to break-down" - }, { "level": "N2a", "chars": [ @@ -24763,16 +24018,6 @@ "kana": "せいけつ", "en": "clean" }, - { - "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" } ] }, @@ -25224,15 +24459,6 @@ "kana": "てんらんかい", "en": "exhibition" }, - { - "level": "N3", - "chars": [ - "厳" - ], - "kanji": "厳しい", - "kana": "きびしい", - "en": "strict" - }, { "level": "N3", "chars": [ @@ -25274,16 +24500,6 @@ "kana": "しげん", "en": "resources" }, - { - "level": "N2a", - "chars": [ - "主", - "義" - ], - "kanji": "主義", - "kana": "しゅぎ", - "en": "doctrine,rule,principle" - }, { "level": "N2a", "chars": [ @@ -25383,16 +24599,6 @@ "kana": "げんじゅう", "en": "strict,rigour,severe,firm" }, - { - "level": "N2b", - "chars": [ - "任", - "就" - ], - "kanji": "就任", - "kana": "しゅうにん", - "en": "inauguration,assumption of office" - }, { "level": "N1", "chars": [ @@ -25604,16 +24810,6 @@ "kana": "ひゃっかじてん", "en": "encyclopedia" }, - { - "level": "N1", - "chars": [ - "物", - "織" - ], - "kanji": "織物", - "kana": "おりもの", - "en": "textile;fabric" - }, { "level": "N1", "chars": [ @@ -26168,16 +25364,6 @@ "kana": "しさつ", "en": "inspection;observation" }, - { - "level": "N1", - "chars": [ - "治", - "統" - ], - "kanji": "統治", - "kana": "とうじ", - "en": "rule;reign;government;governing" - }, { "level": "N1", "chars": [ @@ -26198,16 +25384,6 @@ "kana": "じき", "en": "porcelain;china" }, - { - "level": "N1", - "chars": [ - "合", - "統" - ], - "kanji": "統合", - "kana": "とうごう", - "en": "integration;unification;synthesis" - }, { "level": "N1", "chars": [ @@ -26621,16 +25797,6 @@ "kana": "かんしゃ", "en": "thanks,gratitude" }, - { - "level": "N2a", - "chars": [ - "博", - "士" - ], - "kanji": "博士", - "kana": "はかせ", - "en": "doctorate,PhD" - }, { "level": "N2a", "chars": [ @@ -26896,16 +26062,6 @@ "kana": "せいじつ", "en": "sincere;honest;faithful" }, - { - "level": "N1", - "chars": [ - "盟", - "連" - ], - "kanji": "連盟", - "kana": "れんめい", - "en": "league;union;alliance" - }, { "level": "N1", "chars": [ @@ -27327,16 +26483,6 @@ "kana": "いなか", "en": "countryside" }, - { - "level": "N2a", - "chars": [ - "人", - "詩" - ], - "kanji": "詩人", - "kana": "しじん", - "en": "poet" - }, { "level": "N2a", "chars": [ @@ -27602,16 +26748,6 @@ "kana": "かんせん", "en": "infection;contagion" }, - { - "level": "N1", - "chars": [ - "全", - "盛" - ], - "kanji": "全盛", - "kana": "ぜんせい", - "en": "height of prosperity" - }, { "level": "N1", "chars": [ @@ -28033,16 +27169,6 @@ "kana": "もうしわけ", "en": "apology,excuse" }, - { - "level": "N2a", - "chars": [ - "様", - "模" - ], - "kanji": "模様", - "kana": "もよう", - "en": "pattern,figure,design" - }, { "level": "N2a", "chars": [ @@ -28312,15 +27438,6 @@ "kana": "うちわけ", "en": "the items;breakdown;classification" }, - { - "level": "N1", - "chars": [ - "酸" - ], - "kanji": "酸っぱい", - "kana": "すっぱい", - "en": "sour;acid" - }, { "level": "N1", "chars": [ @@ -28697,16 +27814,6 @@ "kana": "いとこ", "en": "cousin (male)" }, - { - "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" } ] }, @@ -29632,15 +28728,6 @@ } ], "extra_vocab": [ - { - "level": "N4", - "chars": [ - "嫌" - ], - "kanji": "嫌い", - "kana": "きらい", - "en": "hate" - }, { "level": "N2a", "chars": [ @@ -29660,16 +28747,6 @@ "kana": "にぎる", "en": "to grasp,to seize,to mould sushi" }, - { - "level": "N2a", - "chars": [ - "嫌", - "機" - ], - "kanji": "機嫌", - "kana": "きげん", - "en": "humour,temper,mood" - }, { "level": "N2a", "chars": [ @@ -30041,15 +29118,6 @@ } ], "extra_vocab": [ - { - "level": "N3", - "chars": [ - "壊" - ], - "kanji": "壊す", - "kana": "こわす", - "en": "to break" - }, { "level": "N3", "chars": [ @@ -30080,16 +29148,6 @@ "kana": "ぶんぼうぐ", "en": "stationery" }, - { - "level": "N2b", - "chars": [ - "女", - "房" - ], - "kanji": "女房", - "kana": "にょうぼう", - "en": "wife" - }, { "level": "N1", "chars": [ @@ -31578,15 +30636,6 @@ "kana": "けっしょう", "en": "crystal;crystallization" }, - { - "level": "N1", - "chars": [ - "添" - ], - "kanji": "添える", - "kana": "そえる", - "en": "to add to;to attach;to append;to accompany;to garnish;to imitate;to annex" - }, { "level": "N1", "chars": [ @@ -31645,16 +30694,6 @@ "kana": "かんこく", "en": "advice;counsel;remonstrance;recommendation" }, - { - "level": "N1", - "chars": [ - "収", - "没" - ], - "kanji": "没収", - "kana": "ぼっしゅう", - "en": "forfeited" - }, { "level": "N1", "chars": [ @@ -32364,15 +31403,6 @@ "kana": "はなす", "en": "to part,divide,separate" }, - { - "level": "N2a", - "chars": [ - "離" - ], - "kanji": "離れる", - "kana": "はなれる", - "en": "to be separated from,to leave,to go away,to be a long way off" - }, { "level": "N2a", "chars": [ @@ -33071,15 +32101,6 @@ "kana": "さそう", "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": [ @@ -33440,16 +32461,6 @@ "kana": "かよう", "en": "song,ballad" }, - { - "level": "N1", - "chars": [ - "墜", - "落" - ], - "kanji": "墜落", - "kana": "ついらく", - "en": "falling;crashing" - }, { "level": "N1", "chars": [ @@ -34615,16 +33626,6 @@ "kana": "すます", "en": "to clear;to make clear;to be unruffled;to look unconcerned;to look demure;look prim;put on airs" }, - { - "level": "N1", - "chars": [ - "励", - "激" - ], - "kanji": "激励", - "kana": "げきれい", - "en": "encouragement" - }, { "level": "N1", "chars": [ @@ -34718,16 +33719,6 @@ "kana": "うったえ", "en": "lawsuit;complaint" }, - { - "level": "N1", - "chars": [ - "動", - "騒" - ], - "kanji": "騒動", - "kana": "そうどう", - "en": "strife;riot;rebellion" - }, { "level": "N1", "chars": [ @@ -36058,15 +35049,6 @@ } ], "extra_vocab": [ - { - "level": "N2a", - "chars": [ - "黙" - ], - "kanji": "黙る", - "kana": "だまる", - "en": "to be silent" - }, { "level": "N2b", "chars": [ @@ -36196,15 +35178,6 @@ "kana": "はんきょう", "en": "echo;reverberation;repercussion;reaction;influence" }, - { - "level": "N1", - "chars": [ - "振" - ], - "kanji": "振り", - "kana": "ふり", - "en": "pretence;show;appearance" - }, { "level": "N1", "chars": [ @@ -36729,15 +35702,6 @@ "kana": "どうぞよろしく", "en": "pleased to meet you" }, - { - "level": "N1", - "chars": [ - "扱" - ], - "kanji": "扱い", - "kana": "あつかい", - "en": "treatment;service" - }, { "level": "N1", "chars": [ @@ -37489,15 +36453,6 @@ "kana": "えいきょう", "en": "influence,effect" }, - { - "level": "N2b", - "chars": [ - "飾" - ], - "kanji": "飾り", - "kana": "かざり", - "en": "decoration" - }, { "level": "N2b", "chars": [ @@ -38766,16 +37721,6 @@ "kana": "さいたく", "en": "adoption;selection;choice" }, - { - "level": "N1", - "chars": [ - "列", - "陳" - ], - "kanji": "陳列", - "kana": "ちんれつ", - "en": "exhibition;display;show" - }, { "level": "N1", "chars": [ @@ -40950,25 +39895,6 @@ } ], "extra_vocab": [ - { - "level": "N2a", - "chars": [ - "幾" - ], - "kanji": "幾つ", - "kana": "いくつ", - "en": "how many?,how old?" - }, - { - "level": "N2a", - "chars": [ - "大", - "抵" - ], - "kanji": "大抵", - "kana": "たいてい", - "en": "usually,generally" - }, { "level": "N2a", "chars": [ @@ -41938,15 +40864,6 @@ "kana": "なめらか", "en": "smoothness;glassiness" }, - { - "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": [ @@ -42552,16 +41469,6 @@ } ], "extra_vocab": [ - { - "level": "N2a", - "chars": [ - "徴", - "特" - ], - "kanji": "特徴", - "kana": "とくちょう", - "en": "feature,characteristic" - }, { "level": "N2a", "chars": [ @@ -43513,16 +42420,6 @@ "kana": "ほうわ", "en": "saturation" }, - { - "level": "N1", - "chars": [ - "否", - "拒" - ], - "kanji": "拒否", - "kana": "きょひ", - "en": "denial;veto;rejection;refusal" - }, { "level": "N1", "chars": [ @@ -43897,16 +42794,6 @@ "kana": "びみょう", "en": "delicate,subtle" }, - { - "level": "N2a", - "chars": [ - "微", - "笑" - ], - "kanji": "微笑む", - "kana": "ほほえむ", - "en": "to smile" - }, { "level": "N2a", "chars": [ @@ -44003,16 +42890,6 @@ "kana": "きょうぐう", "en": "environment;circumstances" }, - { - "level": "N1", - "chars": [ - "微", - "笑" - ], - "kanji": "微笑", - "kana": "びしょう", - "en": "smile" - }, { "level": "N1", "chars": [ @@ -48261,15 +47138,6 @@ "kana": "そこ", "en": "that place;there" }, - { - "level": "N1", - "chars": [ - "其" - ], - "kanji": "其れ", - "kana": "それ", - "en": "it;that" - }, { "level": "N1", "chars": [ @@ -48289,16 +47157,6 @@ "kana": "かつて", "en": "once;ever" }, - { - "level": "N1", - "chars": [ - "共", - "其" - ], - "kanji": "其れ共", - "kana": "それとも", - "en": "or;or else" - }, { "level": "N1", "chars": [ @@ -49920,15 +48778,6 @@ "kana": "なれる", "en": "to become domesticated,to become tame" }, - { - "level": "N1", - "chars": [ - "此" - ], - "kanji": "此れ", - "kana": "これ", - "en": "this" - }, { "level": "N1", "chars": [ @@ -49947,15 +48796,6 @@ "kana": "たまり", "en": "collected things;gathering place;arrears" }, - { - "level": "N1", - "chars": [ - "此" - ], - "kanji": "此の", - "kana": "この", - "en": "this" - }, { "level": "N1", "chars": [ @@ -49995,16 +48835,6 @@ "kana": "あれこれ", "en": "one thing or another;this and that;this or that" }, - { - "level": "N1", - "chars": [ - "此", - "等" - ], - "kanji": "此れ等", - "kana": "これら", - "en": "these" - }, { "level": "N1", "chars": [ @@ -50604,16 +49434,6 @@ "kana": "あきれる", "en": "to be amazed;to be shocked" }, - { - "level": "N1", - "chars": [ - "呆", - "然" - ], - "kanji": "呆然", - "kana": "ぼうぜん", - "en": "dumbfounded;overcome with surprise;in blank amazement" - }, { "level": "N1", "chars": [ @@ -51234,15 +50054,6 @@ "kana": "かみきる", "en": "to bite off;to gnaw through" }, - { - "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::>(); + 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; + } } // ===================================================================== -- cgit v1.2.3