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 2016/12/26 13:34:17 UTC
[23/50] [abbrv] opennlp git commit: Replace while loop with foreach
Replace while loop with foreach
The foreach makes the code easier to read
See issue OPENNLP-871
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/e20dc210
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/e20dc210
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/e20dc210
Branch: refs/heads/889
Commit: e20dc210be4bf6d9438e009daf98ac2442a6f722
Parents: c3eeb5c
Author: J�rn Kottmann <jo...@apache.org>
Authored: Wed Nov 2 20:02:10 2016 +0100
Committer: J�rn Kottmann <jo...@apache.org>
Committed: Mon Dec 19 23:37:33 2016 +0100
----------------------------------------------------------------------
.../cmdline/doccat/DoccatFineGrainedReportListener.java | 12 +++++-------
.../lemmatizer/LemmatizerFineGrainedReportListener.java | 12 +++++-------
.../postag/POSTaggerFineGrainedReportListener.java | 4 +---
3 files changed, 11 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/e20dc210/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatFineGrainedReportListener.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatFineGrainedReportListener.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatFineGrainedReportListener.java
index 932bd6f..e07dc4f 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatFineGrainedReportListener.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatFineGrainedReportListener.java
@@ -275,22 +275,20 @@ public class DoccatFineGrainedReportListener implements DoccatEvaluationMonitor
"% Err", "Precision", "Recall", "F-Measure"));
printLine(tableSize);
- Iterator<String> tagIterator = tags.iterator();
- while (tagIterator.hasNext()) {
- String tag = tagIterator.next();
+ for (String tag : tags) {
int ocurrencies = getTagFrequency(tag);
int errors = getTagErrors(tag);
String rate = MessageFormat.format("{0,number,#.###}", (double) errors
- / ocurrencies);
+ / ocurrencies);
double p = getTagPrecision(tag);
double r = getTagRecall(tag);
double f = getTagFMeasure(tag);
printStream.append(String.format(format, tag, errors, ocurrencies, rate,
- MessageFormat.format("{0,number,#.###}", p > 0 ? p : 0),
- MessageFormat.format("{0,number,#.###}", r > 0 ? r : 0),
- MessageFormat.format("{0,number,#.###}", f > 0 ? f : 0))
+ MessageFormat.format("{0,number,#.###}", p > 0 ? p : 0),
+ MessageFormat.format("{0,number,#.###}", r > 0 ? r : 0),
+ MessageFormat.format("{0,number,#.###}", f > 0 ? f : 0))
);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/e20dc210/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
index da7013d..7af495c 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
@@ -367,22 +367,20 @@ public class LemmatizerFineGrainedReportListener
"% Err", "Precision", "Recall", "F-Measure"));
printLine(tableSize);
- Iterator<String> tagIterator = tags.iterator();
- while (tagIterator.hasNext()) {
- String tag = tagIterator.next();
+ for (String tag : tags) {
int ocurrencies = getTagFrequency(tag);
int errors = getTagErrors(tag);
String rate = MessageFormat.format("{0,number,#.###}",
- (double) errors / ocurrencies);
+ (double) errors / ocurrencies);
double p = getTagPrecision(tag);
double r = getTagRecall(tag);
double f = getTagFMeasure(tag);
printStream.append(String.format(format, tag, errors, ocurrencies, rate,
- MessageFormat.format("{0,number,#.###}", p > 0 ? p : 0),
- MessageFormat.format("{0,number,#.###}", r > 0 ? r : 0),
- MessageFormat.format("{0,number,#.###}", f > 0 ? f : 0))
+ MessageFormat.format("{0,number,#.###}", p > 0 ? p : 0),
+ MessageFormat.format("{0,number,#.###}", r > 0 ? r : 0),
+ MessageFormat.format("{0,number,#.###}", f > 0 ? f : 0))
);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/e20dc210/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
index 369f353..1a40a97 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
@@ -368,9 +368,7 @@ public class POSTaggerFineGrainedReportListener implements
"% Err", "Precision", "Recall", "F-Measure"));
printLine(tableSize);
- Iterator<String> tagIterator = tags.iterator();
- while (tagIterator.hasNext()) {
- String tag = tagIterator.next();
+ for (String tag : tags) {
int ocurrencies = getTagFrequency(tag);
int errors = getTagErrors(tag);
String rate = MessageFormat.format("{0,number,#.###}", (double) errors