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/12 19:28:05 UTC
svn commit: r1145688 - in /incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline: namefind/TokenNameFinderEvaluatorTool.java postag/POSTaggerEvaluatorTool.java tokenizer/TokenizerMEEvaluatorTool.java

Author: colen
Date: Tue Jul 12 17:28:05 2011
New Revision: 1145688

URL: http://svn.apache.org/viewvc?rev=1145688&view=rev
Log:
OPENNLP-221 Accidentally removed check if the file passed in -data is valid. Adding the validation back.

Modified:
    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/POSTaggerEvaluatorTool.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/namefind/TokenNameFinderEvaluatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java?rev=1145688&r1=1145687&r2=1145688&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 Tue Jul 12 17:28:05 2011
@@ -25,6 +25,7 @@ import opennlp.tools.cmdline.ArgumentPar
 import opennlp.tools.cmdline.BasicEvaluationParameters;
 import opennlp.tools.cmdline.CLI;
 import opennlp.tools.cmdline.CmdLineTool;
+import opennlp.tools.cmdline.CmdLineUtil;
 import opennlp.tools.cmdline.PerformanceMonitor;
 import opennlp.tools.cmdline.TerminateToolException;
 import opennlp.tools.namefind.NameFinderME;
@@ -59,6 +60,7 @@ public final class TokenNameFinderEvalua
         BasicEvaluationParameters.class);
 
     File testData = params.getData();
+    CmdLineUtil.checkInputFile("Test data", testData);
 
     Charset encoding = params.getEncoding();
 

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=1145688&r1=1145687&r2=1145688&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 Tue Jul 12 17:28:05 2011
@@ -25,6 +25,7 @@ import opennlp.tools.cmdline.ArgumentPar
 import opennlp.tools.cmdline.BasicEvaluationParameters;
 import opennlp.tools.cmdline.CLI;
 import opennlp.tools.cmdline.CmdLineTool;
+import opennlp.tools.cmdline.CmdLineUtil;
 import opennlp.tools.cmdline.TerminateToolException;
 import opennlp.tools.postag.POSEvaluator;
 import opennlp.tools.postag.POSModel;
@@ -57,6 +58,7 @@ public final class POSTaggerEvaluatorToo
         BasicEvaluationParameters.class);
 
     File testData = params.getData();
+    CmdLineUtil.checkInputFile("Test data", testData);
 
     Charset encoding = params.getEncoding();
 

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=1145688&r1=1145687&r2=1145688&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 Tue Jul 12 17:28:05 2011
@@ -17,6 +17,7 @@
 
 package opennlp.tools.cmdline.tokenizer;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
 
@@ -24,6 +25,7 @@ import opennlp.tools.cmdline.ArgumentPar
 import opennlp.tools.cmdline.BasicEvaluationParameters;
 import opennlp.tools.cmdline.CLI;
 import opennlp.tools.cmdline.CmdLineTool;
+import opennlp.tools.cmdline.CmdLineUtil;
 import opennlp.tools.cmdline.TerminateToolException;
 import opennlp.tools.tokenize.TokenSample;
 import opennlp.tools.tokenize.TokenizerEvaluator;
@@ -62,9 +64,12 @@ public final class TokenizerMEEvaluatorT
         new opennlp.tools.tokenize.TokenizerME(model));
 
     System.out.print("Evaluating ... ");
+    
+    File testData = params.getData();
+    CmdLineUtil.checkInputFile("Test data", testData);
 
     ObjectStream<TokenSample> sampleStream = TokenizerTrainerTool
-        .openSampleData("Test", params.getData(), encoding);
+        .openSampleData("Test", testData, encoding);
 
     try {
       evaluator.evaluate(sampleStream);