Marmelator/aho-corasick
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused varables, remove duplicate tests (both "nonOverlappingWordTransitions" and "nonOverlappingWholeWords" contain exactly the same code)

Browse Source
This commit is contained in:
Benni 2016-02-17 18:05:42 +01:00
parent 06675a6074
commit 165f18e581
4 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/ahocorasick/trie/Keyword.java
View File

@ -28,10 +28,6 @@ public class Keyword implements Comparable {
this.depth = depth; this.depth = depth;
} }
public void setDepth(int depth) {
this.depth = depth;
}
public int getDepth() { public int getDepth() {
return depth; return depth;
} }

4
src/main/java/org/ahocorasick/trie/Transition.java
View File

@ -34,10 +34,6 @@ public class Transition<T> {
this.length = length; this.length = length;
} }
public T transitionToken() {
return token;
}
public int getStart() { public int getStart() {
return start; return start;
} }

5
src/main/java/org/ahocorasick/trie/Trie.java
View File

@ -11,7 +11,6 @@ import org.ahocorasick.trie.handler.FirstMatchHandler;
import java.util.Collection; import java.util.Collection;
import java.util.Queue; import java.util.Queue;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.ListIterator;
import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingDeque;
/** /**
@ -42,9 +41,6 @@ public class Trie {
return (position < length) ? input.charAt(position) : '\0'; return (position < length) ? input.charAt(position) : '\0';
} }
public abstract Transition nextTransition(); public abstract Transition nextTransition();
public int getPosition() {
return position;
}
} }
private class WordTokenizer extends KeywordTokenizer { private class WordTokenizer extends KeywordTokenizer {
@ -186,7 +182,6 @@ public class Trie {
for (Keyword emit : emits) { for (Keyword emit : emits) {
int position = tn.getStart() + tn.getLength(); int position = tn.getStart() + tn.getLength();
int start = tknHistory.get(depth - emit.getDepth()).getStart(); int start = tknHistory.get(depth - emit.getDepth()).getStart();
ListIterator<Transition> tns = tknHistory.listIterator();
emitCandidateHolder.addCandidate( emitCandidateHolder.addCandidate(
new Emit(start, position - 1, emit.getText())); new Emit(start, position - 1, emit.getText()));
} }

19
src/test/java/org/ahocorasick/trie/TrieTest.java
View File

@ -262,25 +262,6 @@ public class TrieTest {
checkEmit(iterator.next(), 41, 48, "wiel dop"); checkEmit(iterator.next(), 41, 48, "wiel dop");
} }
@Test
public void nonOverlappingWordTransitions() {
Trie trie = Trie.builder()
.removeOverlaps()
.onlyWholeWords()
.addKeyword("peper molen")
.addKeyword("molen wiel")
.addKeyword("wiel dop")
.addKeyword("dop")
.build();
Collection<Emit> emits = trie.parseText("peper molen wiel dop xwiel dop wiel dopx wiel dop");
assertEquals(4, emits.size());
Iterator<Emit> iterator = emits.iterator();
checkEmit(iterator.next(), 0, 10, "peper molen");
checkEmit(iterator.next(), 12, 19, "wiel dop");
checkEmit(iterator.next(), 27, 29, "dop");
checkEmit(iterator.next(), 41, 48, "wiel dop");
}
@Test @Test
public void nonOverlappingWholeWordsWithCustomEmitHandler() { public void nonOverlappingWholeWordsWithCustomEmitHandler() {
Trie trie = Trie.builder() Trie trie = Trie.builder()