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:56:54 UTC
svn commit: r1200831 -
/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/
Author: joern
Date: Fri Nov 11 11:56:54 2011
New Revision: 1200831
URL: http://svn.apache.org/viewvc?rev=1200831&view=rev
Log:
OPENNLP-368 Now using for each loop. Thanks to Aliaksandr Autayeu for providing patch.
Modified:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WindowFeatureGenerator.java
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java?rev=1200831&r1=1200830&r2=1200831&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/AdditionalContextFeatureGenerator.java Fri Nov 11 11:56:54 2011
@@ -37,8 +37,8 @@ public class AdditionalContextFeatureGen
String[] context = additionalContext[index];
- for (int i = 0; i < context.length; i++) {
- features.add("ne=" + context[i]);
+ for (String s : context) {
+ features.add("ne=" + s);
}
}
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java?rev=1200831&r1=1200830&r2=1200831&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/CharacterNgramFeatureGenerator.java Fri Nov 11 11:56:54 2011
@@ -17,7 +17,6 @@
package opennlp.tools.util.featuregen;
-import java.util.Iterator;
import java.util.List;
import opennlp.tools.ngram.NGramModel;
@@ -50,9 +49,7 @@ public class CharacterNgramFeatureGenera
NGramModel model = new NGramModel();
model.add(tokens[index], minLength, maxLength);
- for (Iterator<StringList> it = model.iterator(); it.hasNext();) {
-
- StringList tokenList = it.next();
+ for (StringList tokenList : model) {
if (tokenList.size() > 0) {
features.add("ng=" + tokenList.getToken(0).toLowerCase());
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java?rev=1200831&r1=1200830&r2=1200831&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java Fri Nov 11 11:56:54 2011
@@ -66,8 +66,8 @@ public class InSpanGenerator extends Fea
}
// iterate over names and check if a span is contained
- for (int i = 0; i < currentNames.length; i++) {
- if (currentNames[i].contains(index)) {
+ for (Span currentName : currentNames) {
+ if (currentName.contains(index)) {
// found a span for the current token
features.add(prefix + ":w=dic");
features.add(prefix + ":w=dic=" + tokens[index]);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java?rev=1200831&r1=1200830&r2=1200831&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/PrefixFeatureGenerator.java Fri Nov 11 11:56:54 2011
@@ -34,8 +34,8 @@ public class PrefixFeatureGenerator exte
public void createFeatures(List<String> features, String[] tokens, int index,
String[] previousOutcomes) {
String[] prefs = PrefixFeatureGenerator.getPrefixes(tokens[index]);
- for (int i = 0; i < prefs.length; i++) {
- features.add("pre=" + prefs[i]);
+ for (String pref : prefs) {
+ features.add("pre=" + pref);
}
}
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java?rev=1200831&r1=1200830&r2=1200831&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/SuffixFeatureGenerator.java Fri Nov 11 11:56:54 2011
@@ -34,8 +34,8 @@ public class SuffixFeatureGenerator exte
public void createFeatures(List<String> features, String[] tokens, int index,
String[] previousOutcomes) {
String[] suffs = SuffixFeatureGenerator.getSuffixes(tokens[index]);
- for (int i = 0; i < suffs.length; i++) {
- features.add("suf=" + suffs[i]);
+ for (String suff : suffs) {
+ features.add("suf=" + suff);
}
}
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WindowFeatureGenerator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WindowFeatureGenerator.java?rev=1200831&r1=1200830&r2=1200831&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WindowFeatureGenerator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WindowFeatureGenerator.java Fri Nov 11 11:56:54 2011
@@ -19,7 +19,6 @@
package opennlp.tools.util.featuregen;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -68,16 +67,16 @@ public class WindowFeatureGenerator impl
/**
* Initializes the current instance. The previous and next window size is 5.
*
- * @param generator
+ * @param generator feature generator
*/
public WindowFeatureGenerator(AdaptiveFeatureGenerator generator) {
this(generator, 5, 5);
}
/**
- * Initializes the current isntance with the given parameters.
+ * Initializes the current instance with the given parameters.
*
- * @param generators
+ * @param generators array of feature generators
*/
public WindowFeatureGenerator(AdaptiveFeatureGenerator... generators) {
this(new AggregatedFeatureGenerator(generators), 5, 5);
@@ -95,8 +94,8 @@ public class WindowFeatureGenerator impl
generator.createFeatures(prevFeatures, tokens, index - i, preds);
- for (Iterator<String> it = prevFeatures.iterator(); it.hasNext();) {
- features.add(PREV_PREFIX + i + it.next());
+ for (String prevFeature : prevFeatures) {
+ features.add(PREV_PREFIX + i + prevFeature);
}
}
}
@@ -109,8 +108,8 @@ public class WindowFeatureGenerator impl
generator.createFeatures(nextFeatures, tokens, index + i, preds);
- for (Iterator<String> it = nextFeatures.iterator(); it.hasNext();) {
- features.add(NEXT_PREFIX + i + it.next());
+ for (String nextFeature : nextFeatures) {
+ features.add(NEXT_PREFIX + i + nextFeature);
}
}
}
@@ -126,6 +125,6 @@ public class WindowFeatureGenerator impl
@Override
public String toString() {
- return super.toString()+": Prev windwow size: " + prevWindowSize +", Next window size: " + nextWindowSize;
+ return super.toString()+": Prev window size: " + prevWindowSize +", Next window size: " + nextWindowSize;
}
}