Merge pull request #1241 from jkirsch/master

#1240 - Ensures DictionaryAnnotator matches all token
dkpro · May 29, 2018 · e2bd0d7 · e2bd0d7
2 parents 6e3eec7 + 9a596e4
commit e2bd0d7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/.../src/main/java/de/tudarmstadt/ukp/dkpro/core/dictionaryannotator/DictionaryAnnotator.java b/.../src/main/java/de/tudarmstadt/ukp/dkpro/core/dictionaryannotator/DictionaryAnnotator.java
@@ -158,7 +158,7 @@ public void process(JCas jcas)
             List<Token> tokens = new ArrayList<>(selectCovered(Token.class, currSentence));
 
             for (int i = 0; i < tokens.size(); i++) {
-                List<Token> tokensToSentenceEnd = tokens.subList(i, tokens.size() - 1);
+                List<Token> tokensToSentenceEnd = tokens.subList(i, tokens.size());
                 String[] sentenceToEnd = new String[tokens.size()];
 
                 for (int j = 0; j < tokensToSentenceEnd.size(); j++) {

diff --git a/.../test/java/de/tudarmstadt/ukp/dkpro/core/dictionaryannotator/DictionaryAnnotatorTest.java b/.../test/java/de/tudarmstadt/ukp/dkpro/core/dictionaryannotator/DictionaryAnnotatorTest.java
@@ -115,4 +115,23 @@ public void testWithWrongValueFeature() throws Exception
             assertTrue(ExceptionUtils.getRootCauseMessage(e).contains("Undeclared feature"));
         }
     }
+
+    @Test
+    public void testMatchesAtEndOfSentence() throws Exception
+    {
+        AnalysisEngine ae = createEngine(DictionaryAnnotator.class,
+                DictionaryAnnotator.PARAM_ANNOTATION_TYPE, NamedEntity.class,
+                DictionaryAnnotator.PARAM_VALUE, "PERSON",
+                DictionaryAnnotator.PARAM_MODEL_LOCATION, "src/test/resources/persons.txt");
+
+        JCas jcas = JCasFactory.createJCas();
+        TokenBuilder<Token, Sentence> tb = new TokenBuilder<>(Token.class, Sentence.class);
+        tb.buildTokens(jcas, "I am John Silver");
+
+        ae.process(jcas);
+
+        NamedEntity ne = selectSingle(jcas, NamedEntity.class);
+        assertEquals("PERSON", ne.getValue());
+        assertEquals("John Silver", ne.getCoveredText());
+    }
 }