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/11/11 12:23:56 UTC
svn commit: r1200812 - in
/incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp:
maxent/GISTrainer.java model/OnePassDataIndexer.java
model/TwoPassDataIndexer.java
Author: joern
Date: Fri Nov 11 11:23:55 2011
New Revision: 1200812
URL: http://svn.apache.org/viewvc?rev=1200812&view=rev
Log:
OPENNLP-369 Now using for each loop. Thanks to Aliaksandr Autayeu for providing patch.
Modified:
incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/GISTrainer.java
incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/OnePassDataIndexer.java
incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/TwoPassDataIndexer.java
Modified: incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/GISTrainer.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/GISTrainer.java?rev=1200812&r1=1200811&r2=1200812&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/GISTrainer.java (original)
+++ incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/GISTrainer.java Fri Nov 11 11:23:55 2011
@@ -206,7 +206,6 @@ class GISTrainer {
* This can improve model accuracy, though training will potentially take
* longer and use more memory. Model size will also be larger.
*
- * @param smooth true if smoothing is desired, false if not
*/
public void setGaussianSigma(double sigmaValue) {
useGaussianSmoothing = true;
@@ -370,8 +369,9 @@ class GISTrainer {
for (int aoi=0;aoi<numActiveOutcomes;aoi++) {
int oi = outcomePattern[aoi];
params[pi].setParameter(aoi, 0.0);
- for (int i = 0; i< modelExpects.length; i++)
- modelExpects[i][pi].setParameter(aoi, 0.0);
+ for (MutableContext[] modelExpect : modelExpects) {
+ modelExpect[pi].setParameter(aoi, 0.0);
+ }
if (predCount[pi][oi] > 0) {
observedExpects[pi].setParameter(aoi, predCount[pi][oi]);
}
@@ -622,9 +622,10 @@ class GISTrainer {
//params[pi].updateParameter(aoi,(Math.log(observed[aoi]) - Math.log(model[aoi])));
params[pi].updateParameter(aoi,((Math.log(observed[aoi]) - Math.log(model[aoi]))/correctionConstant));
}
-
- for (int i = 0; i< modelExpects.length; i++)
- modelExpects[i][pi].setParameter(aoi,0.0); // re-initialize to 0.0's
+
+ for (MutableContext[] modelExpect : modelExpects) {
+ modelExpect[pi].setParameter(aoi, 0.0); // re-initialize to 0.0's
+ }
}
}
Modified: incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/OnePassDataIndexer.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/OnePassDataIndexer.java?rev=1200812&r1=1200811&r2=1200812&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/OnePassDataIndexer.java (original)
+++ incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/OnePassDataIndexer.java Fri Nov 11 11:23:55 2011
@@ -148,8 +148,7 @@ public class OnePassDataIndexer extends
omap.put(oc, ocID);
}
- for (int i = 0; i < econtext.length; i++) {
- String pred = econtext[i];
+ for (String pred : econtext) {
if (predicateIndex.containsKey(pred)) {
indexedContext.add(predicateIndex.get(pred));
}
Modified: incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/TwoPassDataIndexer.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/TwoPassDataIndexer.java?rev=1200812&r1=1200811&r2=1200812&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/TwoPassDataIndexer.java (original)
+++ incubator/opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/TwoPassDataIndexer.java Fri Nov 11 11:23:55 2011
@@ -157,8 +157,7 @@ public class TwoPassDataIndexer extends
omap.put(oc, ocID);
}
- for (int i = 0; i < econtext.length; i++) {
- String pred = econtext[i];
+ for (String pred : econtext) {
if (predicateIndex.containsKey(pred)) {
indexedContext.add(predicateIndex.get(pred));
}