edkuksa/russianmorphology
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on better interface

Browse Source 
git-svn-id: https://russianmorphology.googlecode.com/svn/trunk@91 d817d54c-26ab-11de-abc9-2f7d1455ff7a
This commit is contained in:
alexander.a.kuznetsov 2009-11-25 15:51:55 +00:00
parent ce2e2daf7b
commit 36012f2943
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
english/src/test/java/org/apache/lucene/morphology/english/EnglishLuceneMorphTest.java
View File

@ -47,7 +47,7 @@ public class EnglishLuceneMorphTest {
for (int i = 1; i < qa.length; i++) { for (int i = 1; i < qa.length; i++) {
result.add(qa[i]); result.add(qa[i]);
} }
Set<String> stringList = new HashSet<String>(luceneMorph.getMorhInfo(qa[0])); Set<String> stringList = new HashSet<String>(luceneMorph.getNormalForms(qa[0]));
assertThat(stringList, equalTo(result)); assertThat(stringList, equalTo(result));
s = bufferedReader.readLine(); s = bufferedReader.readLine();
} }

12
morph/src/main/java/org/apache/lucene/morphology/LuceneMorphology.java
View File

@ -20,7 +20,6 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
public class LuceneMorphology extends MorphologyImpl { public class LuceneMorphology extends MorphologyImpl {
@ -33,17 +32,6 @@ public class LuceneMorphology extends MorphologyImpl {
super(inputStream, decoderEncoder); super(inputStream, decoderEncoder);
} }
@Override
public List<String> getMorhInfo(String s) {
ArrayList<String> result = new ArrayList<String>();
int[] ints = decoderEncoder.encodeToArray(revertWord(s));
int ruleId = findRuleId(ints);
for (Heuristic h : rules[rulesId[ruleId]]) {
result.add(h.transofrmWord(s));
}
return result;
}
protected void readRules(BufferedReader bufferedReader) throws IOException { protected void readRules(BufferedReader bufferedReader) throws IOException {
String s; String s;
Integer amount; Integer amount;

4
morph/src/main/java/org/apache/lucene/morphology/Morphology.java
View File

@ -20,6 +20,8 @@ import java.util.List;
public interface Morphology { public interface Morphology {
List<String> getMorhInfo(String s); List<String> getNormalForms(String s);
List<String> getMorfInfo(String s);
} }

12
morph/src/main/java/org/apache/lucene/morphology/MorphologyImpl.java
View File

@ -63,7 +63,17 @@ public class MorphologyImpl implements Morphology {
return grammaInfo; return grammaInfo;
} }
public List<String> getMorhInfo(String s) { public List<String> getNormalForms(String s) {
ArrayList<String> result = new ArrayList<String>();
int[] ints = decoderEncoder.encodeToArray(revertWord(s));
int ruleId = findRuleId(ints);
for (Heuristic h : rules[rulesId[ruleId]]) {
result.add(h.transofrmWord(s));
}
return result;
}
public List<String> getMorfInfo(String s) {
ArrayList<String> result = new ArrayList<String>(); ArrayList<String> result = new ArrayList<String>();
int[] ints = decoderEncoder.encodeToArray(revertWord(s)); int[] ints = decoderEncoder.encodeToArray(revertWord(s));
int ruleId = findRuleId(ints); int ruleId = findRuleId(ints);

2
morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyFilter.java
View File

@ -56,7 +56,7 @@ public class MorphlogyFilter extends TokenFilter {
if (!luceneMorph.checkString(nextToken.term())) { if (!luceneMorph.checkString(nextToken.term())) {
return nextToken; return nextToken;
} }
stack = luceneMorph.getMorhInfo(nextToken.term()); stack = luceneMorph.getNormalForms(nextToken.term());
index = 0; index = 0;
current = (Token) nextToken.clone(); current = (Token) nextToken.clone();
nextToken = createToken(stack.get(index++), current, reusableToken); nextToken = createToken(stack.get(index++), current, reusableToken);

2
russian/src/test/java/org/apache/lucene/morphology/russian/RussianLuceneMorphTest.java
View File

@ -47,7 +47,7 @@ public class RussianLuceneMorphTest {
for (int i = 1; i < qa.length; i++) { for (int i = 1; i < qa.length; i++) {
result.add(qa[i]); result.add(qa[i]);
} }
Set<String> stringList = new HashSet<String>(luceneMorph.getMorhInfo(qa[0])); Set<String> stringList = new HashSet<String>(luceneMorph.getNormalForms(qa[0]));
assertThat(stringList, equalTo(result)); assertThat(stringList, equalTo(result));
s = bufferedReader.readLine(); s = bufferedReader.readLine();
} }