svn commit: r1561646 - /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java

[jo...@apache.org]

Author: joern
Date: Mon Jan 27 12:04:15 2014
New Revision: 1561646

URL: http://svn.apache.org/r1561646
Log:
OPENNLP-640 Added name types option to TokenNameFinderEvaluatorTool

Modified:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java?rev=1561646&r1=1561645&r2=1561646&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java Mon Jan 27 12:04:15 2014
@@ -24,11 +24,14 @@ import java.util.List;
 import opennlp.tools.cmdline.AbstractEvaluatorTool;
 import opennlp.tools.cmdline.PerformanceMonitor;
 import opennlp.tools.cmdline.TerminateToolException;
+import opennlp.tools.cmdline.ArgumentParser.OptionalParameter;
+import opennlp.tools.cmdline.ArgumentParser.ParameterDescription;
 import opennlp.tools.cmdline.namefind.TokenNameFinderEvaluatorTool.EvalToolParams;
 import opennlp.tools.cmdline.params.DetailedFMeasureEvaluatorParams;
 import opennlp.tools.cmdline.params.EvaluatorParams;
 import opennlp.tools.namefind.NameFinderME;
 import opennlp.tools.namefind.NameSample;
+import opennlp.tools.namefind.NameSampleTypeFilter;
 import opennlp.tools.namefind.TokenNameFinderEvaluationMonitor;
 import opennlp.tools.namefind.TokenNameFinderEvaluator;
 import opennlp.tools.namefind.TokenNameFinderModel;
@@ -39,6 +42,9 @@ public final class TokenNameFinderEvalua
     extends AbstractEvaluatorTool<NameSample, EvalToolParams> {
 
   interface EvalToolParams extends EvaluatorParams, DetailedFMeasureEvaluatorParams {
+    @OptionalParameter
+    @ParameterDescription(valueName = "types", description = "name types to use for evaluation")
+    String getNameTypes();
   }
 
   public TokenNameFinderEvaluatorTool() {
@@ -64,6 +70,11 @@ public final class TokenNameFinderEvalua
       listeners.add(detailedFListener);
     }
 
+    if (params.getNameTypes() != null) {
+      String nameTypes[] = params.getNameTypes().split(",");
+      sampleStream = new NameSampleTypeFilter(nameTypes, sampleStream);
+    }
+    
     TokenNameFinderEvaluator evaluator = new TokenNameFinderEvaluator(
         new NameFinderME(model),
         listeners.toArray(new TokenNameFinderEvaluationMonitor[listeners.size()]));