使用自定义Pair代替JavaFX的Pair

Author: hankcs

src/main/java/com/hankcs/hanlp/collection/dartsclone/Pair.java

@@ -5,6 +5,7 @@
 package com.hankcs.hanlp.collection.dartsclone;
 
 /**
+ * 模拟C++中的pair，也兼容JavaFX中的Pair
  * @author manabe
  */
 public class Pair<T, U>
@@ -18,6 +19,26 @@ public Pair(T first, U second)
         this.second = second;
     }
 
+    public T getFirst()
+    {
+        return first;
+    }
+
+    public T getKey()
+    {
+        return first;
+    }
+
+    public U getSecond()
+    {
+        return second;
+    }
+
+    public U getValue()
+    {
+        return second;
+    }
+
     @Override
     public String toString()
     {

src/main/java/com/hankcs/hanlp/dictionary/py/String2PinyinConverter.java

@@ -13,7 +13,7 @@
 
 import com.hankcs.hanlp.algoritm.ahocorasick.trie.Token;
 import com.hankcs.hanlp.algoritm.ahocorasick.trie.Trie;
-import javafx.util.Pair;
+import com.hankcs.hanlp.collection.dartsclone.Pair;
 
 import java.util.*;
 

src/main/java/com/hankcs/hanlp/suggest/scorer/pinyin/PinyinKey.java

@@ -13,11 +13,11 @@
 
 import com.hankcs.hanlp.algoritm.EditDistance;
 import com.hankcs.hanlp.algoritm.LongestCommonSubstring;
+import com.hankcs.hanlp.collection.dartsclone.Pair;
 import com.hankcs.hanlp.dictionary.py.Pinyin;
 import com.hankcs.hanlp.dictionary.py.PinyinUtil;
 import com.hankcs.hanlp.dictionary.py.String2PinyinConverter;
 import com.hankcs.hanlp.suggest.scorer.ISentenceKey;
-import javafx.util.Pair;
 
 import java.util.Arrays;
 import java.util.Iterator;

src/test/java/com/hankcs/demo/DemoChineseNameRecognition.java

@@ -32,7 +32,7 @@ public static void main(String[] args)
                 "王总和小丽结婚了",
                 "编剧邵钧林和稽道青说",
                 "这里有关天培的有关事迹",
-                "龚学平等领导,邓颖超生前",
+                "龚学平等领导说,邓颖超生前杜绝超生",
         };
         Segment segment = HanLP.newSegment().enableNameRecognize(true);
         for (String sentence : testCase)

src/test/java/com/hankcs/test/seg/TestSegment.java

@@ -34,7 +34,7 @@ public void testSeg() throws Exception
     {
         HanLP.Config.enableDebug();
         Segment segment = new DijkstraSegment().enableCustomDictionary(true).enableOrganizationRecognize(false);
-        System.out.println(segment.seg("陈膺奥我喜欢你"));
+        System.out.println(segment.seg("陈膺奥是一个人名"));
     }
 
     public void testNGram() throws Exception