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 2014/02/20 11:17:31 UTC
svn commit: r1570129 -
/opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/
Author: joern
Date: Thu Feb 20 10:17:31 2014
New Revision: 1570129
URL: http://svn.apache.org/r1570129
Log:
OPENNLP-636 Updated Trainer constructor usage. Init parameters are now passed in via the init method and not via the constructor.
Modified:
opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java
opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AdaptiveLogisticRegressionTrainer.java
opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java
opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/OnlineLogisticRegressionTrainer.java
opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/PassiveAggressiveTrainer.java
Modified: opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java?rev=1570129&r1=1570128&r2=1570129&view=diff
==============================================================================
--- opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java (original)
+++ opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java Thu Feb 20 10:17:31 2014
@@ -34,24 +34,23 @@ import org.apache.mahout.math.Vector;
abstract class AbstractOnlineLearnerTrainer extends AbstractEventTrainer {
- protected final int iterations;
+ protected int iterations;
- public AbstractOnlineLearnerTrainer(Map<String, String> trainParams,
- Map<String, String> reportMap) {
- super(trainParams, reportMap);
-
- // TODO: Extract parameters here, used by all implementations, e.g. learningRate
-
- String iterationsValue = trainParams.get("Iterations");
-
- if (iterationsValue != null) {
- iterations = Integer.parseInt(iterationsValue);
- }
- else {
- iterations = 20;
- }
+ public AbstractOnlineLearnerTrainer() {
}
+ public void init(Map<String, String> trainParams,
+ Map<String, String> reportMap) {
+ String iterationsValue = trainParams.get("Iterations");
+
+ if (iterationsValue != null) {
+ iterations = Integer.parseInt(iterationsValue);
+ }
+ else {
+ iterations = 20;
+ }
+ }
+
protected void trainOnlineLearner(DataIndexer indexer, org.apache.mahout.classifier.OnlineLearner pa) {
int cardinality = indexer.getPredLabels().length;
int outcomes[] = indexer.getOutcomeList();
Modified: opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AdaptiveLogisticRegressionTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AdaptiveLogisticRegressionTrainer.java?rev=1570129&r1=1570128&r2=1570129&view=diff
==============================================================================
--- opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AdaptiveLogisticRegressionTrainer.java (original)
+++ opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/AdaptiveLogisticRegressionTrainer.java Thu Feb 20 10:17:31 2014
@@ -32,7 +32,6 @@ public class AdaptiveLogisticRegressionT
public AdaptiveLogisticRegressionTrainer(Map<String, String> trainParams,
Map<String, String> reportMap) {
- super(trainParams, reportMap);
}
@Override
Modified: opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java?rev=1570129&r1=1570128&r2=1570129&view=diff
==============================================================================
--- opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java (original)
+++ opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java Thu Feb 20 10:17:31 2014
@@ -38,7 +38,6 @@ public class LogisticRegressionTrainer e
public LogisticRegressionTrainer(Map<String, String> trainParams,
Map<String, String> reportMap) {
- super(trainParams, reportMap);
}
@Override
Modified: opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/OnlineLogisticRegressionTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/OnlineLogisticRegressionTrainer.java?rev=1570129&r1=1570128&r2=1570129&view=diff
==============================================================================
--- opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/OnlineLogisticRegressionTrainer.java (original)
+++ opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/OnlineLogisticRegressionTrainer.java Thu Feb 20 10:17:31 2014
@@ -33,7 +33,6 @@ public class OnlineLogisticRegressionTra
public OnlineLogisticRegressionTrainer(Map<String, String> trainParams,
Map<String, String> reportMap) {
- super(trainParams, reportMap);
}
@Override
Modified: opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/PassiveAggressiveTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/PassiveAggressiveTrainer.java?rev=1570129&r1=1570128&r2=1570129&view=diff
==============================================================================
--- opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/PassiveAggressiveTrainer.java (original)
+++ opennlp/sandbox/mahout-addon/src/main/java/opennlp/addons/mahout/PassiveAggressiveTrainer.java Thu Feb 20 10:17:31 2014
@@ -31,7 +31,6 @@ public class PassiveAggressiveTrainer ex
public PassiveAggressiveTrainer(Map<String, String> trainParams,
Map<String, String> reportMap) {
- super(trainParams, reportMap);
}
@Override