You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jk...@apache.org on 2012/03/20 04:30:22 UTC

svn commit: r1302767 - in /opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind: DictionaryNameFinderEvaluatorTest.java NameSampleDataStreamTest.java

Author: jkosin
Date: Tue Mar 20 03:30:22 2012
New Revision: 1302767

URL: http://svn.apache.org/viewvc?rev=1302767&view=rev
Log:
OPENNLP-471: addressed tests and the proper names being tested. Thanks again to William for this.

Modified:
    opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java
    opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleDataStreamTest.java

Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java?rev=1302767&r1=1302766&r2=1302767&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java Tue Mar 20 03:30:22 2012
@@ -53,7 +53,7 @@ public class DictionaryNameFinderEvaluat
     sample.close();
     FMeasure fmeasure = evaluator.getFMeasure();
 
-    // TODO: change to F-Measure when fix OPENNLP-471
+    assertTrue(fmeasure.getFMeasure() == 1);
     assertTrue(fmeasure.getRecallScore() == 1);
   }
 

Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleDataStreamTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleDataStreamTest.java?rev=1302767&r1=1302766&r2=1302767&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleDataStreamTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleDataStreamTest.java Tue Mar 20 03:30:22 2012
@@ -85,11 +85,11 @@ public class NameSampleDataStreamTest {
     NameSample ns = ds.read();
 
     String[] expectedNames = { "Alan McKennedy", "Julie", "Marie Clara",
-        "Stefanie Schmidt", "Mike", "Stefanie Schmidt", "George", "Luise",
-        "Alisa Fernandes", "Alisa", "Mike Sander", "Stefan Miller",
-        "Stefan Miller", "Stefan Miller", "Elenor Meier", "Gina Schneider",
-        "Bruno Schulz", "Michel Seile", "George Miller", "Miller",
-        "Peter Schubert", "Natalie" };
+        "Stefanie Schmidt", "Mike", "Stefanie Schmidt", "George", "Luise", 
+        "George Bauer", "Alisa Fernandes", "Alisa", "Mike Sander", 
+        "Stefan Miller", "Stefan Miller", "Stefan Miller", "Elenor Meier", 
+        "Gina Schneider", "Bruno Schulz", "Michel Seile", "George Miller", 
+        "Miller", "Peter Schubert", "Natalie" };
 
     List<String> names = new ArrayList<String>();
     List<Span> spans = new ArrayList<Span>();
@@ -111,20 +111,21 @@ public class NameSampleDataStreamTest {
     assertEquals(createDefaultSpan(4,6), spans.get(5));
     assertEquals(createDefaultSpan(2,3), spans.get(6));
     assertEquals(createDefaultSpan(16,17), spans.get(7));
-    assertEquals(createDefaultSpan(0,2), spans.get(8));
-    assertEquals(createDefaultSpan(0,1), spans.get(9));
-    assertEquals(createDefaultSpan(3,5), spans.get(10));
+    assertEquals(createDefaultSpan(18,20), spans.get(8));
+    assertEquals(createDefaultSpan(0,2), spans.get(9));
+    assertEquals(createDefaultSpan(0,1), spans.get(10));
     assertEquals(createDefaultSpan(3,5), spans.get(11));
-    assertEquals(createDefaultSpan(10,12), spans.get(12));
-    assertEquals(createDefaultSpan(1,3), spans.get(13));
-    assertEquals(createDefaultSpan(6,8), spans.get(14));
+    assertEquals(createDefaultSpan(3,5), spans.get(12));
+    assertEquals(createDefaultSpan(10,12), spans.get(13));
+    assertEquals(createDefaultSpan(1,3), spans.get(14));
     assertEquals(createDefaultSpan(6,8), spans.get(15));
-    assertEquals(createDefaultSpan(8,10), spans.get(16));
-    assertEquals(createDefaultSpan(12,14), spans.get(17));
-    assertEquals(createDefaultSpan(1,3), spans.get(18));
-    assertEquals(createDefaultSpan(0,1), spans.get(19));
-    assertEquals(createDefaultSpan(2,4), spans.get(20));
-    assertEquals(createDefaultSpan(5,6), spans.get(21));
+    assertEquals(createDefaultSpan(6,8), spans.get(16));
+    assertEquals(createDefaultSpan(8,10), spans.get(17));
+    assertEquals(createDefaultSpan(12,14), spans.get(18));
+    assertEquals(createDefaultSpan(1,3), spans.get(19));
+    assertEquals(createDefaultSpan(0,1), spans.get(20));
+    assertEquals(createDefaultSpan(2,4), spans.get(21));
+    assertEquals(createDefaultSpan(5,6), spans.get(22));
   }
   
   private Span createDefaultSpan(int s, int e) {