svn commit: r1145724 - /incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java

[co...@apache.org]

Author: colen
Date: Tue Jul 12 19:07:55 2011
New Revision: 1145724

URL: http://svn.apache.org/viewvc?rev=1145724&view=rev
Log:
OPENNLP-221 Refactored Chunker cross validator to use Parameters

Modified:
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java

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=1145724&r1=1145723&r2=1145724&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 Tue Jul 12 19:07:55 2011
@@ -22,12 +22,12 @@ import java.io.IOException;
 
 import opennlp.tools.chunker.ChunkSample;
 import opennlp.tools.chunker.ChunkerCrossValidator;
-import opennlp.tools.cmdline.BasicTrainingParameters;
+import opennlp.tools.cmdline.ArgumentParser;
+import opennlp.tools.cmdline.BasicCrossValidatorParameters;
 import opennlp.tools.cmdline.CLI;
 import opennlp.tools.cmdline.CmdLineTool;
 import opennlp.tools.cmdline.CmdLineUtil;
 import opennlp.tools.cmdline.TerminateToolException;
-import opennlp.tools.cmdline.parser.TrainingParameters;
 import opennlp.tools.util.ObjectStream;
 import opennlp.tools.util.eval.FMeasure;
 
@@ -42,34 +42,28 @@ public final class ChunkerCrossValidator
   }
   
   public String getHelp() {
-    return "Usage: " + CLI.CMD + " " + getName() + " " + TrainingParameters.getParameterUsage() + "\n"+
-        BasicTrainingParameters.getDescription() + "\n"+
-        "-data trainingData      training data used for cross validation";
+    return "Usage: " + CLI.CMD + " " + getName() + " "
+        + ArgumentParser.createUsage(BasicCrossValidatorParameters.class);
   }
 
   public void run(String[] args) {
-    if (args.length < 6) {
-      System.out.println(getHelp());
+    if (!ArgumentParser.validateArguments(args, BasicCrossValidatorParameters.class)) {
+      System.err.println(getHelp());
       throw new TerminateToolException(1);
     }
     
-    BasicTrainingParameters parameters = new BasicTrainingParameters(args);
+    BasicCrossValidatorParameters params = ArgumentParser.parse(args,
+        BasicCrossValidatorParameters.class);
     
-    if(!parameters.isValid()) {
-      System.out.println(getHelp());
-      throw new TerminateToolException(1);
-    }
-    
-    File trainingDataInFile = new File(CmdLineUtil.getParameter("-data", args));
+    File trainingDataInFile = params.getData();
     CmdLineUtil.checkInputFile("Training Data", trainingDataInFile);
     
     ObjectStream<ChunkSample> sampleStream =
         ChunkerTrainerTool.openSampleData("Training Data",
-        trainingDataInFile, parameters.getEncoding());
+        trainingDataInFile, params.getEncoding());
     
-    ChunkerCrossValidator validator =
-        new ChunkerCrossValidator(
-        		parameters.getLanguage(), parameters.getCutoff(), parameters.getNumberOfIterations());
+    ChunkerCrossValidator validator = new ChunkerCrossValidator(
+        params.getLang(), params.getCutoff(), params.getIterations());
       
     try {
       validator.evaluate(sampleStream, 10);