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/19 06:23:18 UTC

svn commit: r1148150 - in /incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline: ./ chunker/ namefind/ postag/ sentdetect/ tokenizer/

Author: colen
Date: Tue Jul 19 04:23:16 2011
New Revision: 1148150

URL: http://svn.apache.org/viewvc?rev=1148150&view=rev
Log:
OPENNLP-232 Added folds parameter to Cross Validation tools

Modified:
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CVParams.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/namefind/TokenNameFinderCrossValidatorTool.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/sentdetect/SentenceDetectorCrossValidatorTool.java
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerCrossValidatorTool.java

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CVParams.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CVParams.java?rev=1148150&r1=1148149&r2=1148150&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CVParams.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CVParams.java Tue Jul 19 04:23:16 2011
@@ -36,4 +36,8 @@ public interface CVParams extends BasicT
   @OptionalParameter(defaultValue="false")
   Boolean getMisclassified();
   
+  @ParameterDescription(valueName = "num", description = "The number of folds. Default is 10")
+  @OptionalParameter(defaultValue="10")
+  Integer getFolds();
+  
 }

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=1148150&r1=1148149&r2=1148150&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 19 04:23:16 2011
@@ -42,7 +42,7 @@ public final class ChunkerCrossValidator
   }
   
   public String getShortDescription() {
-    return "10-fold cross validator for the chunker";
+    return "K-fold cross validator for the chunker";
   }
   
   public String getHelp() {
@@ -70,7 +70,7 @@ public final class ChunkerCrossValidator
         params.getLang(), params.getCutoff(), params.getIterations());
       
     try {
-      validator.evaluate(sampleStream, 10, params.getMisclassified());
+      validator.evaluate(sampleStream, params.getFolds(), params.getMisclassified());
     }
     catch (IOException e) {
       CmdLineUtil.printTrainingIoError(e);

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=1148150&r1=1148149&r2=1148150&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 Tue Jul 19 04:23:16 2011
@@ -43,7 +43,7 @@ public final class TokenNameFinderCrossV
   }
 
   public String getShortDescription() {
-    return "10-fold cross validator for the learnable Name Finder";
+    return "K-fold cross validator for the learnable Name Finder";
   }
 
   public String getHelp() {
@@ -87,7 +87,7 @@ public final class TokenNameFinderCrossV
         validator = new TokenNameFinderCrossValidator(params.getLang(), params.getType(), mlParams,
             featureGeneratorBytes, resources);
       }
-      validator.evaluate(sampleStream, 10, params.getMisclassified());
+      validator.evaluate(sampleStream, params.getFolds(), 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/POSTaggerCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerCrossValidatorTool.java?rev=1148150&r1=1148149&r2=1148150&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 Tue Jul 19 04:23:16 2011
@@ -43,7 +43,7 @@ public final class POSTaggerCrossValidat
   }
 
   public String getShortDescription() {
-    return "10-fold cross validator for the learnable POS tagger";
+    return "K-fold cross validator for the learnable POS tagger";
   }
 
   public String getHelp() {
@@ -85,7 +85,7 @@ public final class POSTaggerCrossValidat
             mlParams, tagdict, null);
       }
 
-      validator.evaluate(sampleStream, 10, params.getMisclassified());
+      validator.evaluate(sampleStream, params.getFolds(), params.getMisclassified());
     } catch (IOException e) {
       CmdLineUtil.printTrainingIoError(e);
       throw new TerminateToolException(-1);

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=1148150&r1=1148149&r2=1148150&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 Tue Jul 19 04:23:16 2011
@@ -43,7 +43,7 @@ public final class SentenceDetectorCross
   }
   
   public String getShortDescription() {
-    return "N-fold cross validator for the learnable sentence detector";
+    return "K-fold cross validator for the learnable sentence detector";
   }
   
   public String getHelp() {
@@ -80,7 +80,7 @@ public final class SentenceDetectorCross
     }
     
     try {
-      validator.evaluate(sampleStream, 10, params.getMisclassified());
+      validator.evaluate(sampleStream, params.getFolds(), params.getMisclassified());
     }
     catch (IOException e) {
       CmdLineUtil.printTrainingIoError(e);

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=1148150&r1=1148149&r2=1148150&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 Tue Jul 19 04:23:16 2011
@@ -43,7 +43,7 @@ public final class TokenizerCrossValidat
   }
   
   public String getShortDescription() {
-    return "10-fold cross validator for the learnable tokenizer";
+    return "K-fold cross validator for the learnable tokenizer";
   }
   
   public String getHelp() {
@@ -84,7 +84,7 @@ public final class TokenizerCrossValidat
     }
       
     try {
-      validator.evaluate(sampleStream, 10, params.getMisclassified());
+      validator.evaluate(sampleStream, params.getFolds(), params.getMisclassified());
     }
     catch (IOException e) {
       CmdLineUtil.printTrainingIoError(e);