Merge branch 'master' of github.com:medcl/elasticsearch-analysis-pinyin

wangko27 · Apr 3, 2019 · dda86dc · dda86dc
2 parents 02d4782 + 70c7fab
commit dda86dc
Show file tree

Hide file tree

Showing 5 changed files with 163 additions and 55 deletions.
diff --git a/src/main/java/org/elasticsearch/index/analysis/PinyinAlphabetTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/PinyinAlphabetTokenizer.java
@@ -10,74 +10,151 @@
  */
 public class PinyinAlphabetTokenizer {
 
-        public static List<String> walk(String text) {
-            int maxLength=6;
-            text = text.toLowerCase();
-            LinkedList<String> candidates=new LinkedList<>();
-            StringBuffer buffer=new StringBuffer();
-            boolean lastWord=true;
-            for (int i = 0; i < text.length(); i++) {
-                char c = text.charAt(i);
-                if ((c > 96 && c < 123) || (c > 64 && c < 91)) {
-                    if(!lastWord){
-                        String str = buffer.toString();
-                        buffer.setLength(0);
-                        candidates.add(str);
-                    }
-                    buffer.append(c);
-                    lastWord=true;
-                }else{
-                    //meet non letter
-                    if(lastWord){
-                        parse(candidates, buffer,true);
-                        if(buffer.length()>0){
-                            String str = buffer.toString();
-                            buffer.setLength(0);
-                            candidates.add(str);
-                        }
+    private static final int PINYIN_MAX_LENGTH = 6;
+
+    public static List<String> walk(String text) {
+        return segPinyinStr(text);
+    }
+
+    private static List<String> segPinyinStr(String content) {
+        String pinyinStr = content;
+        pinyinStr = pinyinStr.toLowerCase();
+        // 按非letter切分
+        List<String> pinyinStrList = splitByNoletter(pinyinStr);
+        List<String> pinyinList = new ArrayList<>();
+        for (String pinyinText : pinyinStrList) {
+            if (pinyinText.length() == 1) {
+                pinyinList.add(pinyinText);
+            } else {
+                List<String> forward = positiveMaxMatch(pinyinText, PINYIN_MAX_LENGTH);
+                if (forward.size() == 1) { // 前向只切出1个的话，没有必要再做逆向分词
+                    pinyinList.addAll(forward);
+                } else {
+                    // 分别正向、逆向最大匹配，选出最短的作为最优结果
+                    List<String> backward = reverseMaxMatch(pinyinText, PINYIN_MAX_LENGTH);
+                    if (forward.size() <= backward.size()) {
+                        pinyinList.addAll(forward);
+                    } else {
+                        pinyinList.addAll(backward);
                     }
-                    buffer.append(c);
-                    lastWord=false;
                 }
+            }
+        }
+        return pinyinList;
+    }
 
-                //start to check pinyin
-                if(buffer.length()>=maxLength){
-                    parse(candidates, buffer,false);
+    private static List<String> splitByNoletter(String pinyinStr) {
+        List<String> pinyinStrList = new ArrayList<>();
+        StringBuffer sb = new StringBuffer();
+        boolean lastWord = true;
+        for (char c : pinyinStr.toCharArray()) {
+            if ((c > 96 && c < 123) || (c > 64 && c < 91)) {
+                if (!lastWord){
+                    pinyinStrList.add(sb.toString());
+                    sb.setLength(0);
+                }
+                sb.append(c);
+                lastWord = true;
+            } else {
+                if (lastWord & sb.length()>0) {
+                    pinyinStrList.add(sb.toString());
+                    sb.setLength(0);
                 }
+                sb.append(c);
+                lastWord = false;
             }
+        }
+        if (sb.length() > 0) {
+            pinyinStrList.add(sb.toString());
+        }
+        return pinyinStrList;
 
-            //cleanup
-            if(lastWord){
-                parse(candidates,buffer,true);
-            }
+    }
 
-            //final cleanup
-            if(buffer.length()>0){
-                candidates.add(buffer.toString());
-            }
+    private static List<String> positiveMaxMatch(String pinyinText, int maxLength) {
 
-            return candidates;
+        List<String> pinyinList = new ArrayList<>();
+        StringBuffer noMatchBuffer = new StringBuffer();
+        for (int start = 0; start < pinyinText.length(); ) {
+            int end = start + maxLength;
+            if (end > pinyinText.length()) {
+                end = pinyinText.length();
+            }
+            if (start == end) {
+                break;
+            }
+            String sixStr = pinyinText.substring(start, end);
+            boolean match = false;
+            for (int j = 0; j < sixStr.length(); j++) {
+                String guess = sixStr.substring(0, sixStr.length() - j);
+                if (PinyinAlphabetDict.getInstance().match(guess)) {
+                    pinyinList.add(guess);
+                    start += guess.length();
+                    match = true;
+                    break;
+                }
+            }
+            if (!match) { //没命中,向后移动一位
+                noMatchBuffer.append(sixStr.substring(0, 1));
+                start++;
+            }else { // 命中，加上之前没命中的，并清空
+                if (noMatchBuffer.length() > 0) {
+                    pinyinList.add(noMatchBuffer.toString());
+                    noMatchBuffer.setLength(0);
+                }
+            }
         }
+        if (noMatchBuffer.length() > 0) {
+            pinyinList.add(noMatchBuffer.toString());
+            noMatchBuffer.setLength(0);
+        }
+
+        return pinyinList;
+    }
 
-    private static void parse(LinkedList<String> candidates, StringBuffer buffer,Boolean last) {
-        for (int j = 0; j < buffer.length(); j++) {
-            String guess=buffer.substring(0,buffer.length()-j);
-            if(PinyinAlphabetDict.getInstance().match(guess)){
-                candidates.add(guess);
-                String left=buffer.substring(buffer.length()-j,buffer.length());
-                buffer.setLength(0);
-                buffer.append(left);
-                if(!last){
+    private static List<String> reverseMaxMatch(String pinyinText, int maxLength) {
+        List<String> pinyinList = new ArrayList<>();
+        StringBuffer noMatchBuffer = new StringBuffer();
+        for (int end = pinyinText.length(); end >= 0; ) {
+            int start = end - maxLength;
+            if (start < 0) {
+                start = 0;
+            }
+            if (start == end) {
+                break;
+            }
+            boolean match = false;
+            String sixStr = pinyinText.substring(start, end);
+            for (int j = 0; j < sixStr.length(); j++) {
+                String guess = sixStr.substring(j);
+                if (PinyinAlphabetDict.getInstance().match(guess)) {
+                    pinyinList.add(guess);
+                    end -= guess.length();
+                    match = true;
                     break;
-                }else{
-                    if(left.length()>0){
-                        parse(candidates,buffer,last);
-                    }
+                }
+            }
+            if (!match) { //一个也没命中
+                noMatchBuffer.append(sixStr.substring(sixStr.length() - 1));
+                end--;
+            } else {
+                if (noMatchBuffer.length() > 0) {
+                    pinyinList.add(noMatchBuffer.toString());
+                    noMatchBuffer.setLength(0);
                 }
             }
         }
+
+        if (noMatchBuffer.length() > 0) {
+            pinyinList.add(noMatchBuffer.toString());
+            noMatchBuffer.setLength(0);
+        }
+        // reverse 保持切词顺序
+        Collections.reverse(pinyinList);
+        return pinyinList;
     }
 
+
 }
 
  class PinyinAlphabetDict {

diff --git a/src/main/java/org/elasticsearch/index/analysis/PinyinTokenFilter.java b/src/main/java/org/elasticsearch/index/analysis/PinyinTokenFilter.java
@@ -170,7 +170,7 @@ private boolean readTerm() {
 
         if (config.keepJoinedFullPinyin && !processedFullPinyinLetter && fullPinyinLetters.length() > 0) {
             processedFullPinyinLetter = true;
-            addCandidate(new TermItem(fullPinyinLetters.toString(), 0, fullPinyinLetters.length(), 1));
+            addCandidate(new TermItem(fullPinyinLetters.toString(), 0, source.length(), 1));
             fullPinyinLetters.setLength(0);
         }
 

diff --git a/src/main/java/org/elasticsearch/index/analysis/PinyinTokenizer.java b/src/main/java/org/elasticsearch/index/analysis/PinyinTokenizer.java
@@ -224,7 +224,7 @@ public final boolean incrementToken() throws IOException {
 
             if (config.keepJoinedFullPinyin && !processedFullPinyinLetter && fullPinyinLetters.length() > 0) {
                 processedFullPinyinLetter = true;
-                addCandidate(new TermItem(fullPinyinLetters.toString(), 0, fullPinyinLetters.length(), 1));
+                addCandidate(new TermItem(fullPinyinLetters.toString(), 0, source.length(), 1));
                 fullPinyinLetters.setLength(0);
             }
 

diff --git a/src/test/java/org/elasticsearch/index/analysis/PinyinAlphabetTokenizerTest.java b/src/test/java/org/elasticsearch/index/analysis/PinyinAlphabetTokenizerTest.java
@@ -0,0 +1,30 @@
+package org.elasticsearch.index.analysis;
+
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 拼音串切分，很难做到最好，认为取最少切分是最好的
+ *
+ * @author shenyanchao
+ * @since 2018-10-08 12:22
+ */
+public class PinyinAlphabetTokenizerTest {
+
+    @Test
+    public void walk() throws Exception {
+
+        Assert.assertEquals(Arrays.asList("xian").toString(), PinyinAlphabetTokenizer.walk("xian").toString());
+        Assert.assertEquals(Arrays.asList("wo", "shi", "liang").toString(),
+                PinyinAlphabetTokenizer.walk("woshiliang").toString());
+
+        Assert.assertEquals(Arrays.asList("zhong", "hua", "ren", "min", "gong", "he", "guo").toString(),
+                PinyinAlphabetTokenizer.walk("zhonghuarenmingongheguo").toString());
+        Assert.assertEquals(
+                Arrays.asList("5", "zhong", "hua", "ren", "89", "min", "gong", "he", "guo", "234").toString(),
+                PinyinAlphabetTokenizer.walk("5zhonghuaren89mingongheguo234").toString());
+    }
+
+}
diff --git a/...h/index/analysis/PinyinAnalysisTests.java → ...ch/index/analysis/PinyinAnalysisTest.java b/...h/index/analysis/PinyinAnalysisTests.java → ...ch/index/analysis/PinyinAnalysisTest.java
@@ -39,7 +39,8 @@
 
 /**
  */
-public class PinyinAnalysisTests {
+
+public class PinyinAnalysisTest {
 
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,8 @@ @@
     /**
      */
-    public class PinyinAnalysisTests {
+    public class PinyinAnalysisTest {
         @Test
@@ Expand Down @@