修复Nature.fromString和IOUtil.loadDictionary：#626

hankcs · Sep 17, 2017 · 5a5a056 · 5a5a056
1 parent 2077a2b
commit 5a5a056
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 2 deletions.
diff --git a/src/main/java/com/hankcs/hanlp/corpus/io/IOUtil.java b/src/main/java/com/hankcs/hanlp/corpus/io/IOUtil.java
@@ -14,6 +14,7 @@
 
 import com.hankcs.hanlp.corpus.tag.Nature;
 import com.hankcs.hanlp.dictionary.CoreDictionary;
+import com.hankcs.hanlp.utility.LexiconUtility;
 import com.hankcs.hanlp.utility.TextUtility;
 
 import java.io.*;
@@ -620,7 +621,7 @@ public static void loadDictionary(BufferedReader br, TreeMap<String, CoreDiction
             CoreDictionary.Attribute attribute = new CoreDictionary.Attribute(natureCount);
             for (int i = 0; i < natureCount; ++i)
             {
-                attribute.nature[i] = Enum.valueOf(Nature.class, param[1 + 2 * i]);
+                attribute.nature[i] = LexiconUtility.convertStringToNature(param[1 + 2 * i]);
                 attribute.frequency[i] = Integer.parseInt(param[2 + 2 * i]);
                 attribute.totalFrequency += attribute.frequency[i];
             }

diff --git a/src/main/java/com/hankcs/hanlp/corpus/tag/Nature.java b/src/main/java/com/hankcs/hanlp/corpus/tag/Nature.java
@@ -809,8 +809,17 @@ public static Nature fromString(String name)
         }
         catch (Exception e)
         {
-            return null;
+            // 动态添加的词语有可能无法通过valueOf获取，所以遍历搜索
+            for (Nature nature : Nature.values())
+            {
+                if (nature.toString().equals(name))
+                {
+                    return nature;
+                }
+            }
         }
+
+        return null;
     }
 
     /**

diff --git a/src/main/java/com/hankcs/hanlp/corpus/util/CustomNatureUtility.java b/src/main/java/com/hankcs/hanlp/corpus/util/CustomNatureUtility.java
@@ -81,4 +81,18 @@ public static void restore()
         enumBuster.restore();
         extraValueMap.clear();
     }
+
+    public static Nature getNature(String name)
+    {
+
+        try
+        {
+            return Nature.valueOf(name);
+        }
+        catch (Exception e)
+        {
+            // 动态添加的词语有可能无法通过valueOf获取
+            return extraValueMap.get(name);
+        }
+    }
 }
diff --git a/src/main/java/com/hankcs/hanlp/utility/LexiconUtility.java b/src/main/java/com/hankcs/hanlp/utility/LexiconUtility.java
@@ -150,4 +150,14 @@ public static Nature convertStringToNature(String name, LinkedHashSet<Nature> cu
             return nature;
         }
     }
+
+    /**
+     * 将字符串词性转为Enum词性
+     * @param name 词性名称
+     * @return 转换结果
+     */
+    public static Nature convertStringToNature(String name)
+    {
+        return convertStringToNature(name, null);
+    }
 }
diff --git a/src/test/java/com/hankcs/hanlp/corpus/tag/NatureTest.java b/src/test/java/com/hankcs/hanlp/corpus/tag/NatureTest.java
@@ -0,0 +1,16 @@
+package com.hankcs.hanlp.corpus.tag;
+
+import com.hankcs.hanlp.corpus.util.CustomNatureUtility;
+import junit.framework.TestCase;
+
+public class NatureTest extends TestCase
+{
+    public void testFromString() throws Exception
+    {
+        Nature one = CustomNatureUtility.addNature("新词性1");
+        Nature two = CustomNatureUtility.addNature("新词性2");
+
+        assertEquals(one, Nature.fromString("新词性1"));
+        assertEquals(two, Nature.fromString("新词性2"));
+    }
+}