You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by co...@apache.org on 2011/07/13 18:59:32 UTC
svn commit: r1146136 - in
/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline:
./ chunker/ namefind/ postag/ sentdetect/ tokenizer/
Author: colen
Date: Wed Jul 13 16:59:31 2011
New Revision: 1146136
URL: http://svn.apache.org/viewvc?rev=1146136&view=rev
Log:
OPENNLP-220 Changed the command line argument to -misclassified
Modified:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCrossValidatorParameters.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicEvaluationParameters.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCrossValidatorParameters.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCrossValidatorParameters.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCrossValidatorParameters.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCrossValidatorParameters.java Wed Jul 13 16:59:31 2011
@@ -32,8 +32,8 @@ public interface BasicCrossValidatorPara
@ParameterDescription(valueName = "testData", description = "the data to be used during evaluation")
File getData();
- @ParameterDescription(valueName = "isPrintErrors", description = "if true will print false negatives and positives")
+ @ParameterDescription(valueName = "true|false", description = "if true will print false negatives and false positives")
@OptionalParameter(defaultValue="false")
- Boolean getPrintErrors();
+ Boolean getMisclassified();
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicEvaluationParameters.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicEvaluationParameters.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicEvaluationParameters.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicEvaluationParameters.java Wed Jul 13 16:59:31 2011
@@ -35,8 +35,8 @@ public interface BasicEvaluationParamete
@ParameterDescription(valueName = "testData", description = "the data to be used during evaluation")
File getData();
- @ParameterDescription(valueName = "isPrintErrors", description = "if true will print false negatives and positives")
+ @ParameterDescription(valueName = "true|false", description = "if true will print false negatives and false positives")
@OptionalParameter(defaultValue="false")
- Boolean getPrintErrors();
+ Boolean getMisclassified();
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java Wed Jul 13 16:59:31 2011
@@ -66,7 +66,7 @@ public final class ChunkerCrossValidator
params.getLang(), params.getCutoff(), params.getIterations());
try {
- validator.evaluate(sampleStream, 10, params.getPrintErrors());
+ validator.evaluate(sampleStream, 10, params.getMisclassified());
}
catch (IOException e) {
CmdLineUtil.printTrainingIoError(e);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java Wed Jul 13 16:59:31 2011
@@ -65,7 +65,7 @@ public final class ChunkerEvaluatorTool
ChunkerModel model = new ChunkerModelLoader().load(params.getModel());
- ChunkerEvaluator evaluator = new ChunkerEvaluator(new ChunkerME(model), params.getPrintErrors());
+ ChunkerEvaluator evaluator = new ChunkerEvaluator(new ChunkerME(model), params.getMisclassified());
final ObjectStream<ChunkSample> sampleStream = ChunkerTrainerTool.openSampleData("Test",
testData, encoding);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java Wed Jul 13 16:59:31 2011
@@ -88,7 +88,7 @@ public final class TokenNameFinderCrossV
validator = new TokenNameFinderCrossValidator(params.getLang(), params.getType(), mlParams,
featureGeneratorBytes, resources);
}
- validator.evaluate(sampleStream, 10, params.getPrintErrors());
+ validator.evaluate(sampleStream, 10, params.getMisclassified());
} catch (IOException e) {
CmdLineUtil.printTrainingIoError(e);
throw new TerminateToolException(-1);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java Wed Jul 13 16:59:31 2011
@@ -68,7 +68,7 @@ public final class TokenNameFinderEvalua
.getModel());
opennlp.tools.namefind.TokenNameFinderEvaluator evaluator = new opennlp.tools.namefind.TokenNameFinderEvaluator(
- new NameFinderME(model), params.getPrintErrors());
+ new NameFinderME(model), params.getMisclassified());
final ObjectStream<NameSample> sampleStream = TokenNameFinderTrainerTool.openSampleData("Test",
testData, encoding);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java Wed Jul 13 16:59:31 2011
@@ -86,7 +86,7 @@ public final class POSTaggerCrossValidat
mlParams, tagdict, null);
}
- validator.evaluate(sampleStream, 10, params.getPrintErrors());
+ validator.evaluate(sampleStream, 10, params.getMisclassified());
} catch (IOException e) {
CmdLineUtil.printTrainingIoError(e);
throw new TerminateToolException(-1);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerEvaluatorTool.java Wed Jul 13 16:59:31 2011
@@ -65,7 +65,7 @@ public final class POSTaggerEvaluatorToo
POSModel model = new POSModelLoader().load(params.getModel());
POSEvaluator evaluator =
- new POSEvaluator(new opennlp.tools.postag.POSTaggerME(model), params.getPrintErrors());
+ new POSEvaluator(new opennlp.tools.postag.POSTaggerME(model), params.getMisclassified());
System.out.print("Evaluating ... ");
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java Wed Jul 13 16:59:31 2011
@@ -76,7 +76,7 @@ public final class SentenceDetectorCross
}
try {
- validator.evaluate(sampleStream, 10, params.getPrintErrors());
+ validator.evaluate(sampleStream, 10, params.getMisclassified());
}
catch (IOException e) {
CmdLineUtil.printTrainingIoError(e);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorEvaluatorTool.java Wed Jul 13 16:59:31 2011
@@ -63,7 +63,7 @@ public final class SentenceDetectorEvalu
CmdLineUtil.checkInputFile("Training Data", trainingDataInFile);
opennlp.tools.sentdetect.SentenceDetectorEvaluator evaluator = new opennlp.tools.sentdetect.SentenceDetectorEvaluator(
- new SentenceDetectorME(model), params.getPrintErrors());
+ new SentenceDetectorME(model), params.getMisclassified());
System.out.print("Evaluating ... ");
ObjectStream<SentenceSample> sampleStream = SentenceDetectorTrainerTool.openSampleData("Test",
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java Wed Jul 13 16:59:31 2011
@@ -84,7 +84,7 @@ public final class TokenizerCrossValidat
}
try {
- validator.evaluate(sampleStream, 10, params.getPrintErrors());
+ validator.evaluate(sampleStream, 10, params.getMisclassified());
}
catch (IOException e) {
CmdLineUtil.printTrainingIoError(e);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java?rev=1146136&r1=1146135&r2=1146136&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerMEEvaluatorTool.java Wed Jul 13 16:59:31 2011
@@ -61,7 +61,7 @@ public final class TokenizerMEEvaluatorT
TokenizerModel model = new TokenizerModelLoader().load(params.getModel());
TokenizerEvaluator evaluator = new TokenizerEvaluator(
- new opennlp.tools.tokenize.TokenizerME(model), params.getPrintErrors());
+ new opennlp.tools.tokenize.TokenizerME(model), params.getMisclassified());
System.out.print("Evaluating ... ");