update

lingjf · Feb 8, 2021 · 81ce680 · 81ce680
1 parent 14502d3
commit 81ce680
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/get/append.txt b/get/append.txt
@@ -1 +1,2 @@
-recognize 
+recognize 2000
+church 5000
diff --git a/get/get.py b/get/get.py
@@ -192,8 +192,12 @@ def mix_sort(elem):
         res = min(elem["freq_index"], res)
     if "bnc_index" in elem:
         res = min(elem["bnc_index"], res)
+    return res
+
+def fin_sort(elem):
+    res = elem["seq"]
     if "adjust_index" in elem:
-        res = min(elem["adjust_index"], res)
+        res = elem["adjust_index"]
     return res
 
 def sequence(wordmap):
@@ -206,7 +210,10 @@ def sequence(wordmap):
         wordsort1.append(wordmap[word])
     wordsort1.sort(key=mix_sort, reverse=False)
     for i, word in enumerate(wordsort1):
-        wordmap[word["word"]]["seq"] = i + 1
+        word["seq"] = i + 1
+    wordsort1.sort(key=fin_sort, reverse=False)
+    for i, word in enumerate(wordsort1):
+        word["seq"] = i + 1
     return wordsort1
 
 def build_family(wordmap):

diff --git a/get/ignore.txt b/get/ignore.txt
@@ -11,6 +11,7 @@ km
 ft
 ad
 re
+en
 lb
 ma
 yon
@@ -130,4 +131,10 @@ its
 albeit
 cannot
 working
-hast
+hast
+putt
+clearly
+entirely
+notwithstanding
+papa
+doth
diff --git a/get/wordmap.json b/get/wordmap.json
diff --git a/index.js b/index.js
@@ -118,6 +118,7 @@ function show_words(words, a1, a2) {
       } else {
         res[x.w] = [
           x.i,
+          x.p[0],
           short_explain(x.e),
         ];
       }
@@ -182,7 +183,7 @@ if (!args[0]) {
     r2 = {};
     wordlist.forEach(function (x, i) {
       if (start <= i && i < end) {
-        r2[x.w] = [x.i, short_explain(x.e)];
+        r2[x.w] = [x.i, x.p[0], short_explain(x.e)];
       }
     });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "h2dict",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "repository": "http://registry.npmjs.org/h2dict",
   "main": "index.js",
   "bin": {

diff --git a/wordlist.json b/wordlist.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ km @@
     ft
     ad
     re
+    en
     lb
     ma
     yon
@@ Expand Down Expand Up / @@ -130,4 +131,10 @@ its @@
     albeit
     cannot
     working
-    hast
+    hast
+    putt
+    clearly
+    entirely
+    notwithstanding
+    papa
+    doth