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 2011/08/22 12:39:24 UTC
svn commit: r1160195 -
/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerCrossValidator.java
Author: joern
Date: Mon Aug 22 10:39:24 2011
New Revision: 1160195
URL: http://svn.apache.org/viewvc?rev=1160195&view=rev
Log:
OPENNLP-258 Now using new util method to create Training Parameters.
Modified:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerCrossValidator.java
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerCrossValidator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerCrossValidator.java?rev=1160195&r1=1160194&r2=1160195&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerCrossValidator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerCrossValidator.java Mon Aug 22 10:39:24 2011
@@ -29,13 +29,11 @@ import opennlp.tools.util.eval.CrossVali
import opennlp.tools.util.eval.EvaluationSampleListener;
import opennlp.tools.util.eval.Mean;
import opennlp.tools.util.model.ModelType;
+import opennlp.tools.util.model.ModelUtil;
public class POSTaggerCrossValidator {
private final String languageCode;
- private final ModelType modelType;
- private final int cutoff;
- private final int iterations;
private final TrainingParameters params;
@@ -49,13 +47,10 @@ public class POSTaggerCrossValidator {
public POSTaggerCrossValidator(String languageCode, ModelType modelType, POSDictionary tagDictionary,
Dictionary ngramDictionary, int cutoff, int iterations) {
this.languageCode = languageCode;
- this.modelType = modelType;
- this.cutoff = cutoff;
- this.iterations = iterations;
+ this.params = ModelUtil.createTrainingParameters(iterations, cutoff);
+ this.params.put(TrainingParameters.ALGORITHM_PARAM, modelType.toString());
this.tagDictionary = tagDictionary;
this.ngramDictionary = ngramDictionary;
-
- params = null;
}
public POSTaggerCrossValidator(String languageCode, ModelType modelType, POSDictionary tagDictionary,
@@ -68,9 +63,6 @@ public class POSTaggerCrossValidator {
Dictionary ngramDictionary) {
this.params = trainParam;
this.languageCode = languageCode;
- cutoff = -1;
- iterations = -1;
- modelType = null;
}
public POSTaggerCrossValidator(String languageCode,
@@ -111,15 +103,8 @@ public class POSTaggerCrossValidator {
CrossValidationPartitioner.TrainingSampleStream<POSSample> trainingSampleStream = partitioner
.next();
- POSModel model;
-
- if (params == null) {
- model = POSTaggerME.train(languageCode, trainingSampleStream,
- modelType, tagDictionary, ngramDictionary, cutoff, iterations);
- } else {
- model = POSTaggerME.train(languageCode, trainingSampleStream, params,
+ POSModel model = POSTaggerME.train(languageCode, trainingSampleStream, params,
this.tagDictionary, this.ngramDictionary);
- }
POSEvaluator evaluator = new POSEvaluator(new POSTaggerME(model), listeners);