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:07 UTC
[13/50] [abbrv] opennlp git commit: Remove unnecessary casts
Remove unnecessary casts
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/d79b97cc
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/d79b97cc
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/d79b97cc
Branch: refs/heads/889
Commit: d79b97cc662ce0428d1823cfa5afe7988a3419e6
Parents: 34af4ae
Author: J�rn Kottmann <jo...@apache.org>
Authored: Fri Oct 28 18:27:24 2016 +0200
Committer: J�rn Kottmann <jo...@apache.org>
Committed: Mon Dec 19 23:35:01 2016 +0100
----------------------------------------------------------------------
.../cmdline/doccat/DoccatFineGrainedReportListener.java | 8 ++++----
.../lemmatizer/LemmatizerFineGrainedReportListener.java | 8 ++++----
.../postag/POSTaggerFineGrainedReportListener.java | 8 ++++----
.../opennlp/tools/languagemodel/NGramLanguageModel.java | 2 +-
.../opennlp/tools/ml/maxent/BasicContextGenerator.java | 2 +-
.../src/main/java/opennlp/tools/ml/maxent/GISModel.java | 2 +-
.../tools/ml/model/OnePassRealValueDataIndexer.java | 2 +-
.../main/java/opennlp/tools/parser/chunking/Parser.java | 2 +-
.../main/java/opennlp/tools/parser/treeinsert/Parser.java | 2 +-
.../main/java/opennlp/uima/chunker/ChunkerTrainer.java | 2 +-
.../java/opennlp/uima/doccat/DocumentCategorizer.java | 6 +++---
.../java/opennlp/uima/namefind/AbstractNameFinder.java | 10 +++++-----
.../java/opennlp/uima/normalizer/StringDictionary.java | 2 +-
.../src/main/java/opennlp/uima/parser/Parser.java | 5 ++---
.../main/java/opennlp/uima/postag/POSTaggerTrainer.java | 2 +-
.../java/opennlp/uima/util/AnnotationComboIterator.java | 10 +++++-----
16 files changed, 36 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/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 1f61b2c..932bd6f 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
@@ -625,13 +625,13 @@ public class DoccatFineGrainedReportListener implements DoccatEvaluationMonitor
for (String ref : tagset) {
int column = 0;
for (String pred : tagset) {
- matrix[line][column] = (double) (data.get(ref) != null ? data
- .get(ref).getValue(pred) : 0);
+ matrix[line][column] = data.get(ref) != null ? data
+ .get(ref).getValue(pred) : 0;
column++;
}
// set accuracy
- matrix[line][column] = (double) (data.get(ref) != null ? data.get(ref)
- .getAccuracy() : 0);
+ matrix[line][column] = data.get(ref) != null ? data.get(ref)
+ .getAccuracy() : 0;
line++;
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/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 1818db1..da7013d 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
@@ -754,13 +754,13 @@ public class LemmatizerFineGrainedReportListener
for (String ref : tagset) {
int column = 0;
for (String pred : tagset) {
- matrix[line][column] = (double) (data.get(ref) != null
- ? data.get(ref).getValue(pred) : 0);
+ matrix[line][column] = data.get(ref) != null
+ ? data.get(ref).getValue(pred) : 0;
column++;
}
// set accuracy
- matrix[line][column] = (double) (data.get(ref) != null
- ? data.get(ref).getAccuracy() : 0);
+ matrix[line][column] = data.get(ref) != null
+ ? data.get(ref).getAccuracy() : 0;
line++;
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/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 743d00f..369f353 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
@@ -761,13 +761,13 @@ public class POSTaggerFineGrainedReportListener implements
for (String ref : tagset) {
int column = 0;
for (String pred : tagset) {
- matrix[line][column] = (double) (data.get(ref) != null ? data
- .get(ref).getValue(pred) : 0);
+ matrix[line][column] = data.get(ref) != null ? data
+ .get(ref).getValue(pred) : 0;
column++;
}
// set accuracy
- matrix[line][column] = (double) (data.get(ref) != null ? data.get(ref)
- .getAccuracy() : 0);
+ matrix[line][column] = data.get(ref) != null ? data.get(ref)
+ .getAccuracy() : 0;
line++;
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-tools/src/main/java/opennlp/tools/languagemodel/NGramLanguageModel.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/languagemodel/NGramLanguageModel.java b/opennlp-tools/src/main/java/opennlp/tools/languagemodel/NGramLanguageModel.java
index 4b58c14..ff3039d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/languagemodel/NGramLanguageModel.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/languagemodel/NGramLanguageModel.java
@@ -122,7 +122,7 @@ public class NGramLanguageModel extends NGramModel implements LanguageModel {
}
private double getLaplaceSmoothingProbability(StringList ngram, StringList nMinusOneToken) {
- return (getCount(ngram) + k) / ((double) getCount(nMinusOneToken) + k * size());
+ return (getCount(ngram) + k) / (getCount(nMinusOneToken) + k * size());
}
private double getStupidBackoffProbability(StringList ngram, StringList nMinusOneToken) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
index 1175ecc..8cc39cc 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
@@ -44,7 +44,7 @@ public class BasicContextGenerator implements ContextGenerator {
*/
public String[] getContext(Object o) {
String s = (String) o;
- return (String[]) s.split(separator);
+ return s.split(separator);
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
index f0c1843..3623bd9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
@@ -199,7 +199,7 @@ public final class GISModel extends AbstractModel {
prior[oid] = Math
.exp(prior[oid]
* model.getConstantInverse()
- + ((1.0 - ((double) numfeats[oid] / model
+ + ((1.0 - (numfeats[oid] / model
.getCorrectionConstant())) * model.getCorrectionParam()));
} else {
prior[oid] = Math.exp(prior[oid] * model.getConstantInverse());
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java
index 438b67a..8bb05d2 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java
@@ -63,7 +63,7 @@ public class OnePassRealValueDataIndexer extends OnePassDataIndexer {
values = new float[numUniqueEvents][];
int numEvents = eventsToCompare.size();
for (int i = 0, j = 0; i < numEvents; i++) {
- ComparableEvent evt = (ComparableEvent) eventsToCompare.get(i);
+ ComparableEvent evt = eventsToCompare.get(i);
if (null == evt) {
continue; // this was a dupe, skip over it.
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
index 044477b..05314ef 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
@@ -315,7 +315,7 @@ public class Parser extends AbstractBottomUpParser {
// TODO: Remove cast for HeadRules
return new ParserModel(languageCode, buildModel, checkModel,
- posModel, chunkModel, (opennlp.tools.parser.HeadRules) rules,
+ posModel, chunkModel, rules,
ParserType.CHUNKING, manifestInfoEntries);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
index c1e54ca..a06576e 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
@@ -489,7 +489,7 @@ public class Parser extends AbstractBottomUpParser {
// TODO: Remove cast for HeadRules
return new ParserModel(languageCode, buildModel, checkModel,
attachModel, posModel, chunkModel,
- (opennlp.tools.parser.HeadRules) rules, ParserType.TREEINSERT, manifestInfoEntries);
+ rules, ParserType.TREEINSERT, manifestInfoEntries);
}
public static ParserModel train(String languageCode,
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-uima/src/main/java/opennlp/uima/chunker/ChunkerTrainer.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/chunker/ChunkerTrainer.java b/opennlp-uima/src/main/java/opennlp/uima/chunker/ChunkerTrainer.java
index 9602066..ad194ed 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/chunker/ChunkerTrainer.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/chunker/ChunkerTrainer.java
@@ -166,7 +166,7 @@ public class ChunkerTrainer extends CasConsumer_ImplBase {
chunkIndex.iterator(), containingConstraint);
while (chunkIterator.hasNext()) {
- AnnotationFS chunkAnnotation = (AnnotationFS) chunkIterator.next();
+ AnnotationFS chunkAnnotation = chunkIterator.next();
processChunk(tcas, (chunkAnnotation));
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-uima/src/main/java/opennlp/uima/doccat/DocumentCategorizer.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/doccat/DocumentCategorizer.java b/opennlp-uima/src/main/java/opennlp/uima/doccat/DocumentCategorizer.java
index eac01f7..5cf337f 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/doccat/DocumentCategorizer.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/doccat/DocumentCategorizer.java
@@ -56,11 +56,11 @@ public class DocumentCategorizer extends AbstractDocumentCategorizer {
protected void setBestCategory(CAS tcas, String bestCategory) {
FSIndex<AnnotationFS> categoryIndex = tcas.getAnnotationIndex(mCategoryType);
- AnnotationFS categoryAnnotation = (AnnotationFS) (categoryIndex.size() > 0 ?
- categoryIndex.iterator().next() : null);
+ AnnotationFS categoryAnnotation = categoryIndex.size() > 0 ?
+ categoryIndex.iterator().next() : null;
if (categoryIndex.size() > 0) {
- categoryAnnotation = (AnnotationFS) categoryIndex.iterator().next();
+ categoryAnnotation = categoryIndex.iterator().next();
}
else {
categoryAnnotation = tcas.createAnnotation(mCategoryType, 0,
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java b/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
index f607332..c0bad5d 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
@@ -152,17 +152,17 @@ abstract class AbstractNameFinder extends CasAnnotator_ImplBase {
}
Span[] names = find(cas,
- (String[]) sentenceTokenList.toArray(new String[sentenceTokenList.size()]));
+ sentenceTokenList.toArray(new String[sentenceTokenList.size()]));
AnnotationFS nameAnnotations[] = new AnnotationFS[names.length];
for (int i = 0; i < names.length; i++) {
- int startIndex = ((AnnotationFS) sentenceTokenAnnotationList.get(
- names[i].getStart())).getBegin();
+ int startIndex = sentenceTokenAnnotationList.get(
+ names[i].getStart()).getBegin();
- int endIndex = ((AnnotationFS) sentenceTokenAnnotationList.get(
- names[i].getEnd() - 1)).getEnd();
+ int endIndex = sentenceTokenAnnotationList.get(
+ names[i].getEnd() - 1).getEnd();
nameAnnotations[i] =
cas.createAnnotation(mNameType, startIndex, endIndex);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-uima/src/main/java/opennlp/uima/normalizer/StringDictionary.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/normalizer/StringDictionary.java b/opennlp-uima/src/main/java/opennlp/uima/normalizer/StringDictionary.java
index 595c951..e55f4ae 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/normalizer/StringDictionary.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/normalizer/StringDictionary.java
@@ -57,7 +57,7 @@ public class StringDictionary {
}
public String get(StringList key) {
- return (String) entries.get(key);
+ return entries.get(key);
}
public void put(StringList key, String value) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java b/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
index 3345799..a3b3f00 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
@@ -274,14 +274,13 @@ public class Parser extends CasAnnotator_ImplBase {
List<Span> tokenSpans = new LinkedList<Span>();
while(containingTokens.hasNext()) {
- AnnotationFS token = (AnnotationFS) containingTokens.next();
+ AnnotationFS token = containingTokens.next();
tokenSpans.add(new Span(token.getBegin() - sentenceAnnotation.getBegin(),
token.getEnd() - sentenceAnnotation.getBegin()));
}
- ParseConverter converter = new ParseConverter(sentence,(Span[])
- tokenSpans.toArray(new Span[tokenSpans.size()]));
+ ParseConverter converter = new ParseConverter(sentence,tokenSpans.toArray(new Span[tokenSpans.size()]));
Parse unparsedTree = converter.getParseForTagger();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-uima/src/main/java/opennlp/uima/postag/POSTaggerTrainer.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/postag/POSTaggerTrainer.java b/opennlp-uima/src/main/java/opennlp/uima/postag/POSTaggerTrainer.java
index e9bb048..23158b9 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/postag/POSTaggerTrainer.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/postag/POSTaggerTrainer.java
@@ -181,7 +181,7 @@ public class POSTaggerTrainer extends CasConsumer_ImplBase {
while (containingTokens.hasNext()) {
- AnnotationFS tokenAnnotation = (AnnotationFS) containingTokens.next();
+ AnnotationFS tokenAnnotation = containingTokens.next();
String tag = tokenAnnotation.getFeatureValueAsString(mPOSFeature);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/d79b97cc/opennlp-uima/src/main/java/opennlp/uima/util/AnnotationComboIterator.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/util/AnnotationComboIterator.java b/opennlp-uima/src/main/java/opennlp/uima/util/AnnotationComboIterator.java
index c7ca4ec..f6cac3f 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/util/AnnotationComboIterator.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/util/AnnotationComboIterator.java
@@ -86,12 +86,12 @@ public class AnnotationComboIterator implements Iterable<AnnotationIteratorPair>
AnnotationComboIterator.this.nextLowerChecked = true;
AnnotationComboIterator.this.nextLowerAvailable = false;
if (AnnotationComboIterator.this.lowerIt.isValid()) {
- AnnotationFS lowerFS = (AnnotationFS) AnnotationComboIterator.this.lowerIt.get();
+ AnnotationFS lowerFS = AnnotationComboIterator.this.lowerIt.get();
int lowerBegin = lowerFS.getBegin();
while (lowerBegin < AnnotationComboIterator.this.upperBegin) {
AnnotationComboIterator.this.lowerIt.moveToNext();
if (AnnotationComboIterator.this.lowerIt.isValid()) {
- lowerFS = (AnnotationFS) AnnotationComboIterator.this.lowerIt.get();
+ lowerFS = AnnotationComboIterator.this.lowerIt.get();
lowerBegin = lowerFS.getBegin();
} else {
return false;
@@ -113,7 +113,7 @@ public class AnnotationComboIterator implements Iterable<AnnotationIteratorPair>
throw new NoSuchElementException();
}
AnnotationComboIterator.this.nextLowerChecked = false;
- final AnnotationFS rv = (AnnotationFS) AnnotationComboIterator.this.lowerIt.get();
+ final AnnotationFS rv = AnnotationComboIterator.this.lowerIt.get();
AnnotationComboIterator.this.lowerIt.moveToNext();
return rv;
}
@@ -160,7 +160,7 @@ public class AnnotationComboIterator implements Iterable<AnnotationIteratorPair>
this.upperIt.moveToFirst();
this.lowerIt.moveToFirst();
if (this.upperIt.isValid()) {
- final AnnotationFS upperFS = (AnnotationFS) this.upperIt.get();
+ final AnnotationFS upperFS = this.upperIt.get();
this.upperBegin = upperFS.getBegin();
this.upperEnd = upperFS.getEnd();
} else {
@@ -176,7 +176,7 @@ public class AnnotationComboIterator implements Iterable<AnnotationIteratorPair>
if (!this.upperIt.hasNext()) {
throw new NoSuchElementException();
}
- final AnnotationFS upperFS = (AnnotationFS) this.upperIt.next();
+ final AnnotationFS upperFS = this.upperIt.next();
this.upperBegin = upperFS.getBegin();
this.upperEnd = upperFS.getEnd();
this.nextLowerChecked = false;