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 2013/06/06 20:30:19 UTC
svn commit: r1490391 - in
/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml: ./ maxent/
maxent/quasinewton/ perceptron/
Author: colen
Date: Thu Jun 6 18:30:19 2013
New Revision: 1490391
URL: http://svn.apache.org/r1490391
Log:
OPENNLP-581 Now the trainers abstract implementations stores a type parameter. Also, they call the isValid method, so each trainer don't have to do that anymore.
Modified:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractSequenceTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/EventTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/SequenceTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java Thu Jun 6 18:30:19 2013
@@ -84,12 +84,18 @@ public abstract class AbstractEventTrain
public abstract AbstractModel doTrain(DataIndexer indexer) throws IOException;
public final AbstractModel train(EventStream events) throws IOException {
+
+ if (!isValid()) {
+ throw new IllegalArgumentException("trainParams are not valid!");
+ }
+
HashSumEventStream hses = new HashSumEventStream(events);
DataIndexer indexer = getDataIndexer(events);
AbstractModel model = doTrain(indexer);
- addToReport("Training-Eventhash", hses.calculateHashSum().toString(16));
+ addToReport("Training-Eventhash", hses.calculateHashSum().toString(16));
+ addToReport(AbstractTrainer.TRAINER_TYPE_PARAM, EventTrainer.EVENT_VALUE);
return model;
}
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractSequenceTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractSequenceTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractSequenceTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractSequenceTrainer.java Thu Jun 6 18:30:19 2013
@@ -17,8 +17,12 @@
package opennlp.tools.ml;
+import java.io.IOException;
import java.util.Map;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.SequenceStream;
+
public abstract class AbstractSequenceTrainer extends AbstractTrainer implements
SequenceTrainer {
@@ -27,4 +31,19 @@ public abstract class AbstractSequenceTr
super(trainParams, reportMap);
}
+ public abstract AbstractModel doTrain(SequenceStream events)
+ throws IOException;
+
+ public final AbstractModel train(SequenceStream events) throws IOException {
+
+ if (!isValid()) {
+ throw new IllegalArgumentException("trainParams are not valid!");
+ }
+
+ AbstractModel model = doTrain(events);
+ addToReport(AbstractTrainer.TRAINER_TYPE_PARAM,
+ SequenceTrainer.SEQUENCE_VALUE);
+ return model;
+ }
+
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractTrainer.java Thu Jun 6 18:30:19 2013
@@ -24,6 +24,8 @@ import opennlp.tools.ml.maxent.GIS;
public abstract class AbstractTrainer {
public static final String ALGORITHM_PARAM = "Algorithm";
+
+ public static final String TRAINER_TYPE_PARAM = "TrainerType";
public static final String CUTOFF_PARAM = "Cutoff";
public static final int CUTOFF_DEFAULT = 5;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/EventTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/EventTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/EventTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/EventTrainer.java Thu Jun 6 18:30:19 2013
@@ -23,6 +23,8 @@ import opennlp.tools.ml.model.AbstractMo
import opennlp.tools.ml.model.EventStream;
public interface EventTrainer {
+
+ public static final String EVENT_VALUE = "Event";
public AbstractModel train(EventStream events) throws IOException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/SequenceTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/SequenceTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/SequenceTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/SequenceTrainer.java Thu Jun 6 18:30:19 2013
@@ -24,6 +24,8 @@ import opennlp.tools.ml.model.SequenceSt
public interface SequenceTrainer {
+ public static final String SEQUENCE_VALUE = "Sequence";
+
public AbstractModel train(SequenceStream events) throws IOException;
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java Thu Jun 6 18:30:19 2013
@@ -82,10 +82,6 @@ public class GIS extends AbstractEventTr
}
public AbstractModel doTrain(DataIndexer indexer) throws IOException {
- if (!isValid()) {
- throw new IllegalArgumentException("trainParams are not valid!");
- }
-
int iterations = getIterations();
AbstractModel model;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java Thu Jun 6 18:30:19 2013
@@ -130,10 +130,6 @@ public class QNTrainer extends AbstractE
}
public AbstractModel doTrain(DataIndexer indexer) throws IOException {
- if (!isValid()) {
- throw new IllegalArgumentException("trainParams are not valid!");
- }
-
AbstractModel model;
model = trainModel(indexer);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java Thu Jun 6 18:30:19 2013
@@ -95,11 +95,6 @@ public class PerceptronTrainer extends A
}
public boolean isValid() {
-
- if (!super.isValid()) {
- return false;
- }
-
String algorithmName = getAlgorithm();
if (algorithmName != null && !(PERCEPTRON_VALUE.equals(algorithmName))) {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java?rev=1490391&r1=1490390&r2=1490391&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java Thu Jun 6 18:30:19 2013
@@ -112,11 +112,7 @@ public class SimplePerceptronSequenceTra
return true;
}
- public AbstractModel train(SequenceStream events) throws IOException {
- if (!isValid()) {
- throw new IllegalArgumentException("trainParams are not valid!");
- }
-
+ public AbstractModel doTrain(SequenceStream events) throws IOException {
int iterations = getIterations();
int cutoff = getCutoff();