You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2013/09/19 20:58:59 UTC
svn commit: r1524807 - in
/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind:
TokenNameFinderCrossValidatorTool.java TokenNameFinderTrainerTool.java
TrainingParams.java
Author: joern
Date: Thu Sep 19 18:58:58 2013
New Revision: 1524807
URL: http://svn.apache.org/r1524807
Log:
OPENNLP-599 Added name types filter to cross validator
Modified:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TrainingParams.java
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java?rev=1524807&r1=1524806&r2=1524807&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java Thu Sep 19 18:58:58 2013
@@ -29,6 +29,7 @@ import opennlp.tools.cmdline.namefind.To
import opennlp.tools.cmdline.params.CVParams;
import opennlp.tools.cmdline.params.DetailedFMeasureEvaluatorParams;
import opennlp.tools.namefind.NameSample;
+import opennlp.tools.namefind.NameSampleTypeFilter;
import opennlp.tools.namefind.TokenNameFinderCrossValidator;
import opennlp.tools.namefind.TokenNameFinderEvaluationMonitor;
import opennlp.tools.util.eval.EvaluationMonitor;
@@ -62,6 +63,11 @@ public final class TokenNameFinderCrossV
Map<String, Object> resources =
TokenNameFinderTrainerTool.loadResources(params.getResources());
+ if (params.getNameTypes() != null) {
+ String nameTypes[] = params.getNameTypes().split(",");
+ sampleStream = new NameSampleTypeFilter(nameTypes, sampleStream);
+ }
+
List<EvaluationMonitor<NameSample>> listeners = new LinkedList<EvaluationMonitor<NameSample>>();
if (params.getMisclassified()) {
listeners.add(new NameEvaluationErrorListener());
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java?rev=1524807&r1=1524806&r2=1524807&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java Thu Sep 19 18:58:58 2013
@@ -41,9 +41,7 @@ public final class TokenNameFinderTraine
extends AbstractTrainerTool<NameSample, TrainerToolParams> {
interface TrainerToolParams extends TrainingParams, TrainingToolParams {
- @OptionalParameter
- @ParameterDescription(valueName = "types", description = "name types to use for training")
- String getNameTypes();
+
}
public TokenNameFinderTrainerTool() {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TrainingParams.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TrainingParams.java?rev=1524807&r1=1524806&r2=1524807&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TrainingParams.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TrainingParams.java Thu Sep 19 18:58:58 2013
@@ -41,4 +41,8 @@ interface TrainingParams extends BasicTr
@ParameterDescription(valueName = "featuregenFile", description = "The feature generator descriptor file")
@OptionalParameter
File getFeaturegen();
+
+ @OptionalParameter
+ @ParameterDescription(valueName = "types", description = "name types to use for training")
+ String getNameTypes();
}