You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by ma...@apache.org on 2023/02/17 15:59:22 UTC
[opennlp-sandbox] 01/01: modernize classes of sandbox components
This is an automated email from the ASF dual-hosted git repository.
mawiesne pushed a commit to branch modernize_classes_of_sandbox_components
in repository https://gitbox.apache.org/repos/asf/opennlp-sandbox.git
commit 00b0c265900e48d6385232cb41ab08760e240cf0
Author: Martin Wiesner <ma...@hs-heilbronn.de>
AuthorDate: Fri Feb 17 16:59:11 2023 +0100
modernize classes of sandbox components
- modernizes classes to use a Java8+ code style (generics, ...)
- rewrites some old c-style array declarations
- adds final modifier where applicable
- switches to enhanced for-loop pattern where applicable
- removes unnecessary / useless variable initializations
- fixes compareTo implementations that violated the contract for equality
- adds static modifier for inner classes
- replaces `String#indexOf(..) < ..` checks with `String#contains(..)`
- replaces StringBuffer with StringBuilder
- removes unused imports
- removes superfluous toString() calls
- modernizes resource handling along the path
---
.../namefinder/EntityContentProvider.java | 17 ++--
.../caseditor/namefinder/MultiModelNameFinder.java | 2 +-
.../namefinder/NameFinderModelInputDialog.java | 2 -
.../connector/CSQueueCollectionReader.java | 2 +-
.../corpus_server/CorpusServerApplication.java | 2 +-
.../opennlp/corpus_server/CorpusServerBundle.java | 8 +-
.../opennlp/corpus_server/TaskQueueResource.java | 2 +-
.../corpus_server/store/MemoryCorporaStore.java | 2 +-
.../corpus_server/store/MemoryCorpusStore.java | 4 +-
.../corpus_server/taskqueue/MemoryTaskQueue.java | 2 +-
.../corpus_server/impl/DerbyCorporaStore.java | 2 +-
.../opennlp/corpus_server/impl/LuceneIndexer.java | 7 +-
.../corpus_server/impl/LuceneSearchService.java | 12 ++-
.../opennlp/corpus_server/tools/CASImporter.java | 4 +-
.../opennlp/corpus_server/tools/CorpusBackup.java | 2 +-
.../opennlp/corpus_server/tools/FileUtil.java | 2 +-
.../opennlp/corpus_server/tools/RemoveCAS.java | 2 -
.../mahout/AbstractOnlineLearnerTrainer.java | 4 +-
.../addons/mahout/LogisticRegressionTrainer.java | 6 +-
.../addons/mahout/VectorClassifierModel.java | 6 +-
.../java/opennlp/addons/mallet/CRFTrainer.java | 2 +-
.../opennlp/addons/mallet/TransducerModel.java | 8 +-
.../addons/mallet/TransducerModelSerializer.java | 3 +-
.../modelbuilder/impls/FileSentenceProvider.java | 4 +-
.../java/org/apache/opennlp/utils/TrainingSet.java | 2 +-
.../org/apache/opennlp/utils/cfg/CFGRunner.java | 3 +-
.../utils/cfg/ProbabilisticContextFreeGrammar.java | 2 +-
.../classification/SimpleNaiveBayesClassifier.java | 8 +-
.../org/apache/opennlp/utils/ngram/NGramUtils.java | 2 +-
.../java/opennlp/tools/coref/AbstractLinker.java | 16 ++--
.../main/java/opennlp/tools/coref/CorefSample.java | 6 +-
.../java/opennlp/tools/coref/CorefTrainer.java | 24 +++---
.../java/opennlp/tools/coref/DiscourseElement.java | 6 +-
.../java/opennlp/tools/coref/DiscourseModel.java | 4 +-
.../tools/coref/mention/AbstractMentionFinder.java | 46 ++++-------
.../opennlp/tools/coref/mention/DefaultParse.java | 24 +++---
.../opennlp/tools/coref/mention/Dictionary.java | 8 +-
.../tools/coref/mention/DictionaryFactory.java | 5 +-
.../tools/coref/mention/JWNLDictionary.java | 22 ++---
.../java/opennlp/tools/coref/mention/Mention.java | 2 +-
.../tools/coref/mention/MentionContext.java | 24 +++---
.../opennlp/tools/coref/mention/MentionFinder.java | 10 +--
.../opennlp/tools/coref/mention/PTBHeadFinder.java | 5 +-
.../tools/coref/resolver/AbstractResolver.java | 6 +-
.../tools/coref/resolver/CommonNounResolver.java | 2 +-
.../resolver/DefaultNonReferentialResolver.java | 14 ++--
.../tools/coref/resolver/DefiniteNounResolver.java | 2 +-
.../resolver/FixedNonReferentialResolver.java | 2 +-
.../opennlp/tools/coref/resolver/IsAResolver.java | 10 +--
.../tools/coref/resolver/MaxentResolver.java | 4 +-
.../tools/coref/resolver/PluralNounResolver.java | 2 +-
.../coref/resolver/PluralPronounResolver.java | 4 +-
.../tools/coref/resolver/ProperNounResolver.java | 10 +--
.../tools/coref/resolver/ResolverUtils.java | 4 +-
.../coref/resolver/SingularPronounResolver.java | 2 +-
.../coref/resolver/SpeechPronounResolver.java | 10 +--
.../main/java/opennlp/tools/coref/sim/Context.java | 16 ++--
.../main/java/opennlp/tools/coref/sim/Gender.java | 4 +-
.../tools/coref/sim/MaxentCompatibilityModel.java | 2 +-
.../main/java/opennlp/tools/coref/sim/Number.java | 4 +-
.../java/opennlp/tools/coref/sim/NumberModel.java | 8 +-
.../java/opennlp/tools/coref/sim/SemanticEnum.java | 2 +-
.../opennlp/tools/coref/sim/SimilarityModel.java | 2 +-
.../opennlp/tools/coref/sim/TestGenderModel.java | 8 +-
.../opennlp/tools/coref/sim/TestNumberModel.java | 6 +-
.../tools/coref/sim/TestSimilarityModel.java | 2 +-
.../formats/muc/FullParseCorefEnhancerStream.java | 14 ++--
.../muc/Muc6FullParseCorefSampleStreamFactory.java | 10 +--
.../tools/formats/muc/MucCorefContentHandler.java | 18 ++---
.../tools/formats/muc/MucCorefSampleStream.java | 2 +-
.../formats/muc/MucMentionInserterStream.java | 4 +-
.../formats/muc/NameFinderCorefEnhancerStream.java | 6 +-
.../opennlp/tools/formats/muc/RawCorefSample.java | 4 +-
.../muc/ShallowParseCorefEnhancerStream.java | 2 +-
.../opennlp/tools/lang/english/CorefParse.java | 10 +--
.../tools/lang/english/TreebankNameFinder.java | 6 +-
.../tools/dl/NameSampleDataSetIterator.java | 2 +-
opennlp-similarity/RELEASE_NOTES.html | 4 +-
.../multithreaded/BingWebQueryRunnerThread.java | 6 +-
.../contentgen/multithreaded/MyEventListener.java | 2 +-
.../apps/object_dedup/SimilarityAccessorBase.java | 38 +++++----
.../apps/relevanceVocabs/PhraseProcessor.java | 36 ++++-----
.../tools/apps/relevanceVocabs/SentimentVocab.java | 12 +--
.../apps/relevanceVocabs/SynonymListFilter.java | 8 +-
.../tools/apps/relevanceVocabs/SynonymMap.java | 2 +-
.../BingAPIProductSearchManager.java | 12 ++-
.../review_builder/FBOpenGraphSearchManager.java | 8 +-
.../review_builder/MachineTranslationWrapper.java | 22 ++---
.../review_builder/MinedSentenceProcessor.java | 86 ++++++++++----------
.../review_builder/SentenceBeingOriginalized.java | 3 +-
.../apps/review_builder/SentenceOriginalizer.java | 10 +--
.../URLsWithReviewFinderByProductName.java | 4 +-
.../review_builder/WebPageReviewExtractor.java | 14 ++--
.../tools/apps/utils/email/EmailSender.java | 4 +-
.../ClassifierTrainingSetIndexer.java | 34 +++-----
.../tools/doc_classifier/DocClassifier.java | 22 ++---
...cClassifierTrainingSetMultilingualExtender.java | 8 +-
.../DocClassifierTrainingSetVerifier.java | 12 +--
.../enron_email_recognizer/EmailNormalizer.java | 2 +-
.../EmailTrainingSetFormer.java | 11 +--
.../java/opennlp/tools/fca/BasicLevelMetrics.java | 2 +-
.../java/opennlp/tools/fca/ConceptLattice.java | 11 ++-
.../main/java/opennlp/tools/fca/FcaConverter.java | 4 +-
.../src/main/java/opennlp/tools/fca/FcaReader.java | 10 +--
.../src/main/java/opennlp/tools/fca/FcaWriter.java | 4 +-
.../main/java/opennlp/tools/fca/FormalConcept.java | 14 ++--
.../src/main/java/opennlp/tools/fca/Measures.java | 42 +++++-----
.../jsmlearning/FeatureSpaceCoverageProcessor.java | 28 +++----
.../tools/jsmlearning/IntersectionSetBuilder.java | 2 +-
.../opennlp/tools/jsmlearning/JSMDecision.java | 1 -
.../tools/jsmlearning/JSMLearnerOnLatticeBase.java | 90 ++++++++++-----------
.../JSMLearnerOnLatticeWithAbduction.java | 18 -----
.../JSMLearnerOnLatticeWithDeduction.java | 49 ++++++-----
.../tools/jsmlearning/ProfileReaderWriter.java | 17 ++--
.../tools/jsmlearning/TreeKernelRunner.java | 4 +-
.../main/java/opennlp/tools/nl2code/NL2Obj.java | 8 +-
.../opennlp/tools/nl2code/NL2ObjCreateAssign.java | 10 +--
.../java/opennlp/tools/nl2code/ObjectPhrase.java | 6 +-
.../tools/nl2code/ObjectPhraseListForSentence.java | 8 +-
.../opennlp/tools/parse_thicket/IGeneralizer.java | 2 +-
.../opennlp/tools/parse_thicket/ParseTreeNode.java | 12 ++-
.../java/opennlp/tools/parse_thicket/Triple.java | 2 -
.../tools/parse_thicket/VerbNetProcessor.java | 60 +++++++-------
.../BingQueryRunnerMultipageSearchResults.java | 15 +---
.../parse_thicket/apps/MinedSentenceProcessor.java | 89 ++++++++++----------
.../apps/MultiSentenceSearchResultsProcessor.java | 28 +++----
.../parse_thicket/apps/SnippetToParagraph.java | 57 ++++++-------
.../apps/WebPageContentSentenceExtractor.java | 12 +--
.../tools/parse_thicket/apps/WebPageExtractor.java | 35 ++++----
.../CommunicativeActionsAttribute.java | 2 +-
.../parse_thicket/matching/LemmaFormManager.java | 2 -
.../parse_thicket/matching/LemmaGeneralizer.java | 6 +-
.../matching/NERPhraseGeneralizer.java | 24 +++---
.../matching/PartOfSpeechGeneralizer.java | 2 +-
.../parse_thicket/matching/PhraseGeneralizer.java | 30 +++----
.../matching/PhraseGroupGeneralizer.java | 2 +-
.../LinguisticPatternStructure.java | 6 +-
.../pattern_structure/PatternStructureWriter.java | 8 +-
.../pattern_structure/PhraseConcept.java | 8 +-
.../pattern_structure/PhrasePatternStructure.java | 14 ++--
.../tools/similarity/apps/BingQueryRunner.java | 13 ++-
.../apps/BingRelatedSpellingQueryRunner.java | 10 +--
.../tools/similarity/apps/BingResponse.java | 2 +-
.../tools/similarity/apps/BingWebQueryRunner.java | 8 +-
.../tools/similarity/apps/ContentGenerator.java | 16 ++--
.../similarity/apps/ContentGeneratorRunner.java | 5 +-
.../similarity/apps/ContentGeneratorSupport.java | 40 ++++-----
.../apps/GeneratedSentenceProcessor.java | 8 +-
.../apps/GoogleAutoCompleteQueryRunner.java | 12 +--
.../opennlp/tools/similarity/apps/HitBase.java | 14 ++--
.../similarity/apps/RelatedSentenceFinder.java | 20 ++---
.../similarity/apps/RelatedSentenceFinderML.java | 22 ++---
.../similarity/apps/SearchResultsProcessor.java | 7 +-
.../apps/SpeechRecognitionResultsProcessor.java | 4 +-
.../similarity/apps/StoryDiscourseNavigator.java | 32 ++++----
.../apps/WebSearchEngineResultsScraper.java | 14 ++--
.../tools/similarity/apps/solr/Comment.java | 4 +-
.../tools/similarity/apps/solr/CommentsRel.java | 12 +--
.../apps/solr/ContentGeneratorRequestHandler.java | 6 +-
.../apps/solr/IterativeSearchRequestHandler.java | 13 +--
.../apps/solr/NLProgram2CodeRequestHandler.java | 2 +-
.../solr/SearchResultsReRankerRequestHandler.java | 12 +--
.../apps/solr/SyntGenRequestHandler.java | 2 +-
.../tools/similarity/apps/solr/WordDocBuilder.java | 6 +-
.../apps/solr/WordDocBuilderEndNotes.java | 23 +-----
.../solr/WordDocBuilderSingleImageSearchCall.java | 22 +----
.../similarity/apps/taxo_builder/AriAdapter.java | 14 ++--
.../similarity/apps/taxo_builder/CsvAdapter.java | 9 ++-
.../apps/taxo_builder/DomainTaxonomyExtender.java | 36 ++++-----
.../taxo_builder/TaxoQuerySnapshotMatcher.java | 16 ++--
.../taxo_builder/TaxonomyExtenderViaMebMining.java | 24 +++---
.../apps/taxo_builder/TaxonomySerializer.java | 28 +++----
.../similarity/apps/utils/CountItemsList.java | 4 +-
.../tools/similarity/apps/utils/FileHandler.java | 75 ++++++++---------
.../apps/utils/LevensteinDistanceFinder.java | 2 +-
.../tools/similarity/apps/utils/PageFetcher.java | 2 +-
.../opennlp/tools/similarity/apps/utils/Pair.java | 2 -
.../apps/utils/StringDistanceMeasurer.java | 22 ++---
.../opennlp/tools/similarity/apps/utils/Utils.java | 18 ++---
.../tools/similarity/apps/utils/ValueSortMap.java | 26 +++---
.../main/java/opennlp/tools/stemmer/PStemmer.java | 26 +++---
.../textsimilarity/EpistemicStatesTrainingSet.java | 2 +-
.../tools/textsimilarity/ParseTreeChunk.java | 94 +++++++++++-----------
.../textsimilarity/ParseTreeChunkComparable.java | 2 +
.../tools/textsimilarity/ParseTreeMatcher.java | 14 ++--
.../textsimilarity/SentencePairMatchResult.java | 4 +-
.../tools/textsimilarity/TextProcessor.java | 64 ++++++---------
.../textsimilarity/TextSimilarityBagOfWords.java | 4 +-
.../opennlp/tools/textsimilarity/TokenObject.java | 17 ++--
.../chunker2matcher/ParserCacheSerializer.java | 4 +-
.../ParserChunker2MatcherProcessor.java | 47 +++++------
.../ParserPure2MatcherProcessor.java | 8 +-
.../textsimilarity/chunker2matcher/PhraseNode.java | 8 +-
.../chunker2matcher/SentenceNode.java | 6 +-
.../chunker2matcher/SyntacticTreeNode.java | 6 +-
.../textsimilarity/chunker2matcher/WordNode.java | 4 +-
.../tools/word2vec/W2VDistanceMeasurer.java | 2 +-
.../disambiguator/IMSWSDContextGenerator.java | 7 +-
.../java/opennlp/tools/disambiguator/Lesk.java | 8 +-
.../tools/disambiguator/LeskParameters.java | 4 +-
.../disambiguator/OSCCWSDContextGenerator.java | 2 +-
.../java/opennlp/tools/disambiguator/SynNode.java | 51 +++++-------
.../opennlp/tools/disambiguator/WSDHelper.java | 4 +-
.../java/opennlp/tools/disambiguator/WSDModel.java | 6 +-
.../opennlp/tools/disambiguator/WSDParameters.java | 4 +-
.../opennlp/tools/disambiguator/WSDSample.java | 10 +--
.../tools/disambiguator/WSDisambiguator.java | 4 +-
.../tools/disambiguator/WSDisambiguatorME.java | 8 +-
.../java/opennlp/tools/disambiguator/WordPOS.java | 6 +-
.../opennlp/tools/disambiguator/WordSense.java | 2 +-
.../tools/disambiguator/datareader/Paragraph.java | 4 +-
.../datareader/SemcorReaderExtended.java | 8 +-
.../disambiguator/datareader/SensevalReader.java | 2 +-
.../tools/disambiguator/datareader/Sentence.java | 8 +-
.../tools/disambiguator/datareader/Word.java | 8 +-
.../main/java/opennlp/summarization/Sentence.java | 2 +-
.../lexicalchaining/LexicalChain.java | 4 +-
.../lexicalchaining/WordRelation.java | 8 +-
.../summarization/lexicalchaining/WordnetWord.java | 2 +-
.../preprocess/DefaultDocProcessor.java | 1 -
.../summarization/preprocess/IDFWordWeight.java | 7 +-
.../summarization/preprocess/PorterStemmer.java | 1 +
.../summarization/preprocess/StopWords.java | 2 +-
.../opennlp/summarization/textrank/TextRank.java | 2 +-
.../summarization/textrank/TextRankSummarizer.java | 2 +-
.../opennlp/tagging_server/POSTaggerResource.java | 2 +-
.../tagging_server/TaggingServerBundle.java | 2 +-
.../namefind/BratNameFinderResource.java | 2 +-
.../apache/opennlp/namecat/NameCategorizer.java | 4 +-
.../apache/opennlp/namefinder/FeedDictionary.java | 2 +-
.../org/apache/opennlp/namefinder/WordIndexer.java | 2 +-
231 files changed, 1245 insertions(+), 1499 deletions(-)
diff --git a/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/EntityContentProvider.java b/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/EntityContentProvider.java
index 31299b4..1335ecd 100644
--- a/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/EntityContentProvider.java
+++ b/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/EntityContentProvider.java
@@ -273,7 +273,7 @@ public class EntityContentProvider implements IStructuredContentProvider {
}
}
});
- };
+ }
}
private final NameFinderJob nameFinder;
@@ -374,16 +374,13 @@ public class EntityContentProvider implements IStructuredContentProvider {
FSIndex<AnnotationFS> nameAnnotations = input.getCAS()
.getAnnotationIndex(nameType);
-
- for (Iterator<AnnotationFS> nameIterator = nameAnnotations
- .iterator(); nameIterator.hasNext();) {
-
- AnnotationFS nameAnnotation = (AnnotationFS) nameIterator.next();
-
+
+ for (AnnotationFS nameAnnotation : nameAnnotations) {
+
// TODO: Entity must have a type ...
PotentialAnnotation entity = new PotentialAnnotation(nameAnnotation.getBegin(),
- nameAnnotation.getEnd(), nameAnnotation.getCoveredText(), null,
- nameAnnotation.getType().getName());
+ nameAnnotation.getEnd(), nameAnnotation.getCoveredText(), null,
+ nameAnnotation.getType().getName());
confirmedEntities.add(entity); // TODO: This needs to go into a second list!
}
}
@@ -553,7 +550,7 @@ public class EntityContentProvider implements IStructuredContentProvider {
static List<PotentialAnnotation> searchEntities(List<PotentialAnnotation> entities, int begin, int end) {
- List<PotentialAnnotation> intersectingEntities = new ArrayList<PotentialAnnotation>();
+ List<PotentialAnnotation> intersectingEntities = new ArrayList<>();
Span testSpan = new Span(begin, end);
diff --git a/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/MultiModelNameFinder.java b/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/MultiModelNameFinder.java
index 5c205b1..e935f2b 100644
--- a/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/MultiModelNameFinder.java
+++ b/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/MultiModelNameFinder.java
@@ -64,7 +64,7 @@ public class MultiModelNameFinder implements TokenNameFinder {
if (valid && nameIndex.get(i) != null) {
// TODO: That could be improved!
- String parts[] = nameIndex.get(i).split("-");
+ String[] parts = nameIndex.get(i).split("-");
String nameModelType = parts[0];
String desiredOutcome = parts[1];
diff --git a/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/NameFinderModelInputDialog.java b/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/NameFinderModelInputDialog.java
index 0593a25..d42f12b 100644
--- a/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/NameFinderModelInputDialog.java
+++ b/caseditor-opennlp-plugin/src/main/java/org/apache/opennlp/caseditor/namefinder/NameFinderModelInputDialog.java
@@ -24,9 +24,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
diff --git a/corpus-server/corpus-server-connector/src/main/java/org/apache/opennlp/corpus_server/connector/CSQueueCollectionReader.java b/corpus-server/corpus-server-connector/src/main/java/org/apache/opennlp/corpus_server/connector/CSQueueCollectionReader.java
index 3788da1..fcded8c 100644
--- a/corpus-server/corpus-server-connector/src/main/java/org/apache/opennlp/corpus_server/connector/CSQueueCollectionReader.java
+++ b/corpus-server/corpus-server-connector/src/main/java/org/apache/opennlp/corpus_server/connector/CSQueueCollectionReader.java
@@ -109,7 +109,7 @@ public class CSQueueCollectionReader extends CollectionReader_ImplBase {
// Retrieve queue link ...
- List<String> casIdList = new ArrayList<String>();
+ List<String> casIdList = new ArrayList<>();
WebResource r = client.resource(serverAddress + "/queues/" + queueName);
diff --git a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerApplication.java b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerApplication.java
index df18936..800cbfc 100644
--- a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerApplication.java
+++ b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerApplication.java
@@ -26,7 +26,7 @@ public class CorpusServerApplication extends Application {
@Override
public Set<Class<?>> getClasses() {
- Set<Class<?>> result = new HashSet<Class<?>>();
+ Set<Class<?>> result = new HashSet<>();
result.add(CorporaResource.class);
result.add(CorpusResource.class);
result.add(TaskQueuesResource.class);
diff --git a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerBundle.java b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerBundle.java
index 72b409e..8db7261 100644
--- a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerBundle.java
+++ b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/CorpusServerBundle.java
@@ -105,18 +105,16 @@ public class CorpusServerBundle implements BundleActivator {
public Object addingService(ServiceReference serviceRef) {
httpService = (HttpService)super.addingService(serviceRef);
- Dictionary<String, String> jerseyServletParams = new Hashtable<String, String>();
+ Dictionary<String, String> jerseyServletParams = new Hashtable<>();
jerseyServletParams.put("javax.ws.rs.Application", CorpusServerApplication.class.getName());
jerseyServletParams.put("com.sun.jersey.api.json.POJOMappingFeature", "true");
try {
httpService.registerServlet("/rest", new ServletContainer(), jerseyServletParams, null);
- } catch (ServletException e) {
- throw new RuntimeException(e);
- } catch (NamespaceException e) {
+ } catch (ServletException | NamespaceException e) {
throw new RuntimeException(e);
}
-
+
return httpService;
}
diff --git a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/TaskQueueResource.java b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/TaskQueueResource.java
index 3c524a2..92b52a6 100644
--- a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/TaskQueueResource.java
+++ b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/TaskQueueResource.java
@@ -26,7 +26,7 @@ import org.apache.opennlp.corpus_server.taskqueue.TaskQueue;
public class TaskQueueResource {
- private TaskQueue queue;
+ private final TaskQueue queue;
TaskQueueResource(TaskQueue queue) {
diff --git a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorporaStore.java b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorporaStore.java
index 782f03d..c8ad568 100644
--- a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorporaStore.java
+++ b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorporaStore.java
@@ -53,7 +53,7 @@ public class MemoryCorporaStore extends AbstractCorporaStore {
// Note: Add one twice, overwrites an existing one!
public void createCorpus(String corpusName,
- byte typeSystemBytes[], byte indexMapping[]) {
+ byte[] typeSystemBytes, byte[] indexMapping) {
corpora.put(corpusName, new MemoryCorpusStore(corpusName,
typeSystemBytes, indexMapping));
}
diff --git a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorpusStore.java b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorpusStore.java
index 2deaba0..55efb49 100644
--- a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorpusStore.java
+++ b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/store/MemoryCorpusStore.java
@@ -28,9 +28,9 @@ public class MemoryCorpusStore implements CorpusStore {
private final String corpusName;
private byte[] typeSystemBytes;
- private byte[] indexMapping;
+ private final byte[] indexMapping;
- private Map<String, byte[]> casStore = new HashMap<String, byte[]>();
+ private final Map<String, byte[]> casStore = new HashMap<>();
MemoryCorpusStore(String corpusName, byte[] typeSystem,
byte[] indexMapping) {
diff --git a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/taskqueue/MemoryTaskQueue.java b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/taskqueue/MemoryTaskQueue.java
index aa31990..6ad4025 100644
--- a/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/taskqueue/MemoryTaskQueue.java
+++ b/corpus-server/corpus-server-core/src/main/java/org/apache/opennlp/corpus_server/taskqueue/MemoryTaskQueue.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
class MemoryTaskQueue implements TaskQueue {
- private Iterator<String> casIdQueueIterator;
+ private final Iterator<String> casIdQueueIterator;
MemoryTaskQueue(Collection<String> casIdQueue) {
casIdQueueIterator = casIdQueue.iterator();
diff --git a/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/DerbyCorporaStore.java b/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/DerbyCorporaStore.java
index 90e0ff9..88ed6f9 100644
--- a/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/DerbyCorporaStore.java
+++ b/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/DerbyCorporaStore.java
@@ -200,7 +200,7 @@ public class DerbyCorporaStore extends AbstractCorporaStore {
DerbyCorpusStore corpusStore = null;
try {
- DatabaseMetaData metadata = null;
+ DatabaseMetaData metadata;
metadata = dataSource.getConnection().getMetaData();
String[] names = { "TABLE" };
ResultSet tableNames = metadata.getTables(null, null, null, names);
diff --git a/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneIndexer.java b/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneIndexer.java
index 7b6ea6e..322479a 100644
--- a/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneIndexer.java
+++ b/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneIndexer.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
@@ -109,8 +108,6 @@ public class LuceneIndexer extends LuceneDocumentAE {
// TODO: Commit handling might need to be changed
indexWriter.commit();
- } catch (CorruptIndexException e) {
- throw new AnalysisEngineProcessException(e);
} catch (IOException e) {
throw new AnalysisEngineProcessException(e);
}
@@ -122,12 +119,10 @@ public class LuceneIndexer extends LuceneDocumentAE {
try {
indexWriter.close();
- } catch (CorruptIndexException e) {
- e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
-
+
indexWriter = null;
}
}
diff --git a/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneSearchService.java b/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneSearchService.java
index feae6e1..d216ac4 100644
--- a/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneSearchService.java
+++ b/corpus-server/corpus-server-impl/src/main/java/org/apache/opennlp/corpus_server/impl/LuceneSearchService.java
@@ -111,8 +111,8 @@ public class LuceneSearchService implements SearchService {
try {
mappingTmpOut = new FileOutputStream(mappingTmpFile);
- byte buffer[] = new byte[1024];
- int len = 0;
+ byte[] buffer = new byte[1024];
+ int len;
while ((len = mappingFileIn.read(buffer)) > 0) {
mappingTmpOut.write(buffer, 0, len);
}
@@ -194,9 +194,7 @@ public class LuceneSearchService implements SearchService {
AnalysisEngine indexer = UIMAFramework.produceAnalysisEngine(specifier);
corpusIndexerMap.put(corpusId, indexer);
- } catch (InvalidXMLException e) {
- throw new IOException(e);
- } catch (ResourceInitializationException e) {
+ } catch (InvalidXMLException | ResourceInitializationException e) {
throw new IOException(e);
}
}
@@ -247,7 +245,7 @@ public class LuceneSearchService implements SearchService {
indexTsIn.close();
}
- List<MetaDataObject> specs = new ArrayList<MetaDataObject>();
+ List<MetaDataObject> specs = new ArrayList<>();
specs.add(indexTypeDesc);
TypeSystemDescription tsDescription = UimaUtil.createTypeSystemDescription(
new ByteArrayInputStream(store.getTypeSystem()));
@@ -336,7 +334,7 @@ public class LuceneSearchService implements SearchService {
throw new IOException(e);
}
- final List<String> results = new ArrayList<String>();
+ final List<String> results = new ArrayList<>();
final IndexSearcher finalSearcher = searcher;
diff --git a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CASImporter.java b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CASImporter.java
index 145502c..68fc6c1 100644
--- a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CASImporter.java
+++ b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CASImporter.java
@@ -41,7 +41,7 @@ public class CASImporter {
File xmiFileOrFolder = new File(args[1]);
- File xmiFiles[];
+ File[] xmiFiles;
if (xmiFileOrFolder.isFile()) {
xmiFiles = new File[] { xmiFileOrFolder };
@@ -55,7 +55,7 @@ public class CASImporter {
}
for (File xmiFile : xmiFiles) {
- byte xmiBytes[] = FileUtil.fileToBytes(xmiFile);
+ byte[] xmiBytes = FileUtil.fileToBytes(xmiFile);
ClientResponse response = r.path(xmiFile.getName())
.accept(MediaType.TEXT_XML)
diff --git a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CorpusBackup.java b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CorpusBackup.java
index 73c35d6..d07a548 100644
--- a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CorpusBackup.java
+++ b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/CorpusBackup.java
@@ -79,7 +79,7 @@ public class CorpusBackup {
File backupFile = new File(args[2]);
// create zip file
- OutputStream backupOut = null;
+ OutputStream backupOut;
try {
backupOut = new FileOutputStream(backupFile);
diff --git a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/FileUtil.java b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/FileUtil.java
index a3a8dd5..cff9781 100644
--- a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/FileUtil.java
+++ b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/FileUtil.java
@@ -33,7 +33,7 @@ public class FileUtil {
InputStream fileIn = new FileInputStream(file);
try {
- byte buffer[] = new byte[1024];
+ byte[] buffer = new byte[1024];
int length;
while ((length = fileIn.read(buffer)) > 0) {
fileBytes.write(buffer, 0, length);
diff --git a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/RemoveCAS.java b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/RemoveCAS.java
index a81a49d..e1ebc41 100644
--- a/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/RemoveCAS.java
+++ b/corpus-server/corpus-server-tools/src/main/java/org/apache/opennlp/corpus_server/tools/RemoveCAS.java
@@ -17,8 +17,6 @@
package org.apache.opennlp.corpus_server.tools;
-import javax.ws.rs.core.MediaType;
-
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
diff --git a/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java b/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java
index cfe5a73..6224bfd 100644
--- a/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java
+++ b/mahout-addon/src/main/java/opennlp/addons/mahout/AbstractOnlineLearnerTrainer.java
@@ -67,9 +67,9 @@ abstract class AbstractOnlineLearnerTrainer extends AbstractEventTrainer {
}
protected Map<String, Integer> createPrepMap(DataIndexer indexer) {
- Map<String, Integer> predMap = new HashMap<String, Integer>();
+ Map<String, Integer> predMap = new HashMap<>();
- String predLabels[] = indexer.getPredLabels();
+ String[] predLabels = indexer.getPredLabels();
for (int i = 0; i < predLabels.length; i++) {
predMap.put(predLabels[i], i);
}
diff --git a/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java b/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java
index b2a29ae..1b9d555 100644
--- a/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java
+++ b/mahout-addon/src/main/java/opennlp/addons/mahout/LogisticRegressionTrainer.java
@@ -40,7 +40,7 @@ public class LogisticRegressionTrainer extends AbstractOnlineLearnerTrainer {
// TODO: Lets use the predMap here as well for encoding
- int outcomes[] = indexer.getOutcomeList();
+ int[] outcomes = indexer.getOutcomeList();
int cardinality = indexer.getPredLabels().length;
@@ -73,9 +73,9 @@ public class LogisticRegressionTrainer extends AbstractOnlineLearnerTrainer {
pa.close();
- Map<String, Integer> predMap = new HashMap<String, Integer>();
+ Map<String, Integer> predMap = new HashMap<>();
- String predLabels[] = indexer.getPredLabels();
+ String[] predLabels = indexer.getPredLabels();
for (int i = 0; i < predLabels.length; i++) {
predMap.put(predLabels[i], i);
}
diff --git a/mahout-addon/src/main/java/opennlp/addons/mahout/VectorClassifierModel.java b/mahout-addon/src/main/java/opennlp/addons/mahout/VectorClassifierModel.java
index fabe3e2..6785220 100644
--- a/mahout-addon/src/main/java/opennlp/addons/mahout/VectorClassifierModel.java
+++ b/mahout-addon/src/main/java/opennlp/addons/mahout/VectorClassifierModel.java
@@ -34,8 +34,8 @@ public class VectorClassifierModel implements MaxentModel {
private final String[] outcomeLabels;
private final Map<String, Integer> predMap;
- public VectorClassifierModel(AbstractVectorClassifier pa, String outcomeLabels[],
- Map<String, Integer> predMap) {
+ public VectorClassifierModel(AbstractVectorClassifier pa, String[] outcomeLabels,
+ Map<String, Integer> predMap) {
this.classifier = pa;
// TODO: We should make a copy, so the model is immutable ...
this.outcomeLabels = outcomeLabels;
@@ -56,7 +56,7 @@ public class VectorClassifierModel implements MaxentModel {
Vector resultVector = classifier.classifyFull(vector);
- double outcomes[] = new double[classifier.numCategories()];
+ double[] outcomes = new double[classifier.numCategories()];
for (int i = 0; i < outcomes.length; i++) {
outcomes[i] = resultVector.get(i);
diff --git a/mallet-addon/src/main/java/opennlp/addons/mallet/CRFTrainer.java b/mallet-addon/src/main/java/opennlp/addons/mallet/CRFTrainer.java
index 0700e2b..4b155a3 100644
--- a/mallet-addon/src/main/java/opennlp/addons/mallet/CRFTrainer.java
+++ b/mallet-addon/src/main/java/opennlp/addons/mallet/CRFTrainer.java
@@ -146,7 +146,7 @@ public class CRFTrainer extends AbstractSequenceTrainer {
// can be very similar to the other model
// one important difference is that the feature gen needs to be integrated
// ...
- return new TransducerModel(crf);
+ return new TransducerModel<>(crf);
}
// TODO: We need to return a sequence model here. How should that be done ?!
diff --git a/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModel.java b/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModel.java
index 91afec3..5fc6cf7 100644
--- a/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModel.java
+++ b/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModel.java
@@ -81,10 +81,10 @@ public class TransducerModel<T> implements SequenceClassificationModel<T>, Seria
String[] features = cg.getContext(i, sequence, null, additionalContext);
List<Integer> malletFeatureList = new ArrayList<>(features.length);
-
- for (int featureIndex = 0; featureIndex < features.length; featureIndex++) {
- if (dataAlphabet.contains(features[featureIndex])) {
- malletFeatureList.add(dataAlphabet.lookupIndex(features[featureIndex]));
+
+ for (String feature : features) {
+ if (dataAlphabet.contains(feature)) {
+ malletFeatureList.add(dataAlphabet.lookupIndex(feature));
}
}
diff --git a/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModelSerializer.java b/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModelSerializer.java
index 6e05eab..9d24cc1 100644
--- a/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModelSerializer.java
+++ b/mallet-addon/src/main/java/opennlp/addons/mallet/TransducerModelSerializer.java
@@ -25,14 +25,13 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
-import opennlp.tools.util.InvalidFormatException;
import opennlp.tools.util.model.ArtifactSerializer;
import cc.mallet.fst.Transducer;
public class TransducerModelSerializer implements ArtifactSerializer<TransducerModel> {
@Override
- public TransducerModel create(InputStream in) throws IOException, InvalidFormatException {
+ public TransducerModel create(InputStream in) throws IOException {
try (ObjectInputStream ois = new ObjectInputStream(in)) {
Transducer classifier = (Transducer) ois.readObject();
return new TransducerModel(classifier);
diff --git a/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/FileSentenceProvider.java b/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/FileSentenceProvider.java
index acd288b..481f421 100644
--- a/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/FileSentenceProvider.java
+++ b/modelbuilder-addon/src/main/java/opennlp/addons/modelbuilder/impls/FileSentenceProvider.java
@@ -20,7 +20,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -45,7 +45,7 @@ public class FileSentenceProvider implements SentenceProvider {
String line;
fis = new FileInputStream(params.getSentenceFile());
- br = new BufferedReader(new InputStreamReader(fis, Charset.forName("UTF-8")));
+ br = new BufferedReader(new InputStreamReader(fis, StandardCharsets.UTF_8));
int i=0;
while ((line = br.readLine()) != null) {
diff --git a/nlp-utils/src/main/java/org/apache/opennlp/utils/TrainingSet.java b/nlp-utils/src/main/java/org/apache/opennlp/utils/TrainingSet.java
index 174f8f3..a587eab 100644
--- a/nlp-utils/src/main/java/org/apache/opennlp/utils/TrainingSet.java
+++ b/nlp-utils/src/main/java/org/apache/opennlp/utils/TrainingSet.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
*/
public class TrainingSet implements Iterable<TrainingExample> {
- private final Collection<TrainingExample> trainingExamples = new HashSet<TrainingExample>();
+ private final Collection<TrainingExample> trainingExamples = new HashSet<>();
@Override
public Iterator<TrainingExample> iterator() {
diff --git a/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/CFGRunner.java b/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/CFGRunner.java
index 07d93e1..9c774ca 100644
--- a/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/CFGRunner.java
+++ b/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/CFGRunner.java
@@ -20,7 +20,6 @@ package org.apache.opennlp.utils.cfg;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.security.SecureRandom;
import java.util.Arrays;
@@ -77,7 +76,7 @@ public class CFGRunner {
builder.withStartSymbol(startSymbol);
- Collection<Rule> rules = new LinkedList<Rule>();
+ Collection<Rule> rules = new LinkedList<>();
rules.add(new Rule(startSymbol, "VP", "NP"));
rules.add(new Rule("VP", "Adv", "Vb"));
rules.add(new Rule("NP", "Adj", "NN"));
diff --git a/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammar.java b/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammar.java
index edd6b37..3a7d1d8 100644
--- a/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammar.java
+++ b/nlp-utils/src/main/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammar.java
@@ -259,7 +259,7 @@ public class ProbabilisticContextFreeGrammar {
return "(" +
(rule != null ? rule.getEntry() : null) + " " +
(leftTree != null && rightTree != null ?
- leftTree.toString() + " " + rightTree.toString() :
+ leftTree + " " + rightTree.toString() :
(rule != null ? rule.getExpansion()[0] : null)
) +
')';
diff --git a/nlp-utils/src/main/java/org/apache/opennlp/utils/classification/SimpleNaiveBayesClassifier.java b/nlp-utils/src/main/java/org/apache/opennlp/utils/classification/SimpleNaiveBayesClassifier.java
index ca60ce5..4dad8e5 100644
--- a/nlp-utils/src/main/java/org/apache/opennlp/utils/classification/SimpleNaiveBayesClassifier.java
+++ b/nlp-utils/src/main/java/org/apache/opennlp/utils/classification/SimpleNaiveBayesClassifier.java
@@ -58,7 +58,7 @@ public class SimpleNaiveBayesClassifier implements NaiveBayesClassifier<String,
}
private void preComputePriors() {
- priors = new HashMap<String, Double>();
+ priors = new HashMap<>();
for (String cl : classMegaDocMap.keySet()) {
priors.put(cl, calculatePrior(cl));
}
@@ -72,8 +72,8 @@ public class SimpleNaiveBayesClassifier implements NaiveBayesClassifier<String,
// }
private void createMegaDocs() {
- classMegaDocMap = new HashMap<String, String>();
- Map<String, StringBuilder> mockClassMegaDocMap = new HashMap<String, StringBuilder>();
+ classMegaDocMap = new HashMap<>();
+ Map<String, StringBuilder> mockClassMegaDocMap = new HashMap<>();
for (String doc : docsWithClass.keySet()) {
String cl = docsWithClass.get(doc);
StringBuilder megaDoc = mockClassMegaDocMap.get(cl);
@@ -91,7 +91,7 @@ public class SimpleNaiveBayesClassifier implements NaiveBayesClassifier<String,
}
private void createVocabulary() {
- vocabulary = new LinkedList<String>();
+ vocabulary = new LinkedList<>();
for (String doc : docsWithClass.keySet()) {
String[] split = tokenizeDoc(doc);
vocabulary.addAll(Arrays.asList(split));
diff --git a/nlp-utils/src/main/java/org/apache/opennlp/utils/ngram/NGramUtils.java b/nlp-utils/src/main/java/org/apache/opennlp/utils/ngram/NGramUtils.java
index 00eccb6..1bc0ac3 100644
--- a/nlp-utils/src/main/java/org/apache/opennlp/utils/ngram/NGramUtils.java
+++ b/nlp-utils/src/main/java/org/apache/opennlp/utils/ngram/NGramUtils.java
@@ -115,7 +115,7 @@ public class NGramUtils {
}
private static <T> Collection<T> flatSet(Collection<T[]> set) {
- Collection<T> flatSet = new HashSet<T>();
+ Collection<T> flatSet = new HashSet<>();
for (T[] sentence : set) {
flatSet.addAll(Arrays.asList(sentence));
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/AbstractLinker.java b/opennlp-coref/src/main/java/opennlp/tools/coref/AbstractLinker.java
index f34953c..e426246 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/AbstractLinker.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/AbstractLinker.java
@@ -41,7 +41,7 @@ public abstract class AbstractLinker implements Linker {
protected boolean debug = true;
/** The mode in which this linker is running. */
- protected LinkerMode mode;
+ protected final LinkerMode mode;
/** Instance used for returning the same linker for subsequent getInstance requests. */
protected static Linker linker;
@@ -58,19 +58,19 @@ public abstract class AbstractLinker implements Linker {
protected int SINGULAR_PRONOUN;
/** The name of the project where the coreference models are stored. */
- protected String corefProject;
+ protected final String corefProject;
/** The head finder used in this linker. */
protected HeadFinder headFinder;
/** Specifies whether coreferent mentions should be combined into a single entity.
* Set this to true to combine them, false otherwise. */
- protected boolean useDiscourseModel;
+ protected final boolean useDiscourseModel;
/** Specifies whether mentions for which no resolver can be used should be added to the
* discourse model.
*/
- protected boolean removeUnresolvedMentions;
+ protected final boolean removeUnresolvedMentions;
/**
* Creates a new linker using the models in the specified project directory and using the specified mode.
@@ -220,9 +220,9 @@ public abstract class AbstractLinker implements Linker {
public DiscourseEntity[] getEntities(Mention[] mentions) {
MentionContext[] extentContexts = this.constructMentionContexts(mentions);
DiscourseModel dm = new DiscourseModel();
- for (int ei = 0; ei < extentContexts.length; ei++) {
+ for (MentionContext extentContext : extentContexts) {
//System.err.println(ei+" "+extentContexts[ei].toText());
- resolve(extentContexts[ei], dm);
+ resolve(extentContext, dm);
}
return (dm.getEntities());
}
@@ -232,8 +232,8 @@ public abstract class AbstractLinker implements Linker {
}
public void train() throws IOException {
- for (int ri = 0; ri < resolvers.length; ri++) {
- resolvers[ri].train();
+ for (AbstractResolver resolver : resolvers) {
+ resolver.train();
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/CorefSample.java b/opennlp-coref/src/main/java/opennlp/tools/coref/CorefSample.java
index 05ee08f..3763331 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/CorefSample.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/CorefSample.java
@@ -25,7 +25,7 @@ import opennlp.tools.parser.Parse;
public class CorefSample {
- private List<Parse> parses;
+ private final List<Parse> parses;
public CorefSample(List<Parse> parses) {
this.parses = parses;
@@ -34,7 +34,7 @@ public class CorefSample {
public List<opennlp.tools.coref.mention.Parse> getParses() {
List<opennlp.tools.coref.mention.Parse> corefParses =
- new ArrayList<opennlp.tools.coref.mention.Parse>();
+ new ArrayList<>();
int sentNumber = 0;
for (Parse parse : parses) {
@@ -61,7 +61,7 @@ public class CorefSample {
public static CorefSample parse(String corefSampleString) {
- List<Parse> parses = new ArrayList<Parse>();
+ List<Parse> parses = new ArrayList<>();
for (String line : corefSampleString.split("\\r?\\n")) {
parses.add(Parse.parseParse(line));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/CorefTrainer.java b/opennlp-coref/src/main/java/opennlp/tools/coref/CorefTrainer.java
index 3eb9dc3..9123afa 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/CorefTrainer.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/CorefTrainer.java
@@ -47,32 +47,32 @@ public class CorefTrainer {
private static Mention[] getMentions(CorefSample sample, MentionFinder mentionFinder) {
- List<Mention> mentions = new ArrayList<Mention>();
+ List<Mention> mentions = new ArrayList<>();
for (opennlp.tools.coref.mention.Parse corefParse : sample.getParses()) {
Parse p = ((DefaultParse) corefParse).getParse();
Mention[] extents = mentionFinder.getMentions(corefParse);
-
- for (int ei = 0, en = extents.length; ei < en; ei++) {
- if (extents[ei].getParse() == null) {
+ for (Mention extent : extents) {
+
+ if (extent.getParse() == null) {
- Stack<Parse> nodes = new Stack<Parse>();
+ Stack<Parse> nodes = new Stack<>();
nodes.add(p);
-
+
while (!nodes.isEmpty()) {
-
+
Parse node = nodes.pop();
-
- if (node.getSpan().equals(extents[ei].getSpan()) && node.getType().startsWith("NML")) {
+
+ if (node.getSpan().equals(extent.getSpan()) && node.getType().startsWith("NML")) {
DefaultParse corefParseNode = new DefaultParse(node, corefParse.getSentenceNumber());
- extents[ei].setParse(corefParseNode);
- extents[ei].setId(corefParseNode.getEntityId());
+ extent.setParse(corefParseNode);
+ extent.setId(corefParseNode.getEntityId());
break;
}
-
+
nodes.addAll(Arrays.asList(node.getChildren()));
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseElement.java b/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseElement.java
index 9d4b533..8c2f743 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseElement.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseElement.java
@@ -32,7 +32,7 @@ import opennlp.tools.util.ReverseListIterator;
*/
public abstract class DiscourseElement {
- private List<MentionContext> extents;
+ private final List<MentionContext> extents;
private int id = -1;
private MentionContext lastExtent;
@@ -42,7 +42,7 @@ public abstract class DiscourseElement {
* @param mention The mention which begins this discourse element.
*/
public DiscourseElement(MentionContext mention) {
- extents = new ArrayList<MentionContext>(1);
+ extents = new ArrayList<>(1);
lastExtent = mention;
extents.add(mention);
}
@@ -53,7 +53,7 @@ public abstract class DiscourseElement {
* @return the {@link Iterator}.
*/
public Iterator<MentionContext> getRecentMentions() {
- return new ReverseListIterator<MentionContext>(extents);
+ return new ReverseListIterator<>(extents);
}
/**
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseModel.java
index b7bd1e0..c769b64 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/DiscourseModel.java
@@ -28,7 +28,7 @@ import opennlp.tools.coref.mention.MentionContext;
*/
public class DiscourseModel {
- private List<DiscourseEntity> entities;
+ private final List<DiscourseEntity> entities;
int nextEntityId = 1;
@@ -36,7 +36,7 @@ public class DiscourseModel {
* Creates a new discourse model.
*/
public DiscourseModel() {
- entities = new ArrayList<DiscourseEntity>();
+ entities = new ArrayList<>();
}
/**
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/AbstractMentionFinder.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/AbstractMentionFinder.java
index 20a853e..a574e50 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/AbstractMentionFinder.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/AbstractMentionFinder.java
@@ -56,9 +56,8 @@ public abstract class AbstractMentionFinder implements MentionFinder {
* @return mapping from noun phrases and the child np which is their head
**/
protected Map<Parse, Parse> constructHeadMap(List<Parse> nps) {
- Map<Parse, Parse> headMap = new HashMap<Parse, Parse>();
- for (int ni = 0; ni < nps.size(); ni++) {
- Parse np = nps.get(ni);
+ Map<Parse, Parse> headMap = new HashMap<>();
+ for (Parse np : nps) {
gatherHeads(np, headMap);
}
return headMap;
@@ -122,14 +121,12 @@ public abstract class AbstractMentionFinder implements MentionFinder {
List<Parse> parts = np.getSyntacticChildren();
boolean allToken = true;
boolean hasConjunction = false;
- for (int ti = 0; ti < parts.size(); ti++) {
- Parse c = parts.get(ti);
+ for (Parse c : parts) {
if (c.isToken()) {
if (c.getSyntacticType().equals("CC")) {
hasConjunction = true;
}
- }
- else {
+ } else {
allToken = false;
break;
}
@@ -141,8 +138,7 @@ public abstract class AbstractMentionFinder implements MentionFinder {
//System.err.println("collectCoordNp: "+np);
//exclude nps with UCPs inside.
List<Parse> sc = np.getSyntacticChildren();
- for (Iterator<Parse> sci = sc.iterator();sci.hasNext();) {
- Parse scp = sci.next();
+ for (Parse scp : sc) {
if (scp.getSyntacticType().equals("UCP") || scp.getSyntacticType().equals("NX")) {
return;
}
@@ -261,24 +257,18 @@ public abstract class AbstractMentionFinder implements MentionFinder {
private void clearMentions(Set<Parse> mentions, Parse np) {
Span npSpan = np.getSpan();
- for (Iterator<Parse> mi = mentions.iterator(); mi.hasNext();) {
- Parse mention = mi.next();
- if (!mention.getSpan().contains(npSpan)) {
- //System.err.println("clearing "+mention+" for "+np);
- mi.remove();
- }
- }
+ //System.err.println("clearing "+mention+" for "+np);
+ mentions.removeIf(mention -> !mention.getSpan().contains(npSpan));
}
private Mention[] collectMentions(List<Parse> nps, Map<Parse, Parse> headMap) {
- List<Mention> mentions = new ArrayList<Mention>(nps.size());
- Set<Parse> recentMentions = new HashSet<Parse>();
+ List<Mention> mentions = new ArrayList<>(nps.size());
+ Set<Parse> recentMentions = new HashSet<>();
//System.err.println("AbtractMentionFinder.collectMentions: "+headMap);
- for (int npi = 0, npl = nps.size(); npi < npl; npi++) {
- Parse np = nps.get(npi);
+ for (Parse np : nps) {
//System.err.println("AbstractMentionFinder: collectMentions: np[" + npi + "]="
// + np + " head=" + headMap.get(np));
- if (!isHeadOfExistingMention(np,headMap, recentMentions)) {
+ if (!isHeadOfExistingMention(np, headMap, recentMentions)) {
clearMentions(recentMentions, np);
if (!isPartOfName(np)) {
Parse head = headFinder.getLastHead(np);
@@ -291,13 +281,11 @@ public abstract class AbstractMentionFinder implements MentionFinder {
if (entityType != null) {
extent.setNameType(entityType);
}
- }
- else {
+ } else {
//System.err.println(
// "AbstractMentionFinder.collectMentions excluding np as part of name. np=" + np);
}
- }
- else {
+ } else {
//System.err.println(
// "AbstractMentionFinder.collectMentions excluding np as head of previous mention. np=" + np);
}
@@ -309,8 +297,7 @@ public abstract class AbstractMentionFinder implements MentionFinder {
collectCoordinatedNounPhraseMentions(np, mentions);
}
collectPossesivePronouns(np, mentions);
- }
- else {
+ } else {
// Could use to get NP -> tokens CON structures for basal nps including NP -> NAC tokens
//collectComplexNounPhrases(np,mentions);
}
@@ -348,11 +335,10 @@ public abstract class AbstractMentionFinder implements MentionFinder {
Parse htoken = headFinder.getHeadToken(np);
List<Parse> nes = np.getNamedEntities();
Span headTokenSpan = htoken.getSpan();
- for (int nei = 0, nel = nes.size(); nei < nel; nei++) {
- Parse ne = nes.get(nei);
+ for (Parse ne : nes) {
if (!ne.getSpan().contains(headTokenSpan)) {
//System.err.println("adding extent for prenominal ne: "+ne);
- Mention extent = new Mention(ne.getSpan(), ne.getSpan(), ne.getEntityId(),null,"NAME");
+ Mention extent = new Mention(ne.getSpan(), ne.getSpan(), ne.getEntityId(), null, "NAME");
extent.setNameType(ne.getEntityType());
extents.add(extent);
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DefaultParse.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DefaultParse.java
index 4d3d1a1..114b417 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DefaultParse.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DefaultParse.java
@@ -36,12 +36,12 @@ import opennlp.tools.util.Span;
*/
public class DefaultParse extends AbstractParse {
- public static String[] NAME_TYPES = {"person", "organization", "location", "date",
+ public static final String[] NAME_TYPES = {"person", "organization", "location", "date",
"time", "percentage", "money"};
- private Parse parse;
- private int sentenceNumber;
- private static Set<String> entitySet = new HashSet<String>(Arrays.asList(NAME_TYPES));
+ private final Parse parse;
+ private final int sentenceNumber;
+ private static final Set<String> entitySet = new HashSet<>(Arrays.asList(NAME_TYPES));
/**
* Initializes the current instance.
@@ -61,8 +61,8 @@ public class DefaultParse extends AbstractParse {
}
public List<opennlp.tools.coref.mention.Parse> getNamedEntities() {
- List<Parse> names = new ArrayList<Parse>();
- List<Parse> kids = new LinkedList<Parse>(Arrays.asList(parse.getChildren()));
+ List<Parse> names = new ArrayList<>();
+ List<Parse> kids = new LinkedList<>(Arrays.asList(parse.getChildren()));
while (kids.size() > 0) {
Parse p = kids.remove(0);
if (entitySet.contains(p.getType())) {
@@ -80,7 +80,7 @@ public class DefaultParse extends AbstractParse {
}
public List<opennlp.tools.coref.mention.Parse> getSyntacticChildren() {
- List<Parse> kids = new ArrayList<Parse>(Arrays.asList(parse.getChildren()));
+ List<Parse> kids = new ArrayList<>(Arrays.asList(parse.getChildren()));
for (int ci = 0; ci < kids.size(); ci++) {
Parse kid = kids.get(ci);
if (entitySet.contains(kid.getType())) {
@@ -93,8 +93,8 @@ public class DefaultParse extends AbstractParse {
}
public List<opennlp.tools.coref.mention.Parse> getTokens() {
- List<Parse> tokens = new ArrayList<Parse>();
- List<Parse> kids = new LinkedList<Parse>(Arrays.asList(parse.getChildren()));
+ List<Parse> tokens = new ArrayList<>();
+ List<Parse> kids = new LinkedList<>(Arrays.asList(parse.getChildren()));
while (kids.size() > 0) {
Parse p = kids.remove(0);
if (p.isPosTag()) {
@@ -122,8 +122,8 @@ public class DefaultParse extends AbstractParse {
private List<opennlp.tools.coref.mention.Parse> createParses(Parse[] parses) {
List<opennlp.tools.coref.mention.Parse> newParses = new ArrayList<>(parses.length);
- for (int pi = 0, pn = parses.length; pi < pn;pi++) {
- newParses.add(new DefaultParse(parses[pi],sentenceNumber));
+ for (Parse pars : parses) {
+ newParses.add(new DefaultParse(pars, sentenceNumber));
}
return newParses;
@@ -221,7 +221,7 @@ public class DefaultParse extends AbstractParse {
System.out.println("Maybe incorrect measurement!");
- Stack<Parse> parents = new Stack<Parse>();
+ Stack<Parse> parents = new Stack<>();
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Dictionary.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Dictionary.java
index 88ac6e1..5005fa9 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Dictionary.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Dictionary.java
@@ -30,7 +30,7 @@ public interface Dictionary {
* @param pos The part-of-speech of the specified word.
* @return The lemmas of the specified word given the specified part-of-speech.
*/
- public String[] getLemmas(String word, String pos);
+ String[] getLemmas(String word, String pos);
/**
* Returns a key indicating the specified sense number of the specified
@@ -42,7 +42,7 @@ public interface Dictionary {
* @return a key indicating the specified sense number of the specified
* lemma with the specified part-of-speech.
*/
- public String getSenseKey(String lemma, String pos, int senseNumber);
+ String getSenseKey(String lemma, String pos, int senseNumber);
/**
* Returns the number of senses in the dictionary for the specified lemma.
@@ -51,7 +51,7 @@ public interface Dictionary {
* @param pos The part-of-speech for the lemma.
* @return the number of senses in the dictionary for the specified lemma.
*/
- public int getNumSenses(String lemma, String pos);
+ int getNumSenses(String lemma, String pos);
/**
* Returns an array of keys for each parent of the specified sense number
@@ -63,5 +63,5 @@ public interface Dictionary {
* @return an array of keys for each parent of the specified sense number of
* the specified lemma with the specified part-of-speech.
*/
- public String[] getParentSenseKeys(String lemma, String pos, int senseNumber);
+ String[] getParentSenseKeys(String lemma, String pos, int senseNumber);
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DictionaryFactory.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DictionaryFactory.java
index 5def919..f5b5473 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DictionaryFactory.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/DictionaryFactory.java
@@ -37,10 +37,7 @@ public class DictionaryFactory {
try {
dictionary = new JWNLDictionary(System.getProperty("WNSEARCHDIR"));
}
- catch (IOException e) {
- System.err.println(e);
- }
- catch (JWNLException e) {
+ catch (IOException | JWNLException e) {
System.err.println(e);
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/JWNLDictionary.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/JWNLDictionary.java
index fcc3424..ae5b869 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/JWNLDictionary.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/JWNLDictionary.java
@@ -51,15 +51,15 @@ import net.didion.jwnl.princeton.file.PrincetonRandomAccessDictionaryFile;
*/
public class JWNLDictionary implements Dictionary {
- private net.didion.jwnl.dictionary.Dictionary dict;
+ private final net.didion.jwnl.dictionary.Dictionary dict;
private MorphologicalProcessor morphy;
- private static String[] empty = new String[0];
+ private static final String[] empty = new String[0];
public JWNLDictionary(String searchDirectory) throws IOException, JWNLException {
PointerType.initialize();
Adjective.initialize();
VerbFrame.initialize();
- Map<POS, String[][]> suffixMap = new HashMap<POS, String[][]>();
+ Map<POS, String[][]> suffixMap = new HashMap<>();
suffixMap.put(POS.NOUN,new String[][] {{"s",""},{"ses","s"},{"xes","x"},{"zes","z"},
{"ches","ch"},{"shes","sh"},{"men","man"},{"ies","y"}});
suffixMap.put(POS.VERB,new String[][] {{"s",""},{"ies","y"},{"es","e"},{"es",""},{"ed","e"},
@@ -142,11 +142,11 @@ public class JWNLDictionary implements Dictionary {
private void getParents(Synset synset, List<String> parents) throws JWNLException {
Pointer[] pointers = synset.getPointers();
- for (int pi = 0, pn = pointers.length; pi < pn;pi++) {
- if (pointers[pi].getType() == PointerType.HYPERNYM) {
- Synset parent = pointers[pi].getTargetSynset();
+ for (Pointer pointer : pointers) {
+ if (pointer.getType() == PointerType.HYPERNYM) {
+ Synset parent = pointer.getTargetSynset();
parents.add(String.valueOf(parent.getOffset()));
- getParents(parent,parents);
+ getParents(parent, parents);
}
}
}
@@ -178,10 +178,10 @@ public class JWNLDictionary implements Dictionary {
Dictionary dict = new JWNLDictionary(System.getProperty("WNSEARCHDIR"));
String word = args[0];
String[] lemmas = dict.getLemmas(word,"NN");
- for (int li = 0,ln = lemmas.length; li < ln;li++) {
- for (int si = 0, sn = dict.getNumSenses(lemmas[li],"NN"); si < sn;si++) {
- System.out.println(lemmas[li] + " (" + si + ")\t" +
- Arrays.asList(dict.getParentSenseKeys(lemmas[li],"NN",si)));
+ for (String lemma : lemmas) {
+ for (int si = 0, sn = dict.getNumSenses(lemma, "NN"); si < sn; si++) {
+ System.out.println(lemma + " (" + si + ")\t" +
+ Arrays.asList(dict.getParentSenseKeys(lemma, "NN", si)));
}
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Mention.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Mention.java
index 2308220..e13c2e2 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Mention.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/Mention.java
@@ -33,7 +33,7 @@ public class Mention implements Comparable<Mention> {
* A string representing the type of this extent. This is helpful for determining
* which piece of code created a particular extent.
*/
- protected String type;
+ protected final String type;
/**
* The entity id indicating which entity this extent belongs to. This is only
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionContext.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionContext.java
index 0986557..a359d41 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionContext.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionContext.java
@@ -33,52 +33,52 @@ public class MentionContext extends Context {
/**
* The index of first token which is not part of a descriptor. This is 0 if no descriptor is present.
*/
- private int nonDescriptorStart;
+ private final int nonDescriptorStart;
/**
* The Parse of the head constituent of this mention.
*/
- private Parse head;
+ private final Parse head;
/**
* Sentence-token-based span whose end is the last token of the mention.
*/
- private Span indexSpan;
+ private final Span indexSpan;
/**
* Position of the NP in the sentence.
*/
- private int nounLocation;
+ private final int nounLocation;
/**
* Position of the NP in the document.
*/
- private int nounNumber;
+ private final int nounNumber;
/**
* Number of noun phrases in the sentence which contains this mention.
*/
- private int maxNounLocation;
+ private final int maxNounLocation;
/**
* Index of the sentence in the document which contains this mention.
*/
- private int sentenceNumber;
+ private final int sentenceNumber;
/**
* The token preceding this mention's maximal noun phrase.
*/
- private Parse prevToken;
+ private final Parse prevToken;
/**
* The token following this mention's maximal noun phrase.
*/
- private Parse nextToken;
+ private final Parse nextToken;
/**
* The token following this mention's basal noun phrase.
*/
- private Parse basalNextToken;
+ private final Parse basalNextToken;
/**
* The parse of the mention's head word.
@@ -226,8 +226,8 @@ public class MentionContext extends Context {
public String getHeadText() {
StringBuilder headText = new StringBuilder();
- for (int hsi = 0; hsi < tokens.length; hsi++) {
- headText.append(" ").append(tokens[hsi].toString());
+ for (Object token : tokens) {
+ headText.append(" ").append(token.toString());
}
return headText.toString().substring(1);
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionFinder.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionFinder.java
index 73921e2..047f258 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionFinder.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/MentionFinder.java
@@ -30,21 +30,21 @@ public interface MentionFinder {
* @param collectPrenominalNamedEntities true if pre-nominal named-entities
* should be collected; false otherwise.
*/
- public void setPrenominalNamedEntityCollection(boolean collectPrenominalNamedEntities);
+ void setPrenominalNamedEntityCollection(boolean collectPrenominalNamedEntities);
/**
* Returns whether this mention finder collects pre-nominal named-entities as mentions.
*
* @return true if this mention finder collects pre-nominal named-entities as mentions
*/
- public boolean isPrenominalNamedEntityCollection();
+ boolean isPrenominalNamedEntityCollection();
/**
* Returns whether this mention finder collects coordinated noun phrases as mentions.
*
* @return true if this mention finder collects coordinated noun phrases as mentions; false otherwise.
*/
- public boolean isCoordinatedNounPhraseCollection();
+ boolean isCoordinatedNounPhraseCollection();
/**
* Specifies whether coordinated noun phrases should be collected as mentions.
@@ -52,7 +52,7 @@ public interface MentionFinder {
* @param collectCoordinatedNounPhrases true if coordinated noun phrases should be collected;
* false otherwise.
*/
- public void setCoordinatedNounPhraseCollection(boolean collectCoordinatedNounPhrases);
+ void setCoordinatedNounPhraseCollection(boolean collectCoordinatedNounPhrases);
/**
* Returns an array of mentions.
@@ -61,5 +61,5 @@ public interface MentionFinder {
*
* @return an array of mentions which implement the <code>Extent</code> interface.
*/
- public Mention[] getMentions(Parse parse);
+ Mention[] getMentions(Parse parse);
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/PTBHeadFinder.java b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/PTBHeadFinder.java
index bb1ae5e..4ce1982 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/mention/PTBHeadFinder.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/mention/PTBHeadFinder.java
@@ -28,7 +28,7 @@ import java.util.Set;
public final class PTBHeadFinder implements HeadFinder {
private static PTBHeadFinder instance;
- private static Set<String> skipSet = new HashSet<String>();
+ private static final Set<String> skipSet = new HashSet<>();
static {
skipSet.add("POS");
skipSet.add(",");
@@ -92,8 +92,7 @@ public final class PTBHeadFinder implements HeadFinder {
}
}
//all other NPs
- for (int pi = 0; pi < parts.size(); pi++) {
- Parse child = parts.get(pi);
+ for (Parse child : parts) {
//System.err.println("PTBHeadFinder.getHead: "+p.getSyntacticType()+" "+p
// +" child "+pi+"="+child.getSyntacticType()+" "+child);
if (child.isNounPhrase()) {
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/AbstractResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/AbstractResolver.java
index 263449a..d8b147a 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/AbstractResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/AbstractResolver.java
@@ -34,7 +34,7 @@ public abstract class AbstractResolver implements Resolver {
/**
* The number of previous entities that resolver should consider.
*/
- protected int numEntitiesBack;
+ protected final int numEntitiesBack;
/**
* Debugging variable which specifies whether error output is generated
@@ -47,7 +47,7 @@ public abstract class AbstractResolver implements Resolver {
* Debugging variable which holds statistics about mention distances
* during training.
*/
- protected Map<Integer, Integer> distances;
+ protected final Map<Integer, Integer> distances;
/**
* The number of sentences back this resolver should look for a referent.
@@ -197,5 +197,5 @@ public abstract class AbstractResolver implements Resolver {
}
- public void train() throws IOException {};
+ public void train() throws IOException {}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/CommonNounResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/CommonNounResolver.java
index 5cd8a9d..a0120fe 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/CommonNounResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/CommonNounResolver.java
@@ -44,7 +44,7 @@ public class CommonNounResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
if (entity != null) {
features.addAll(ResolverUtils.getContextFeatures(mention));
features.addAll(ResolverUtils.getStringMatchFeatures(mention,entity));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java
index 7439e76..1e37977 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java
@@ -24,7 +24,6 @@ import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import opennlp.tools.coref.mention.MentionContext;
@@ -57,7 +56,7 @@ public class DefaultNonReferentialResolver implements NonReferentialResolver {
this.mode = mode;
this.modelName = projectName + "/" + name + ".nr";
if (mode == ResolverMode.TRAIN) {
- events = new ArrayList<Event>();
+ events = new ArrayList<>();
}
else if (mode == ResolverMode.TEST) {
if (loadAsResource) {
@@ -97,7 +96,7 @@ public class DefaultNonReferentialResolver implements NonReferentialResolver {
}
protected List<String> getFeatures(MentionContext mention) {
- List<String> features = new ArrayList<String>();
+ List<String> features = new ArrayList<>();
features.add(MaxentResolver.DEFAULT);
features.addAll(getNonReferentialFeatures(mention));
return features;
@@ -109,14 +108,14 @@ public class DefaultNonReferentialResolver implements NonReferentialResolver {
* @return a list of features used to predict whether the specified mention is non-referential.
*/
protected List<String> getNonReferentialFeatures(MentionContext mention) {
- List<String> features = new ArrayList<String>();
+ List<String> features = new ArrayList<>();
Parse[] mtokens = mention.getTokenParses();
//System.err.println("getNonReferentialFeatures: mention has "+mtokens.length+" tokens");
for (int ti = 0; ti <= mention.getHeadTokenIndex(); ti++) {
Parse tok = mtokens[ti];
List<String> wfs = ResolverUtils.getWordFeatures(tok);
- for (int wfi = 0; wfi < wfs.size(); wfi++) {
- features.add("nr" + wfs.get(wfi));
+ for (String wf : wfs) {
+ features.add("nr" + wf);
}
}
features.addAll(ResolverUtils.getContextFeatures(mention));
@@ -129,8 +128,7 @@ public class DefaultNonReferentialResolver implements NonReferentialResolver {
System.err.println(this + " referential");
if (debugOn) {
FileWriter writer = new FileWriter(modelName + ".events");
- for (Iterator<Event> ei = events.iterator(); ei.hasNext();) {
- Event e = ei.next();
+ for (Event e : events) {
writer.write(e.toString() + "\n");
}
writer.close();
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefiniteNounResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefiniteNounResolver.java
index 5a95332..6c1df3e 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefiniteNounResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefiniteNounResolver.java
@@ -55,7 +55,7 @@ public class DefiniteNounResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
if (entity != null) {
features.addAll(ResolverUtils.getContextFeatures(mention));
features.addAll(ResolverUtils.getStringMatchFeatures(mention,entity));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/FixedNonReferentialResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/FixedNonReferentialResolver.java
index a911fac..3633119 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/FixedNonReferentialResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/FixedNonReferentialResolver.java
@@ -26,7 +26,7 @@ import opennlp.tools.coref.mention.MentionContext;
*/
public class FixedNonReferentialResolver implements NonReferentialResolver {
- private double nonReferentialProbability;
+ private final double nonReferentialProbability;
public FixedNonReferentialResolver(double nonReferentialProbability) {
this.nonReferentialProbability = nonReferentialProbability;
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/IsAResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/IsAResolver.java
index 70778ec..ec9ef48 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/IsAResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/IsAResolver.java
@@ -98,16 +98,16 @@ public class IsAResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
if (entity != null) {
MentionContext ant = entity.getLastExtent();
List<String> leftContexts = ResolverUtils.getContextFeatures(ant);
- for (int ci = 0, cn = leftContexts.size(); ci < cn; ci++) {
- features.add("l" + leftContexts.get(ci));
+ for (String leftContext : leftContexts) {
+ features.add("l" + leftContext);
}
List<String> rightContexts = ResolverUtils.getContextFeatures(mention);
- for (int ci = 0, cn = rightContexts.size(); ci < cn; ci++) {
- features.add("r" + rightContexts.get(ci));
+ for (String rightContext : rightContexts) {
+ features.add("r" + rightContext);
}
features.add("hts" + ant.getHeadTokenTag() + "," + mention.getHeadTokenTag());
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java
index 740738a..8672cb2 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java
@@ -53,7 +53,7 @@ public abstract class MaxentResolver extends AbstractResolver {
public static final String DEFAULT = "default";
- private static boolean debugOn = false;
+ private static final boolean debugOn = false;
private String modelName;
private MaxentModel model;
@@ -129,7 +129,7 @@ public abstract class MaxentResolver extends AbstractResolver {
sameIndex = model.getIndex(SAME);
}
else if (ResolverMode.TRAIN == this.mode) {
- events = new ArrayList<Event>();
+ events = new ArrayList<>();
}
else {
System.err.println("Unknown mode: " + this.mode);
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralNounResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralNounResolver.java
index 0a8c2a5..79bbc5d 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralNounResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralNounResolver.java
@@ -44,7 +44,7 @@ public class PluralNounResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
if (entity != null) {
features.addAll(ResolverUtils.getContextFeatures(mention));
features.addAll(ResolverUtils.getStringMatchFeatures(mention,entity));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralPronounResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralPronounResolver.java
index 72f43fb..2592316 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralPronounResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/PluralPronounResolver.java
@@ -29,7 +29,7 @@ import opennlp.tools.coref.mention.MentionContext;
*/
public class PluralPronounResolver extends MaxentResolver {
- int NUM_SENTS_BACK_PRONOUNS = 2;
+ final int NUM_SENTS_BACK_PRONOUNS = 2;
public PluralPronounResolver(String projectName, ResolverMode m) throws IOException {
super(projectName, "tmodel", m, 30);
@@ -42,7 +42,7 @@ public class PluralPronounResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
//features.add("eid="+pc.id);
if (entity != null) { //generate pronoun w/ referent features
features.addAll(ResolverUtils.getPronounMatchFeatures(mention,entity));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ProperNounResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ProperNounResolver.java
index 1df4743..89f4b79 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ProperNounResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ProperNounResolver.java
@@ -65,7 +65,7 @@ public class ProperNounResolver extends MaxentResolver {
}
private void initAcronyms(String name) {
- acroMap = new HashMap<String, Set<String>>(15000);
+ acroMap = new HashMap<>(15000);
try {
BufferedReader str;
str = new BufferedReader(new FileReader(name));
@@ -77,13 +77,13 @@ public class ProperNounResolver extends MaxentResolver {
String full = st.nextToken();
Set<String> exSet = acroMap.get(acro);
if (exSet == null) {
- exSet = new HashSet<String>();
+ exSet = new HashSet<>();
acroMap.put(acro, exSet);
}
exSet.add(full);
exSet = acroMap.get(full);
if (exSet == null) {
- exSet = new HashSet<String>();
+ exSet = new HashSet<>();
acroMap.put(full, exSet);
}
exSet.add(acro);
@@ -108,7 +108,7 @@ public class ProperNounResolver extends MaxentResolver {
String xecStrip = ResolverUtils.stripNp(xec);
if (ecStrip != null && xecStrip != null) {
if (isAcronym(ecStrip, xecStrip)) {
- List<String> features = new ArrayList<String>(1);
+ List<String> features = new ArrayList<>(1);
features.add("knownAcronym");
return features;
}
@@ -119,7 +119,7 @@ public class ProperNounResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
//System.err.println("ProperNounResolver.getFeatures: "+mention.toText()+" -> "+entity);
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
if (entity != null) {
features.addAll(ResolverUtils.getStringMatchFeatures(mention, entity));
features.addAll(getAcronymFeatures(mention, entity));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ResolverUtils.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ResolverUtils.java
index 1e5539b..b63627d 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ResolverUtils.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/ResolverUtils.java
@@ -172,7 +172,7 @@ public class ResolverUtils {
if (!first) {
sb.append(" ");
}
- sb.append(token.toString());
+ sb.append(token);
first = false;
}
}
@@ -497,7 +497,7 @@ public class ResolverUtils {
}
}
}
- List<String> pronounFeatures = new ArrayList<String>();
+ List<String> pronounFeatures = new ArrayList<>();
if (foundCompatiblePronoun) {
pronounFeatures.add("compatiblePronoun");
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SingularPronounResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SingularPronounResolver.java
index 486c5ef..459bf10 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SingularPronounResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SingularPronounResolver.java
@@ -55,7 +55,7 @@ public class SingularPronounResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
if (entity != null) { //generate pronoun w/ referent features
MentionContext cec = entity.getLastExtent();
//String gen = getPronounGender(pronoun);
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SpeechPronounResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SpeechPronounResolver.java
index d590212..be4e5dc 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SpeechPronounResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/SpeechPronounResolver.java
@@ -46,7 +46,7 @@ public class SpeechPronounResolver extends MaxentResolver {
@Override
protected List<String> getFeatures(MentionContext mention, DiscourseEntity entity) {
- List<String> features = new ArrayList<String>(super.getFeatures(mention, entity));
+ List<String> features = new ArrayList<>(super.getFeatures(mention, entity));
if (entity != null) {
features.addAll(ResolverUtils.getPronounMatchFeatures(mention,entity));
List<String> contexts = ResolverUtils.getContextFeatures(mention);
@@ -55,15 +55,15 @@ public class SpeechPronounResolver extends MaxentResolver {
features.add(mention.getHeadTokenText() + "," + cec.getHeadTokenText());
}
else if (mention.getHeadTokenText().startsWith("NNP")) {
- for (int ci = 0, cl = contexts.size(); ci < cl; ci++) {
- features.add(contexts.get(ci));
+ for (String context : contexts) {
+ features.add(context);
}
features.add(mention.getNameType() + "," + cec.getHeadTokenText());
}
else {
List<String> ccontexts = ResolverUtils.getContextFeatures(cec);
- for (int ci = 0, cl = ccontexts.size(); ci < cl; ci++) {
- features.add(ccontexts.get(ci));
+ for (String ccontext : ccontexts) {
+ features.add(ccontext);
}
features.add(cec.getNameType() + "," + mention.getHeadTokenText());
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Context.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Context.java
index ea6d819..4ff5d0d 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Context.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Context.java
@@ -91,8 +91,8 @@ public class Context extends Mention {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- for (int ti = 0, tl = tokens.length; ti < tl; ti++) {
- sb.append(tokens[ti]).append(" ");
+ for (Object token : tokens) {
+ sb.append(token).append(" ");
}
return sb.toString();
}
@@ -126,17 +126,17 @@ public class Context extends Mention {
}
private static Set<String> getSynsetSet(Context c) {
- Set<String> synsetSet = new HashSet<String>();
+ Set<String> synsetSet = new HashSet<>();
String[] lemmas = getLemmas(c);
Dictionary dict = DictionaryFactory.getDictionary();
//System.err.println(lemmas.length+" lemmas for "+c.headToken);
- for (int li = 0; li < lemmas.length; li++) {
- String senseKey = dict.getSenseKey(lemmas[li],"NN",0);
+ for (String lemma : lemmas) {
+ String senseKey = dict.getSenseKey(lemma, "NN", 0);
if (senseKey != null) {
synsetSet.add(senseKey);
- String[] synsets = dict.getParentSenseKeys(lemmas[li],"NN",0);
- for (int si = 0, sn = synsets.length; si < sn;si++) {
- synsetSet.add(synsets[si]);
+ String[] synsets = dict.getParentSenseKeys(lemma, "NN", 0);
+ for (String synset : synsets) {
+ synsetSet.add(synset);
}
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Gender.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Gender.java
index bb0c996..cdff989 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Gender.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Gender.java
@@ -22,8 +22,8 @@ package opennlp.tools.coref.sim;
*/
public class Gender {
- private GenderEnum type;
- private double confidence;
+ private final GenderEnum type;
+ private final double confidence;
public Gender(GenderEnum type,double confidence) {
this.type = type;
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/MaxentCompatibilityModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/MaxentCompatibilityModel.java
index 8025fbf..03c8774 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/MaxentCompatibilityModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/MaxentCompatibilityModel.java
@@ -30,7 +30,7 @@ public class MaxentCompatibilityModel {
private static TestGenderModel genModel;
private static TestNumberModel numModel;
- private boolean debugOn = false;
+ private final boolean debugOn = false;
public MaxentCompatibilityModel(String corefProject) throws IOException {
genModel = GenderModel.testModel(corefProject + "/gen");
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Number.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Number.java
index 27c1e49..68a9e20 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Number.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/Number.java
@@ -20,8 +20,8 @@ package opennlp.tools.coref.sim;
* Class which models the number of an entity and the confidence of that association.
*/
public class Number {
- private NumberEnum type;
- private double confidence;
+ private final NumberEnum type;
+ private final double confidence;
public Number(NumberEnum type,double confidence) {
this.type = type;
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java
index fa8070a..2ee8481 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java
@@ -61,7 +61,7 @@ public class NumberModel implements TestNumberModel, TrainSimilarityModel {
private NumberModel(String modelName, boolean train) throws IOException {
this.modelName = modelName;
if (train) {
- events = new ArrayList<Event>();
+ events = new ArrayList<>();
}
else {
try (DataInputStream dis = new DataInputStream(
@@ -117,13 +117,11 @@ public class NumberModel implements TestNumberModel, TrainSimilarityModel {
public void setExtents(Context[] extentContexts) {
Map<Integer,Context> entities = new HashMap<>();
List<Context> singletons = new ArrayList<>();
- for (int ei = 0, el = extentContexts.length; ei < el; ei++) {
- Context ec = extentContexts[ei];
+ for (Context ec : extentContexts) {
//System.err.println("NumberModel.setExtents: ec("+ec.getId()+") "+ec.toText());
if (ec.getId() != -1) {
entities.put(ec.getId(), ec);
- }
- else {
+ } else {
singletons.add(ec);
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SemanticEnum.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SemanticEnum.java
index 568ab1d..d900c95 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SemanticEnum.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SemanticEnum.java
@@ -19,7 +19,7 @@ package opennlp.tools.coref.sim;
public class SemanticEnum {
- private String compatibility;
+ private final String compatibility;
/** Semantically compatible. */
public static final SemanticEnum COMPATIBLE = new SemanticEnum("compatible");
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java
index bf77af0..8ba4887 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java
@@ -102,7 +102,7 @@ public class SimilarityModel implements TestSimilarityModel, TrainSimilarityMode
* @return A set containing the head words of the specified mentions.
*/
private Set<String> constructHeadSet(List<Context> mentions) {
- Set<String> headSet = new HashSet<String>();
+ Set<String> headSet = new HashSet<>();
for (Context ec : mentions) {
headSet.add(ec.getHeadTokenText().toLowerCase());
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestGenderModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestGenderModel.java
index 85af05f..3d06519 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestGenderModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestGenderModel.java
@@ -21,8 +21,8 @@ package opennlp.tools.coref.sim;
* Interface for testing a gender model.
*/
public interface TestGenderModel {
- public double[] genderDistribution(Context np1);
- public int getMaleIndex();
- public int getFemaleIndex();
- public int getNeuterIndex();
+ double[] genderDistribution(Context np1);
+ int getMaleIndex();
+ int getFemaleIndex();
+ int getNeuterIndex();
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestNumberModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestNumberModel.java
index 6172fe5..769d2f7 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestNumberModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestNumberModel.java
@@ -22,8 +22,8 @@ package opennlp.tools.coref.sim;
*
*/
public interface TestNumberModel {
- public double[] numberDist(Context np1);
+ double[] numberDist(Context np1);
- public int getSingularIndex();
- public int getPluralIndex();
+ int getSingularIndex();
+ int getPluralIndex();
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestSimilarityModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestSimilarityModel.java
index 8bc9fa8..a09baf4 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestSimilarityModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/TestSimilarityModel.java
@@ -22,5 +22,5 @@ package opennlp.tools.coref.sim;
* Interface for testing a similarity model.
*/
public interface TestSimilarityModel {
- public double compatible(Context np1, Context np2);
+ double compatible(Context np1, Context np2);
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/FullParseCorefEnhancerStream.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/FullParseCorefEnhancerStream.java
index a83aa9e..98adfc8 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/FullParseCorefEnhancerStream.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/FullParseCorefEnhancerStream.java
@@ -73,19 +73,17 @@ public class FullParseCorefEnhancerStream extends FilterObjectStream<RawCorefSam
if (sample != null) {
- List<Parse> enhancedParses = new ArrayList<Parse>();
+ List<Parse> enhancedParses = new ArrayList<>();
List<String[]> sentences = sample.getTexts();
-
- for (int i = 0; i < sentences.size(); i++) {
-
- String[] sentence = sentences.get(i);
-
+
+ for (String[] sentence : sentences) {
+
Parse incompleteParse = createIncompleteParse(sentence);
Parse p = parser.parse(incompleteParse);
-
+
// What to do when a parse cannot be found ?!
-
+
enhancedParses.add(p);
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/Muc6FullParseCorefSampleStreamFactory.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/Muc6FullParseCorefSampleStreamFactory.java
index 06cda53..d715871 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/Muc6FullParseCorefSampleStreamFactory.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/Muc6FullParseCorefSampleStreamFactory.java
@@ -19,7 +19,7 @@ package opennlp.tools.formats.muc;
import java.io.File;
import java.io.FileFilter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -89,7 +89,7 @@ public class Muc6FullParseCorefSampleStreamFactory extends AbstractSampleStreamF
public boolean accept(File file) {
return file.getName().toLowerCase().endsWith(".sgm");
}
- }, false), Charset.forName("UTF-8"));
+ }, false), StandardCharsets.UTF_8);
ObjectStream<RawCorefSample> rawSamples =
new MucCorefSampleStream(tokenizer, mucDocStream);
@@ -100,13 +100,13 @@ public class Muc6FullParseCorefSampleStreamFactory extends AbstractSampleStreamF
// How to load all these nameFinder models ?!
// Let's make a param per model, not that nice, but ok!
- Map<String, File> modelFileTagMap = new HashMap<String, File>();
+ Map<String, File> modelFileTagMap = new HashMap<>();
modelFileTagMap.put("person", params.getPersonModel());
modelFileTagMap.put("organization", params.getOrganizationModel());
- List<TokenNameFinder> nameFinders = new ArrayList<TokenNameFinder>();
- List<String> tags = new ArrayList<String>();
+ List<TokenNameFinder> nameFinders = new ArrayList<>();
+ List<String> tags = new ArrayList<>();
for (Map.Entry<String, File> entry : modelFileTagMap.entrySet()) {
nameFinders.add(new NameFinderME(
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefContentHandler.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefContentHandler.java
index 13e8360..83d81b1 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefContentHandler.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefContentHandler.java
@@ -34,7 +34,7 @@ class MucCorefContentHandler extends SgmlParser.ContentHandler {
static class CorefMention {
Span span;
int id;
- String min;
+ final String min;
CorefMention(Span span, int id, String min) {
this.span = span;
@@ -49,11 +49,11 @@ class MucCorefContentHandler extends SgmlParser.ContentHandler {
private final List<RawCorefSample> samples;
boolean isInsideContentElement = false;
- private final List<String> text = new ArrayList<String>();
- private Stack<CorefMention> mentionStack = new Stack<CorefMention>();
- private List<CorefMention> mentions = new ArrayList<MucCorefContentHandler.CorefMention>();
+ private final List<String> text = new ArrayList<>();
+ private final Stack<CorefMention> mentionStack = new Stack<>();
+ private final List<CorefMention> mentions = new ArrayList<>();
- private Map<Integer, Integer> idMap = new HashMap<Integer, Integer>();
+ private final Map<Integer, Integer> idMap = new HashMap<>();
private RawCorefSample sample;
@@ -91,8 +91,8 @@ class MucCorefContentHandler extends SgmlParser.ContentHandler {
if (MucElementNames.DOC_ELEMENT.equals(name)) {
idMap.clear();
- sample = new RawCorefSample(new ArrayList<String>(),
- new ArrayList<MucCorefContentHandler.CorefMention[]>());
+ sample = new RawCorefSample(new ArrayList<>(),
+ new ArrayList<>());
}
if (MucElementNames.CONTENT_ELEMENTS.contains(name)) {
@@ -158,8 +158,8 @@ class MucCorefContentHandler extends SgmlParser.ContentHandler {
if (MucElementNames.DOC_ELEMENT.equals(name)) {
for (CorefMention[] mentions : sample.getMentions()) {
- for (int i = 0; i < mentions.length; i++) {
- mentions[i].id = resolveId(mentions[i].id);
+ for (CorefMention mention : mentions) {
+ mention.id = resolveId(mention.id);
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefSampleStream.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefSampleStream.java
index f139237..26fd19d 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefSampleStream.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucCorefSampleStream.java
@@ -30,7 +30,7 @@ public class MucCorefSampleStream extends FilterObjectStream<String, RawCorefSam
private final Tokenizer tokenizer;
- private List<RawCorefSample> documents = new ArrayList<RawCorefSample>();
+ private final List<RawCorefSample> documents = new ArrayList<>();
public MucCorefSampleStream(Tokenizer tokenizer, ObjectStream<String> documents) {
super(new DocumentSplitterStream(documents));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucMentionInserterStream.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucMentionInserterStream.java
index 84e8222..398a6f5 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucMentionInserterStream.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/MucMentionInserterStream.java
@@ -42,7 +42,7 @@ import opennlp.tools.util.Span;
*/
public class MucMentionInserterStream extends FilterObjectStream<RawCorefSample, CorefSample> {
- private static Set<String> entitySet = new HashSet<String>(Arrays.asList(DefaultParse.NAME_TYPES));
+ private static final Set<String> entitySet = new HashSet<>(Arrays.asList(DefaultParse.NAME_TYPES));
private final MentionFinder mentionFinder;
@@ -122,7 +122,7 @@ public class MucMentionInserterStream extends FilterObjectStream<RawCorefSample,
if (sample != null) {
- List<Parse> mentionParses = new ArrayList<Parse>();
+ List<Parse> mentionParses = new ArrayList<>();
List<CorefMention[]> allMentions = sample.getMentions();
List<Parse> allParses = sample.getParses();
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/NameFinderCorefEnhancerStream.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/NameFinderCorefEnhancerStream.java
index 93bc89e..e9e0bc4 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/NameFinderCorefEnhancerStream.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/NameFinderCorefEnhancerStream.java
@@ -32,8 +32,8 @@ import opennlp.tools.util.Span;
*/
public class NameFinderCorefEnhancerStream extends FilterObjectStream<RawCorefSample, RawCorefSample> {
- private TokenNameFinder[] nameFinders;
- private String[] tags;
+ private final TokenNameFinder[] nameFinders;
+ private final String[] tags;
// TODO: Should be updated to use tag from span instead!
protected NameFinderCorefEnhancerStream(TokenNameFinder[] nameFinders, String[] tags,
@@ -53,7 +53,7 @@ public class NameFinderCorefEnhancerStream extends FilterObjectStream<RawCorefSa
namefinder.clearAdaptiveData();
}
- List<Parse> parses = new ArrayList<Parse>();
+ List<Parse> parses = new ArrayList<>();
for (Parse p : sample.getParses()) {
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/RawCorefSample.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/RawCorefSample.java
index ffb6596..bbea40f 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/RawCorefSample.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/RawCorefSample.java
@@ -28,8 +28,8 @@ import opennlp.tools.parser.Parse;
*/
public class RawCorefSample {
- private List<String[]> texts = new ArrayList<>();
- private List<CorefMention[]> mentions = new ArrayList<>();
+ private final List<String[]> texts = new ArrayList<>();
+ private final List<CorefMention[]> mentions = new ArrayList<>();
private List<Parse> parses;
diff --git a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/ShallowParseCorefEnhancerStream.java b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/ShallowParseCorefEnhancerStream.java
index fc5d696..1796b34 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/formats/muc/ShallowParseCorefEnhancerStream.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/formats/muc/ShallowParseCorefEnhancerStream.java
@@ -47,7 +47,7 @@ public class ShallowParseCorefEnhancerStream extends FilterObjectStream<RawCoref
if (sample != null) {
- List<Parse> enhancedParses = new ArrayList<Parse>();
+ List<Parse> enhancedParses = new ArrayList<>();
List<String[]> sentences = sample.getTexts();
diff --git a/opennlp-coref/src/main/java/opennlp/tools/lang/english/CorefParse.java b/opennlp-coref/src/main/java/opennlp/tools/lang/english/CorefParse.java
index 6db343d..ac9bdbb 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/lang/english/CorefParse.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/lang/english/CorefParse.java
@@ -31,8 +31,8 @@ import opennlp.tools.util.Span;
class CorefParse {
- private Map<Parse, Integer> parseMap;
- private List<Parse> parses;
+ private final Map<Parse, Integer> parseMap;
+ private final List<Parse> parses;
public CorefParse(List<Parse> parses, DiscourseEntity[] entities) {
this.parses = parses;
@@ -50,8 +50,7 @@ class CorefParse {
}
public void show() {
- for (int pi = 0, pn = parses.size(); pi < pn; pi++) {
- Parse p = parses.get(pi);
+ for (Parse p : parses) {
show(p);
System.out.println();
}
@@ -70,8 +69,7 @@ class CorefParse {
System.out.print(" ");
}
Parse[] children = p.getChildren();
- for (int pi = 0, pn = children.length; pi < pn;pi++) {
- Parse c = children[pi];
+ for (Parse c : children) {
Span s = c.getSpan();
if (start < s.getStart()) {
System.out.print(p.getText().substring(start, s.getStart()));
diff --git a/opennlp-coref/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java b/opennlp-coref/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java
index c5ff3d3..7e60bbe 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java
@@ -40,7 +40,7 @@ public class TreebankNameFinder {
public static String[] NAME_TYPES =
{"person", "organization", "location", "date", "time", "percentage", "money"};
- private NameFinderME nameFinder;
+ private final NameFinderME nameFinder;
/** Creates an English name finder using the specified model.
* @param mod The model used for finding names.
@@ -50,8 +50,8 @@ public class TreebankNameFinder {
}
private static void clearPrevTokenMaps(TreebankNameFinder[] finders) {
- for (int mi = 0; mi < finders.length; mi++) {
- finders[mi].nameFinder.clearAdaptiveData();
+ for (TreebankNameFinder finder : finders) {
+ finder.nameFinder.clearAdaptiveData();
}
}
diff --git a/opennlp-dl/src/main/java/opennlp/tools/dl/NameSampleDataSetIterator.java b/opennlp-dl/src/main/java/opennlp/tools/dl/NameSampleDataSetIterator.java
index 61bfc0a..3801a47 100644
--- a/opennlp-dl/src/main/java/opennlp/tools/dl/NameSampleDataSetIterator.java
+++ b/opennlp-dl/src/main/java/opennlp/tools/dl/NameSampleDataSetIterator.java
@@ -106,7 +106,7 @@ public class NameSampleDataSetIterator implements DataSetIterator {
private final ObjectStream<DataSet> samples;
NameSampleDataSetIterator(ObjectStream<NameSample> samples, WordVectors wordVectors, int windowSize,
- String labels[]) throws IOException {
+ String[] labels) throws IOException {
this.windowSize = windowSize;
this.labels = labels;
diff --git a/opennlp-similarity/RELEASE_NOTES.html b/opennlp-similarity/RELEASE_NOTES.html
index 8dea1bf..00fc510 100644
--- a/opennlp-similarity/RELEASE_NOTES.html
+++ b/opennlp-similarity/RELEASE_NOTES.html
@@ -58,14 +58,14 @@ Please see the <a href="README">README</a> for this information.
<p>
The Apache OpenNLP project really needs and appreciates any contributions,
including documentation help, source code and feedback. If you are interested
-in contributing, please visit <a href="http://opennlp.apache.org/">http://opennlp.apache.org/</a>
+in contributing, please visit <a href="https://opennlp.apache.org/">https://opennlp.apache.org/</a>
</p>
<h2><a name="report.issues">How to Report Issues</a></h2>
<p>
The Apache OpenNLP project uses JIRA for issue tracking. Please report any
issues you find at
-<a href="http://issues.apache.org/jira/browse/opennlp">http://issues.apache.org/jira/browse/opennlp</a>
+<a href="https://issues.apache.org/jira/browse/opennlp">https://issues.apache.org/jira/browse/opennlp</a>
</p>
<h2><a name="list.issues">List of JIRA Issues Fixed in this Release</a></h2>
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/BingWebQueryRunnerThread.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/BingWebQueryRunnerThread.java
index 0fd1752..46154cf 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/BingWebQueryRunnerThread.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/BingWebQueryRunnerThread.java
@@ -8,8 +8,8 @@ import opennlp.tools.similarity.apps.HitBase;
public class BingWebQueryRunnerThread extends BingQueryRunner implements Runnable{
- private String query;
- private List<HitBase> results= new ArrayList<HitBase>();
+ private final String query;
+ private List<HitBase> results= new ArrayList<>();
public BingWebQueryRunnerThread(String Query){
super();
this.query=Query;
@@ -27,7 +27,7 @@ public class BingWebQueryRunnerThread extends BingQueryRunner implements Runnabl
}
// Create the listener list
- protected javax.swing.event.EventListenerList listenerList = new javax.swing.event.EventListenerList();
+ protected final javax.swing.event.EventListenerList listenerList = new javax.swing.event.EventListenerList();
// This method allows classes to register for MyEvents
public void addMyEventListener(MyEventListener listener) {
listenerList.add(MyEventListener.class, listener);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/MyEventListener.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/MyEventListener.java
index cf2d69d..a854e24 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/MyEventListener.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/contentgen/multithreaded/MyEventListener.java
@@ -3,5 +3,5 @@ package opennlp.tools.apps.contentgen.multithreaded;
import java.util.EventListener;
public interface MyEventListener extends EventListener{
- public void MyEvent(MyEvent evt);
+ void MyEvent(MyEvent evt);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/object_dedup/SimilarityAccessorBase.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/object_dedup/SimilarityAccessorBase.java
index d8c2016..7a79f18 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/object_dedup/SimilarityAccessorBase.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/object_dedup/SimilarityAccessorBase.java
@@ -51,7 +51,7 @@ public class SimilarityAccessorBase {
"thru", "till", "to", "toward", "under", "up", "upon", "versus", "with", "within", "you", "must", "know",
"when" };
- protected List<String> commonWordsInEventTitles = Arrays.asList(new String[] { "community", "party", "film",
+ protected final List<String> commonWordsInEventTitles = Arrays.asList(new String[] { "community", "party", "film",
"music", "exhibition", "kareoke", "guitar", "quartet", "reggae", "r&b", "band", "dj ", "piano", "pray",
"worship", "god", "training", "class", "development", "training", "class", "course", "our", "comedy", ",fun",
"musical", "group", "alliance", "session", "feeding", "introduction", "school", "conversation", "learning",
@@ -82,7 +82,7 @@ public class SimilarityAccessorBase {
protected List<String> removeDollarWordAndNonAlphaFromList(List<String> list)
{
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
Pattern p = Pattern.compile("^\\$(\\d{1,3}(\\,\\d{3})*|(\\d+))(\\.\\d{2})?$");
for (String w : list)
{
@@ -166,9 +166,8 @@ public class SimilarityAccessorBase {
List<String> name1Tokens = TextProcessor.fastTokenize(name1.toLowerCase(), false);
List<String> name2Tokens = TextProcessor.fastTokenize(name2.toLowerCase(), false);
// get unique names
- List<String> name1TokensC = new ArrayList<String>(name1Tokens), name2TokensC = new ArrayList<String>(
- name2Tokens);
- ;
+ List<String> name1TokensC = new ArrayList<>(name1Tokens), name2TokensC = new ArrayList<>(
+ name2Tokens);
name1TokensC.removeAll(name2Tokens);
name2TokensC.removeAll(name1Tokens);
// get all unique names
@@ -191,7 +190,7 @@ public class SimilarityAccessorBase {
protected List<String> tokenizeAndStem(String input)
{
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
List<String> toks = TextProcessor.fastTokenize(input.toLowerCase(), false);
for (String word : toks)
{
@@ -212,7 +211,7 @@ public class SimilarityAccessorBase {
protected List<String> stemList(List<String> toks)
{
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
for (String word : toks)
{
try
@@ -231,7 +230,7 @@ public class SimilarityAccessorBase {
public List<String> removeVenuePart(ArrayList<String> toks)
{
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
boolean bVenuePart = false;
for (String word : toks)
{
@@ -270,7 +269,7 @@ public class SimilarityAccessorBase {
protected List<String> extractMainNounPhrase(List<String> name1Tokens)
{
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
int ofPos = name1Tokens.indexOf("of");
List<String> ofList = name1Tokens.subList(ofPos + 1, name1Tokens.size() - 1);
// now iterate till next preposition towards the end of noun phrase
@@ -381,9 +380,8 @@ public class SimilarityAccessorBase {
List<String> name1Tokens = TextProcessor.fastTokenize(name1.toLowerCase(), false);
List<String> name2Tokens = TextProcessor.fastTokenize(name2.toLowerCase(), false);
// get unique names
- List<String> name1TokensC = new ArrayList<String>(name1Tokens), name2TokensC = new ArrayList<String>(
- name2Tokens);
- ;
+ List<String> name1TokensC = new ArrayList<>(name1Tokens), name2TokensC = new ArrayList<>(
+ name2Tokens);
name1TokensC.removeAll(name2Tokens);
name2TokensC.removeAll(name1Tokens);
// get all unique names
@@ -428,11 +426,11 @@ public class SimilarityAccessorBase {
|| name1Tokens.contains("lang") || name2Tokens.contains("lang")) // special group 'lang lang'
{ // all words should be the
// same
- List<String> name1TokensClone = new ArrayList<String>(name1Tokens);
+ List<String> name1TokensClone = new ArrayList<>(name1Tokens);
name1Tokens.removeAll(name2Tokens);
name2Tokens.removeAll(name1TokensClone);
name1Tokens.addAll(name2Tokens);
- name1Tokens.removeAll(Arrays.asList(this.englishPrepositions));
+ name1Tokens.removeAll(Arrays.asList(englishPrepositions));
// name1Tokens.removeAll(Arrays.asList(this.commonWordsInEventTitles));
if (name1Tokens.size() < 1)
return true;
@@ -447,13 +445,13 @@ public class SimilarityAccessorBase {
public int getAttemptedNameMerge(String name1, String name2)
{
name1 = name1.replaceAll("[a-z][A-Z]", "$0&$0").replaceAll(".&.", " ");
- ; // suspected word merge if higher case is in the middle of word
+ // suspected word merge if higher case is in the middle of word
name2 = name2.replaceAll("[a-z][A-Z]", "$0&$0").replaceAll(".&.", " ");
name1 = name1.toLowerCase();
name2 = name2.toLowerCase();
if (name1.equals(name2) || name1.startsWith(name2) || name2.startsWith(name1) || name1.endsWith(name2)
- || name1.endsWith(name2) || name1.indexOf(name2) > -1 || name1.indexOf(name2) > -1) // ??
+ || name1.endsWith(name2) || name1.contains(name2) || name1.contains(name2)) // ??
return 2;
String name2r = name2.replace(" ", "");
if (name1.equals(name2r) || name1.startsWith(name2r) || name1.startsWith(name2r) || name1.endsWith(name2r)
@@ -500,7 +498,7 @@ public class SimilarityAccessorBase {
if (bShortTitlesSimilarInWebSpace)
return new DedupResult("Accepted as short title by web mining", 2, true);
- StringBuffer reason = new StringBuffer();
+ StringBuilder reason = new StringBuilder();
List<String> venueToks = removeVenuePart(TextProcessor.fastTokenize(venue.toLowerCase(), false));
LOG.info("\nComputing similarity between name = '" + name1 + "' and name = '" + name2 + "'");
@@ -656,7 +654,7 @@ public class SimilarityAccessorBase {
name1 = normalizeGenderAndOtherAttributes(name1);
name2 = normalizeGenderAndOtherAttributes(name2);
- StringBuffer reason = new StringBuffer();
+ StringBuilder reason = new StringBuilder();
boolean bSportsOrOrchestra = !succeededMenWomenSportsRule(name1, name2);
if (bSportsOrOrchestra)
@@ -685,7 +683,7 @@ public class SimilarityAccessorBase {
{
for (HitBase item1 : searchResult1)
{
- if (item1.getUrl().indexOf("myspace") > -1 || item1.getUrl().indexOf("wiki") > -1)
+ if (item1.getUrl().contains("myspace") || item1.getUrl().contains("wiki"))
continue;
for (HitBase item2 : searchResult2)
{
@@ -693,7 +691,7 @@ public class SimilarityAccessorBase {
.replace("MySpace", "");
String lookup2 = item2.getTitle().replace("Facebook", "").replace("LinkedIn", "")
.replace("MySpace", "");
- double d = 0;
+ double d;
if (bStem)
d = stringDistanceMeasurer.measureStringDistance(lookup1, lookup2);
else
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/PhraseProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/PhraseProcessor.java
index e5e75d3..9a05642 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/PhraseProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/PhraseProcessor.java
@@ -33,27 +33,24 @@ public class PhraseProcessor {
public static boolean allChildNodesArePOSTags(Parse p) {
Parse[] subParses = p.getChildren();
- for (int pi = 0; pi < subParses.length; pi++)
- if (!((Parse) subParses[pi]).isPosTag())
+ for (Parse subPars : subParses)
+ if (!((Parse) subPars).isPosTag())
return false;
return true;
}
public ArrayList<String> getNounPhrases(Parse p)
{
- ArrayList<String> nounphrases = new ArrayList<String>();
+ ArrayList<String> nounphrases = new ArrayList<>();
Parse[] subparses = p.getChildren();
- for (int pi = 0; pi < subparses.length; pi++)
- {
+ for (Parse subpars : subparses) {
- if (subparses[pi].getType().equals("NP") && allChildNodesArePOSTags(subparses[pi]))
- {
- Span _span = subparses[pi].getSpan();
+ if (subpars.getType().equals("NP") && allChildNodesArePOSTags(subpars)) {
+ Span _span = subpars.getSpan();
nounphrases.add(p.getText().substring(_span.getStart(), _span.getEnd()));
- }
- else if (!((Parse) subparses[pi]).isPosTag())
- nounphrases.addAll(getNounPhrases(subparses[pi]));
+ } else if (!((Parse) subpars).isPosTag())
+ nounphrases.addAll(getNounPhrases(subpars));
}
return nounphrases;
@@ -61,19 +58,16 @@ public class PhraseProcessor {
public ArrayList<String> getVerbPhrases(Parse p)
{
- ArrayList<String> verbPhrases = new ArrayList<String>();
+ ArrayList<String> verbPhrases = new ArrayList<>();
Parse[] subparses = p.getChildren();
- for (int pi = 0; pi < subparses.length; pi++)
- {
+ for (Parse subpars : subparses) {
- if (subparses[pi].getType().startsWith("VB") && allChildNodesArePOSTags(subparses[pi]))
- {
- Span _span = subparses[pi].getSpan();
+ if (subpars.getType().startsWith("VB") && allChildNodesArePOSTags(subpars)) {
+ Span _span = subpars.getSpan();
verbPhrases.add(p.getText().substring(_span.getStart(), _span.getEnd()));
- }
- else if (!((Parse) subparses[pi]).isPosTag())
- verbPhrases.addAll(getNounPhrases(subparses[pi]));
+ } else if (!((Parse) subpars).isPosTag())
+ verbPhrases.addAll(getNounPhrases(subpars));
}
return verbPhrases;
@@ -121,7 +115,7 @@ public class PhraseProcessor {
// forms phrases from text which are candidate expressions for events lookup
public List<String> extractNounPhraseProductNameCandidate(String sentence) {
- List<String> queryArrayStr = new ArrayList<String>();
+ List<String> queryArrayStr = new ArrayList<>();
if (sentence.split(" ").length ==1) { // this is a word, return empty
//queryArrayStr.add( sentence);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SentimentVocab.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SentimentVocab.java
index 2e530cd..b277a23 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SentimentVocab.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SentimentVocab.java
@@ -106,14 +106,14 @@ public class SentimentVocab {
private static final SentimentVocab instance = new SentimentVocab();
// complete sentiment word map, key = word, value = sentiment object
- private final Map<String, Sentiment> sentimentMap = new HashMap<String, Sentiment>();
+ private final Map<String, Sentiment> sentimentMap = new HashMap<>();
// sentiment word sets, key = POS type, value = word set
- private final Map<String, HashSet<String>> wordSetMap = new HashMap<String, HashSet<String>>();
+ private final Map<String, HashSet<String>> wordSetMap = new HashMap<>();
public static class Sentiment {
- public String posType;
- public int sentimentType;
+ public final String posType;
+ public final int sentimentType;
Sentiment(String posType, int sentimentType) {
this.posType = posType;
@@ -154,7 +154,7 @@ public class SentimentVocab {
if (sentiment == null)
return false;
- return sentiment.posType == posType;
+ return sentiment.posType.equals(posType);
}
public HashSet<String> getSentimentWordSet(String posType) {
@@ -206,7 +206,7 @@ public class SentimentVocab {
// add the word to the corresponding sentiment word set
HashSet<String> wordSet = wordSetMap.get(posType);
if (wordSet == null) {
- wordSet = new HashSet<String>();
+ wordSet = new HashSet<>();
wordSetMap.put(posType, wordSet);
}
wordSet.addAll(Arrays.asList(words));
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymListFilter.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymListFilter.java
index d49b3c3..e40f384 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymListFilter.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymListFilter.java
@@ -41,18 +41,18 @@ public class SynonymListFilter {
}
}
- protected static Map<String, List<String>> filteredKeyword_synonyms = new HashMap<String, List<String>>();
+ protected static Map<String, List<String>> filteredKeyword_synonyms = new HashMap<>();
static public List<String> getFileLines(File aFile) {
- List<String> items = new ArrayList<String>();
+ List<String> items = new ArrayList<>();
StringBuilder contents = new StringBuilder();
try {
BufferedReader input = new BufferedReader(new FileReader(aFile));
try {
- String line = null; //not declared within while loop
+ String line; //not declared within while loop
while (( line = input.readLine()) != null){
int endOfWord = line.indexOf(';');
if (endOfWord>2)
@@ -78,7 +78,7 @@ public class SynonymListFilter {
return null;
Random rand = new Random();
int index = (int) Math.floor(rand.nextDouble()*(double)synonyms.length);
- System.out.println("Found synonyms "+Arrays.asList(synonyms).toString()+ " | selected synonym = "+synonyms[index] +" | for the input = "+ word);
+ System.out.println("Found synonyms " + Arrays.asList(synonyms) + " | selected synonym = "+synonyms[index] +" | for the input = "+ word);
return synonyms[index];
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymMap.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymMap.java
index 9d236f3..2035197 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymMap.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/relevanceVocabs/SynonymMap.java
@@ -240,7 +240,7 @@ public class SynonymMap {
ArrayList<String> words = group2Words.get(group.get(i));
for (int j=words.size(); --j >= 0; ) { // add all words
String synonym = words.get(j); // note that w and word are interned
- if (synonym != word) { // a word implicitly is its own synonym
+ if (!synonym.equals(word)) { // a word implicitly is its own synonym
synonyms.add(synonym);
}
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/BingAPIProductSearchManager.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/BingAPIProductSearchManager.java
index 08f0ac1..f32e53a 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/BingAPIProductSearchManager.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/BingAPIProductSearchManager.java
@@ -6,20 +6,18 @@ import java.util.List;
import opennlp.tools.similarity.apps.BingQueryRunner;
import opennlp.tools.similarity.apps.HitBase;
-import org.apache.commons.lang.StringUtils;
-
public class BingAPIProductSearchManager {
- BingQueryRunner search = new BingQueryRunner();
+ final BingQueryRunner search = new BingQueryRunner();
public List<HitBase> findProductByName(String name, int count){
List<HitBase> foundFBPages = search.runSearch("site:amazon.com"+" "+name + " reviews"
, 10);
- List<HitBase> results = new ArrayList<HitBase>();
+ List<HitBase> results = new ArrayList<>();
int ct=0;
for(HitBase h: foundFBPages){
if (ct>=count) break; ct++;
String title = h.getTitle().toLowerCase();
- if (h.getUrl().indexOf("amazon.com")<0)
+ if (!h.getUrl().contains("amazon.com"))
continue;
String[] merchantWords = name.toLowerCase().split(" ");
int overlapCount=0;
@@ -38,7 +36,7 @@ public class BingAPIProductSearchManager {
public List<HitBase> findProductByNameNoReview(String name, int count){
List<HitBase> foundFBPages = search.runSearch(name, count);
- List<HitBase> results = new ArrayList<HitBase>();
+ List<HitBase> results = new ArrayList<>();
int ct=0;
for(HitBase h: foundFBPages){
if (ct>=count) break; ct++;
@@ -46,7 +44,7 @@ public class BingAPIProductSearchManager {
String[] merchantWords = name.toLowerCase().split(" ");
int overlapCount=0;
for(String commonWord:merchantWords){
- if (title.indexOf(commonWord+" ")>-1 || title.indexOf(" "+commonWord)>-1){
+ if (title.contains(commonWord + " ") || title.contains(" " + commonWord)){
overlapCount++;
System.out.println(" found word "+ commonWord + " in title = "+title);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/FBOpenGraphSearchManager.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/FBOpenGraphSearchManager.java
index c81cad8..4a9b14e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/FBOpenGraphSearchManager.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/FBOpenGraphSearchManager.java
@@ -34,9 +34,9 @@ import opennlp.tools.similarity.apps.utils.PageFetcher;
public class FBOpenGraphSearchManager {
- public List<String[]> profiles = null;
+ public final List<String[]> profiles;
protected FacebookClient mFBClient;
- protected PageFetcher pageFetcher = new PageFetcher();
+ protected final PageFetcher pageFetcher = new PageFetcher();
protected static final int NUM_TRIES = 5;
protected static final long WAIT_BTW_TRIES=1000; //milliseconds between re-tries
@@ -53,7 +53,7 @@ public class FBOpenGraphSearchManager {
public List<Event> getFBEventsByName(String event)
{
- List<Event> events = new ArrayList<Event>();
+ List<Event> events = new ArrayList<>();
for(int i=0; i < NUM_TRIES; i++)
{
@@ -84,7 +84,7 @@ public class FBOpenGraphSearchManager {
public Long getFBPageLikes(String merchant)
{
- List<Page> groups = new ArrayList<Page>();
+ List<Page> groups = new ArrayList<>();
for(int i=0; i < NUM_TRIES; i++)
{
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MachineTranslationWrapper.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MachineTranslationWrapper.java
index 1da0423..a1ef482 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MachineTranslationWrapper.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MachineTranslationWrapper.java
@@ -20,17 +20,17 @@ package opennlp.tools.apps.review_builder;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
public class MachineTranslationWrapper {
- private String translatorURL = "http://mymemory.translated.net/api/get?q=";
+ private final String translatorURL = "http://mymemory.translated.net/api/get?q=";
public String translate(String sentence, String lang2lang){
if (sentence==null)
@@ -54,25 +54,19 @@ public class MachineTranslationWrapper {
JSONObject findObject = rootObject.getJSONObject("responseData");
String transl = findObject.getString("translatedText");
try {
- transl = URLDecoder.decode(transl, "UTF-8");
+ transl = URLDecoder.decode(transl, StandardCharsets.UTF_8);
} catch (Exception e) {
}
return transl;
- } catch (MalformedURLException e) {
-
+ } catch (IOException | JSONException e) {
+
e.printStackTrace();
return null;
- } catch (JSONException e) {
- e.printStackTrace();
- return null;
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
-
+ }
+
}
public String rePhrase(String sentence){
@@ -80,7 +74,7 @@ public class MachineTranslationWrapper {
String transl = translate(sentence, "en|es");
System.out.println("tranls = "+transl);
String inverseTransl = translate(transl, "es|en");
- if (!(inverseTransl.indexOf("NO QUERY SPECIFIED")>-1) && !(inverseTransl.indexOf("INVALID LANGUAGE")>-1) && !(inverseTransl.indexOf("MYMEMORY WARNING")>-1))
+ if (!(inverseTransl.contains("NO QUERY SPECIFIED")) && !(inverseTransl.contains("INVALID LANGUAGE")) && !(inverseTransl.contains("MYMEMORY WARNING")))
return inverseTransl;
else
return sentence;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MinedSentenceProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MinedSentenceProcessor.java
index cad691a..dcb3ef4 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MinedSentenceProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/MinedSentenceProcessor.java
@@ -67,54 +67,54 @@ public class MinedSentenceProcessor {
// suspicious
return null;
- if (sentTry.indexOf("click here") > -1 || sentTry.indexOf(" wikip") > -1
- || sentTry.indexOf("copyright") > -1
- || sentTry.indexOf("operating hours") > -1
- || sentTry.indexOf("days per week") > -1
- || sentTry.indexOf("click for") > -1 || sentTry.indexOf("photos") > -1
- || sentTry.indexOf("find the latest") > -1
+ if (sentTry.contains("click here") || sentTry.contains(" wikip")
+ || sentTry.contains("copyright")
+ || sentTry.contains("operating hours")
+ || sentTry.contains("days per week")
+ || sentTry.contains("click for") || sentTry.contains("photos")
+ || sentTry.contains("find the latest")
|| sentTry.startsWith("subscribe")
- || sentTry.indexOf("Terms of Service") > -1
- || sentTry.indexOf("clicking here") > -1
- || sentTry.indexOf("skip to") > -1 || sentTry.indexOf("sidebar") > -1
- || sentTry.indexOf("Tags:") > -1 || sentTry.startsWith("Posted by")
- || sentTry.indexOf("available online") > -1
- || sentTry.indexOf("get online") > -1
- || sentTry.indexOf("buy online") > -1
- || sentTry.indexOf("not valid") > -1 || sentTry.indexOf("discount") > -1
- || sentTry.indexOf("official site") > -1
- || sentTry.indexOf("this video") > -1
- || sentTry.indexOf("this book") > -1
- || sentTry.indexOf("this product") > -1
- || sentTry.indexOf("paperback") > -1 || sentTry.indexOf("hardcover") > -1
- || sentTry.indexOf("audio cd") > -1
- || sentTry.indexOf("related searches") > -1
- || sentTry.indexOf("permission is granted") > -1
- || sentTry.indexOf("[edit") > -1
- || sentTry.indexOf("edit categories") > -1
- || sentTry.indexOf("free license") > -1
- || sentTry.indexOf("permission is granted") > -1
- || sentTry.indexOf("under the terms") > -1
- || sentTry.indexOf("rights reserved") > -1
- || sentTry.indexOf("wikipedia") > -1 || sentTry.endsWith("the")
+ || sentTry.contains("Terms of Service")
+ || sentTry.contains("clicking here")
+ || sentTry.contains("skip to") || sentTry.contains("sidebar")
+ || sentTry.contains("Tags:") || sentTry.startsWith("Posted by")
+ || sentTry.contains("available online")
+ || sentTry.contains("get online")
+ || sentTry.contains("buy online")
+ || sentTry.contains("not valid") || sentTry.contains("discount")
+ || sentTry.contains("official site")
+ || sentTry.contains("this video")
+ || sentTry.contains("this book")
+ || sentTry.contains("this product")
+ || sentTry.contains("paperback") || sentTry.contains("hardcover")
+ || sentTry.contains("audio cd")
+ || sentTry.contains("related searches")
+ || sentTry.contains("permission is granted")
+ || sentTry.contains("[edit")
+ || sentTry.contains("edit categories")
+ || sentTry.contains("free license")
+ || sentTry.contains("permission is granted")
+ || sentTry.contains("under the terms")
+ || sentTry.contains("rights reserved")
+ || sentTry.contains("wikipedia") || sentTry.endsWith("the")
|| sentTry.endsWith("the.") || sentTry.startsWith("below")
- || sentTry.indexOf("recipient of")>-1 || sentTry.indexOf("this message")>-1
- ||sentTry.indexOf( "mailing list")>-1 ||sentTry.indexOf( "purchase order")>-1
- ||sentTry.indexOf( "mon-fri")>-1 ||sentTry.indexOf( "email us")>-1 ||sentTry.indexOf( "privacy pol")>-1 ||sentTry.indexOf( "back to top")>-1
- ||sentTry.indexOf( "click here")>-1 ||sentTry.indexOf( "for details")>-1 ||sentTry.indexOf( "assistance?")>-1 ||sentTry.indexOf( "chat live")>-1
- ||sentTry.indexOf( "free shipping")>-1 ||sentTry.indexOf( "company info")>-1 ||sentTry.indexOf( "satisfaction g")>-1 ||sentTry.indexOf( "contact us")>-1
- ||sentTry.startsWith( "fax") ||sentTry.startsWith( "write") || sentTry.startsWith( "email")||sentTry.indexOf( "conditions")>-1 ||sentTry.indexOf( "chat live")>-1
- ||sentTry.startsWith( "we ") ||sentTry.indexOf( "the recipient")>-1 ||sentTry.indexOf( "day return")>-1 ||sentTry.indexOf( "days return")>-1
+ || sentTry.contains("recipient of") || sentTry.contains("this message")
+ || sentTry.contains("mailing list") || sentTry.contains("purchase order")
+ || sentTry.contains("mon-fri") || sentTry.contains("email us") || sentTry.contains("privacy pol") || sentTry.contains("back to top")
+ || sentTry.contains("click here") || sentTry.contains("for details") || sentTry.contains("assistance?") || sentTry.contains("chat live")
+ || sentTry.contains("free shipping") || sentTry.contains("company info") || sentTry.contains("satisfaction g") || sentTry.contains("contact us")
+ ||sentTry.startsWith( "fax") ||sentTry.startsWith( "write") || sentTry.startsWith( "email")|| sentTry.contains("conditions") || sentTry.contains("chat live")
+ ||sentTry.startsWith( "we ") || sentTry.contains("the recipient") || sentTry.contains("day return") || sentTry.contains("days return")
- ||sentTry.startsWith( "fax") ||sentTry.indexOf( "refund it")>-1 || sentTry.indexOf( "your money")>-1
- ||sentTry.startsWith( "free") ||sentTry.indexOf( "purchase orders")>-1
- ||sentTry.startsWith( "exchange it ") ||sentTry.indexOf( "return it")>-1 ||sentTry.indexOf( "credit card")>-1
+ ||sentTry.startsWith( "fax") || sentTry.contains("refund it") || sentTry.contains("your money")
+ ||sentTry.startsWith( "free") || sentTry.contains("purchase orders")
+ ||sentTry.startsWith( "exchange it ") || sentTry.contains("return it") || sentTry.contains("credit card")
- ||sentTry.indexOf( "storeshop")>-1 || sentTry.startsWith( "find") || sentTry.startsWith( "shop") || sentTry.startsWith( "unlimited")
- ||sentTry.indexOf( "for a limited time")>-1 ||sentTry.indexOf( "prime members")>-1 ||sentTry.indexOf( "amazon members")>-1 ||sentTry.indexOf( "unlimited free")>-1
- ||sentTry.indexOf( "shipping")>-1 || sentTry.startsWith( "amazon")
+ || sentTry.contains("storeshop") || sentTry.startsWith( "find") || sentTry.startsWith( "shop") || sentTry.startsWith( "unlimited")
+ || sentTry.contains("for a limited time") || sentTry.contains("prime members") || sentTry.contains("amazon members") || sentTry.contains("unlimited free")
+ || sentTry.contains("shipping") || sentTry.startsWith( "amazon")
// not a script text
- ||sentTry.indexOf( "document.body")>-1 ||sentTry.indexOf( " var ")>-1 ||sentTry.indexOf( "search suggestions")>-1 ||sentTry.startsWith( "Search")
+ || sentTry.contains("document.body") || sentTry.contains(" var ") || sentTry.contains("search suggestions") ||sentTry.startsWith( "Search")
)
return null;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceBeingOriginalized.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceBeingOriginalized.java
index 739f54d..b2bcad4 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceBeingOriginalized.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceBeingOriginalized.java
@@ -17,14 +17,13 @@
package opennlp.tools.apps.review_builder;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import opennlp.tools.textsimilarity.ParseTreeChunk;
public class SentenceBeingOriginalized {
- private Map<String, String> sentKey_value = new HashMap<String, String>();
+ private Map<String, String> sentKey_value;
private String sentence;
private List<List<ParseTreeChunk>> groupedChunks;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceOriginalizer.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceOriginalizer.java
index 07e82e8..bba4639 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceOriginalizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/SentenceOriginalizer.java
@@ -37,9 +37,9 @@ public class SentenceOriginalizer {
private final MachineTranslationWrapper rePhraser = new MachineTranslationWrapper();
private final SentimentVocab sVocab = SentimentVocab.getInstance();
- PhraseProcessor pProc = new PhraseProcessor();
+ final PhraseProcessor pProc = new PhraseProcessor();
SynonymListFilter filter = null;
- private List<String> verbsShouldStayNoSubstition = Arrays.asList(new String[]{
+ private final List<String> verbsShouldStayNoSubstition = Arrays.asList(new String[]{
"might", "can", "power", "bonk", "screw", "victimization", "victimize", "victimised", "victimized", "victimise",
"hump", "sluttish", "wanton"
});
@@ -53,7 +53,7 @@ public class SentenceOriginalizer {
public SentenceOriginalizer(String dir){
filter = new SynonymListFilter(dir);
- };
+ }
public String[] getSents() {
return sents;
@@ -107,7 +107,7 @@ public class SentenceOriginalizer {
for(int i = 0; i< sents.length; i++){
Random rand = new Random();
double flag = rand.nextDouble();
- String prodNameCurr = null;
+ String prodNameCurr;
if (flag>0.4)
prodNameCurr = prodName;
else
@@ -230,7 +230,7 @@ public class SentenceOriginalizer {
}
private void extractNounPhrasesWithSentiments(List<ParseTreeChunk> list) {
- List<String> phrasesWithSentiments = new ArrayList<String>();
+ List<String> phrasesWithSentiments = new ArrayList<>();
for(ParseTreeChunk ch: list){
List<String> lemmas = ch.getLemmas();
for(String l:lemmas){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/URLsWithReviewFinderByProductName.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/URLsWithReviewFinderByProductName.java
index 31d3cd4..97fc634 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/URLsWithReviewFinderByProductName.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/URLsWithReviewFinderByProductName.java
@@ -24,11 +24,11 @@ import opennlp.tools.similarity.apps.BingQueryRunner;
import opennlp.tools.similarity.apps.HitBase;
public class URLsWithReviewFinderByProductName {
- BingQueryRunner search = new BingQueryRunner();
+ final BingQueryRunner search = new BingQueryRunner();
public List<String> findFacebookURLByNameAndZip(String name){
List<HitBase> foundFBPages = search.runSearch(name, 20);
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
for(HitBase h: foundFBPages){
results.add(h.getUrl());
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/WebPageReviewExtractor.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/WebPageReviewExtractor.java
index cf5a681..38edb8e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/WebPageReviewExtractor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/review_builder/WebPageReviewExtractor.java
@@ -79,7 +79,7 @@ public class WebPageReviewExtractor extends WebPageExtractor {
public ReviewObj extractSentencesWithPotentialReviewPhrases(String url) {
ReviewObj reviewObj = new ReviewObj();
int maxSentsFromPage= 20;
- List<String[]> results = new ArrayList<String[]>();
+ List<String[]> results = new ArrayList<>();
String downloadedPage = pageFetcher.fetchPage(url, 20000);
if (downloadedPage == null || downloadedPage.length() < 100)
@@ -89,7 +89,7 @@ public class WebPageReviewExtractor extends WebPageExtractor {
String pageOrigHTML = pageFetcher.fetchOrigHTML(url);
- List<String> productFeaturesList = new ArrayList<String> ();
+ List<String> productFeaturesList = new ArrayList<>();
String[] productFeatures = StringUtils.substringsBetween(pageOrigHTML, "<li>", "</li>" );
if (productFeatures!=null){
for(String item: productFeatures ){
@@ -129,7 +129,7 @@ public class WebPageReviewExtractor extends WebPageExtractor {
downloadedPage= downloadedPage.replace(" ", "&");
downloadedPage = downloadedPage.replaceAll("(?:&)+", "#");
String[] sents = downloadedPage.split("#");
- List<TextChunk> sentsList = new ArrayList<TextChunk>();
+ List<TextChunk> sentsList = new ArrayList<>();
for(String s: sents){
s = s.trim().replace(" ", ". ").replace("..", ".").replace(". . .", " ")
.replace(": ", ". ").replace("- ", ". ").
@@ -229,7 +229,7 @@ public class WebPageReviewExtractor extends WebPageExtractor {
try {
int commaIndex = StringUtils.indexOf(sent, ',');
int lastCommaIndex = StringUtils.lastIndexOf(sent, ',');
- int splitIndex = -1;
+ int splitIndex;
if (Math.abs(commaIndex- len/2) > Math.abs(lastCommaIndex- len/2))
splitIndex = commaIndex;
else
@@ -317,7 +317,7 @@ public class WebPageReviewExtractor extends WebPageExtractor {
String[] features = reviewObj.getFeaturePhrases();
List<String> sentences =reviewObj.getOriginalizedSentences();
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
int count = 0;
for(String sent:sentences){
if (sent!=null)
@@ -383,7 +383,7 @@ public class WebPageReviewExtractor extends WebPageExtractor {
currentRevIndex=0;
}
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
for(StringBuffer b:bufs){
String sent = b.toString().replace("!.","!").replace("?.","?");
results.add(sent);
@@ -398,7 +398,7 @@ public class WebPageReviewExtractor extends WebPageExtractor {
//ProductFinderInAWebPage init = new ProductFinderInAWebPage("C:/workspace/relevanceEngine/src/test/resources");
WebPageReviewExtractor extractor = new WebPageReviewExtractor(resourceDir);
- String res1[] = extractor.verifyEnforceStartsUpperCase(new String[]{ "hhhh !", "Klyn mng hghj ."});
+ String[] res1 = extractor.verifyEnforceStartsUpperCase(new String[]{ "hhhh !", "Klyn mng hghj ."});
List<String> res = extractor.formReviewsForAProduct(//"McCulloch 16-Inch 3.5 HP Electric Chain Saw");
// "WORX Electric JawSaw with Extension Handle");
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/apps/utils/email/EmailSender.java b/opennlp-similarity/src/main/java/opennlp/tools/apps/utils/email/EmailSender.java
index 36cc82b..b682086 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/apps/utils/email/EmailSender.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/apps/utils/email/EmailSender.java
@@ -49,7 +49,7 @@ public class EmailSender {
InternetAddress from, InternetAddress[] to, InternetAddress[] cc, InternetAddress[] bcc,
String subject, String body, String file) throws Exception {
- boolean correct=true;
+ boolean correct;
try {
// Eliminate spaces from addresses
if(from!=null){
@@ -117,7 +117,7 @@ public class EmailSender {
private boolean validateAddress(InternetAddress from,
InternetAddress[] to, InternetAddress[] cc, InternetAddress[] bcc) {
- boolean correct = true;
+ boolean correct;
try {
correct = from!=null && !from.getAddress().equals("") && to!=null && to.length>=1;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/ClassifierTrainingSetIndexer.java b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/ClassifierTrainingSetIndexer.java
index d6de493..e8219fd 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/ClassifierTrainingSetIndexer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/ClassifierTrainingSetIndexer.java
@@ -21,6 +21,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
@@ -31,18 +32,18 @@ import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.util.Version;
import org.apache.tika.Tika;
public class ClassifierTrainingSetIndexer {
- public static String resourceDir = new File(".").getAbsolutePath().replace("/.", "") + "/src/main/resources";
- public static String INDEX_PATH = "/classif", CLASSIF_TRAINING_CORPUS_PATH = "/training_corpus";
- protected ArrayList<File> queue = new ArrayList<>();
- Tika tika = new Tika();
+ public static final String resourceDir = new File(".").getAbsolutePath().replace("/.", "") + "/src/main/resources";
+ public static final String INDEX_PATH = "/classif";
+ public static final String CLASSIF_TRAINING_CORPUS_PATH = "/training_corpus";
+ protected final ArrayList<File> queue = new ArrayList<>();
+ final Tika tika = new Tika();
IndexWriter indexWriter = null;
- protected static String[] domains = new String[] { "legal", "health", "computing", "engineering", "business" };
+ protected static final String[] domains = new String[] { "legal", "health", "computing", "engineering", "business" };
private String absolutePathTrainingSet=null;
public ClassifierTrainingSetIndexer() {
@@ -66,17 +67,8 @@ public class ClassifierTrainingSetIndexer {
public void indexTrainingSet() {
try {
- if (absolutePathTrainingSet==null)
- indexFileOrDirectory(resourceDir
- + CLASSIF_TRAINING_CORPUS_PATH);
- else
- indexFileOrDirectory(
- this.absolutePathTrainingSet);
-
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- try {
+ indexFileOrDirectory(Objects.requireNonNullElseGet(absolutePathTrainingSet,
+ () -> resourceDir + CLASSIF_TRAINING_CORPUS_PATH));
indexWriter.commit();
} catch (IOException e) {
e.printStackTrace();
@@ -119,7 +111,7 @@ public class ClassifierTrainingSetIndexer {
public void indexFileOrDirectory(String fileName) throws IOException {
addFiles(new File(fileName));
- List<File> files = new ArrayList<File>(queue);
+ List<File> files = new ArrayList<>(queue);
for (File f : files) {
if (!f.getName().endsWith(".xml")) {
@@ -129,7 +121,7 @@ public class ClassifierTrainingSetIndexer {
String name = f.getPath();
String className = null;
for (String d : domains) {
- if (name.indexOf(d) > -1) {
+ if (name.contains(d)) {
className = d;
break;
}
@@ -227,7 +219,7 @@ public class ClassifierTrainingSetIndexer {
public static String getCategoryFromFilePath(String path){
String className = null;
for (String d : domains) {
- if (path.indexOf("/"+d+"/") > -1) {
+ if (path.contains("/" + d + "/")) {
className = d;
break;
}
@@ -236,7 +228,7 @@ public class ClassifierTrainingSetIndexer {
}
public static void main(String[] args) {
- ClassifierTrainingSetIndexer indexer = null;
+ ClassifierTrainingSetIndexer indexer;
if (args!=null && args.length==1){
String relativeDirWithTrainingCorpus = args[0];
// expect corpus relative to 'resource' directory, such as 'training_corpus'
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifier.java b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifier.java
index e5702ce..05abe3e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifier.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifier.java
@@ -48,12 +48,12 @@ import org.json.JSONObject;
public class DocClassifier {
public static final String DOC_CLASSIFIER_KEY = "doc_class";
- public static String resourceDir = null;
+ public static final String resourceDir = null;
public static final Log logger = LogFactory.getLog(DocClassifier.class);
- private Map<String, Float> scoredClasses = new HashMap<>();
+ private Map<String, Float> scoredClasses;
- public static Float MIN_TOTAL_SCORE_FOR_CATEGORY = 0.3f; //3.0f;
+ public static final Float MIN_TOTAL_SCORE_FOR_CATEGORY = 0.3f; //3.0f;
protected static IndexReader indexReader = null;
protected static IndexSearcher indexSearcher = null;
// resource directory plus the index folder
@@ -112,7 +112,7 @@ public class DocClassifier {
}
public DocClassifier(String inputFilename, JSONObject inputJSON) {
- scoredClasses = new HashMap<String, Float>();
+ scoredClasses = new HashMap<>();
}
/* returns the class name for a sentence */
@@ -127,7 +127,7 @@ public class DocClassifier {
Analyzer std = new StandardAnalyzer();
QueryParser parser = new QueryParser("text", std);
parser.setDefaultOperator(QueryParser.Operator.OR);
- Query query = null;
+ Query query;
try {
query = parser.parse(queryStr);
@@ -148,7 +148,7 @@ public class DocClassifier {
for (ScoreDoc scoreDoc : hits.scoreDocs) {
- Document doc = null;
+ Document doc;
try {
doc = indexSearcher.doc(scoreDoc.doc);
} catch (IOException e) {
@@ -174,8 +174,8 @@ public class DocClassifier {
}
try {
scoredClasses = ValueSortMap.sortMapByValue(scoredClasses, false);
- List<String> resultsAll = new ArrayList<String>(
- scoredClasses.keySet()), resultsAboveThresh = new ArrayList<String>();
+ List<String> resultsAll = new ArrayList<>(
+ scoredClasses.keySet()), resultsAboveThresh = new ArrayList<>();
for (String key : resultsAll) {
if (scoredClasses.get(key) > MIN_TOTAL_SCORE_FOR_CATEGORY)
resultsAboveThresh.add(key);
@@ -222,7 +222,7 @@ public class DocClassifier {
Scanner in = new Scanner(pageContentReader);
in.useDelimiter("\\s+");
- Map<String, Integer> words = new HashMap<String, Integer>();
+ Map<String, Integer> words = new HashMap<>();
while (in.hasNext()) {
String word = in.next();
@@ -237,7 +237,7 @@ public class DocClassifier {
}
in.close();
words = ValueSortMap.sortMapByValue(words, false);
- List<String> resultsAll = new ArrayList<String>(words.keySet()), results = null;
+ List<String> resultsAll = new ArrayList<>(words.keySet()), results;
int len = resultsAll.size();
if (len > maxRes)
@@ -288,7 +288,7 @@ public class DocClassifier {
logger.error("Problem classifying sentence\n " + e);
}
- List<String> aggrResults = new ArrayList<String>();
+ List<String> aggrResults = new ArrayList<>();
try {
aggrResults = localCats.getFrequentTags();
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetMultilingualExtender.java b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetMultilingualExtender.java
index 3b4deb5..00dc002 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetMultilingualExtender.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetMultilingualExtender.java
@@ -42,10 +42,10 @@ public class DocClassifierTrainingSetMultilingualExtender {
public static String projectHome = new File(".").getAbsolutePath().replace("contentinspection/.", "");
public static String resourceDir = new File(".").getAbsolutePath().replace("/.", "") + "/src/main/resources";
- DocClassifier classifier = null;
+ final DocClassifier classifier;
private String sourceDir = null, destinationDir = null;
//interwiki-fr"><a href="http://fr.wikipedia.org/wiki/Niveau_d%27%C3%A9nergie" title="Niveau d'énergie – French" lang="fr"
- private static String[][] multilingualTokens = new String[][]{
+ private static final String[][] multilingualTokens = new String[][]{
{"interwiki-fr\"><a href=\"", "lang=\"fr\""},
{"interwiki-es\"><a href=\"", "lang=\"es\""},
{"interwiki-de\"><a href=\"", "lang=\"de\""},
@@ -53,14 +53,14 @@ public class DocClassifierTrainingSetMultilingualExtender {
private static final String[] LANGS = new String[]{ "fr", "es", "de"};
- protected ArrayList<File> queue = new ArrayList<>();
+ protected final ArrayList<File> queue = new ArrayList<>();
public DocClassifierTrainingSetMultilingualExtender(String resource) {
classifier = new DocClassifier("", new JSONObject());
}
- private int FRAGMENT_LENGTH = 500;
+ private final int FRAGMENT_LENGTH = 500;
protected void addFiles(File file) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetVerifier.java b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetVerifier.java
index 98debe6..8b29bc9 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetVerifier.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/doc_classifier/DocClassifierTrainingSetVerifier.java
@@ -35,20 +35,20 @@ import org.json.JSONObject;
public class DocClassifierTrainingSetVerifier {
public static String projectHome = new File(".").getAbsolutePath();
public static String resourceDir = new File(".").getAbsolutePath().replace("/.", "") + "/src/main/resources";
- DocClassifier classifier = null;
+ DocClassifier classifier;
private String sourceDir = null, destinationDir = null;
- protected ArrayList<File> queue = new ArrayList<File>();
+ protected final ArrayList<File> queue = new ArrayList<>();
- protected Tika tika = new Tika();
+ protected final Tika tika = new Tika();
public DocClassifierTrainingSetVerifier(String resource) {
classifier = new DocClassifier("", new JSONObject());
}
- private int FRAGMENT_LENGTH = 500;
+ private static final int FRAGMENT_LENGTH = 500;
protected void addFiles(File file) {
@@ -73,7 +73,7 @@ public class DocClassifierTrainingSetVerifier {
}
public void processDirectory(String fileName) throws IOException {
- List<String[]> report = new ArrayList<String[]>();
+ List<String[]> report = new ArrayList<>();
report.add(new String[] { "filename", "category",
"confirmed?" ,
});
@@ -84,7 +84,7 @@ public class DocClassifierTrainingSetVerifier {
for (File f : queue) {
- String content = null;
+ String content;
try {
System.out.println("processing "+f.getName());
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailNormalizer.java b/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailNormalizer.java
index c059189..928efd5 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailNormalizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailNormalizer.java
@@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils;
public class EmailNormalizer {
- protected ArrayList<File> queue = new ArrayList<>();
+ protected final ArrayList<File> queue = new ArrayList<>();
protected void addFilesPos(File file) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailTrainingSetFormer.java b/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailTrainingSetFormer.java
index 062a306..734414e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailTrainingSetFormer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/enron_email_recognizer/EmailTrainingSetFormer.java
@@ -25,10 +25,10 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
public class EmailTrainingSetFormer {
- static String dataDir = "/Users/bgalitsky/Downloads/",
- //enron_with_categories/",
- fileListFile = "cats4_11-17.txt",
- destinationDir = "/Users/bgalitsky/Documents/ENRON/data11_17/";
+ static final String dataDir = "/Users/bgalitsky/Downloads/";
+ static final String//enron_with_categories/",
+ fileListFile = "cats4_11-17.txt";
+ static final String destinationDir = "/Users/bgalitsky/Documents/ENRON/data11_17/";
//enron_with_categories/5/70665.cats:4,10,1
public static void createPosTrainingSet(){
@@ -47,7 +47,8 @@ public class EmailTrainingSetFormer {
}
}
- private String origFolder = "maildir_ENRON_EMAILS", newFolder = "data11_17";
+ private final String origFolder = "maildir_ENRON_EMAILS";
+ private final String newFolder = "data11_17";
public static String normalize(File f){
String content="";
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/fca/BasicLevelMetrics.java b/opennlp-similarity/src/main/java/opennlp/tools/fca/BasicLevelMetrics.java
index 2540388..cfb3f2c 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/fca/BasicLevelMetrics.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/fca/BasicLevelMetrics.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.ListUtils;
public class BasicLevelMetrics {
- ConceptLattice cl;
+ final ConceptLattice cl;
ArrayList<ArrayList<Integer>> attributesExtent;
ArrayList<ArrayList<Integer>> objectsIntent = null;
ArrayList<Integer> attributes = null;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/fca/ConceptLattice.java b/opennlp-similarity/src/main/java/opennlp/tools/fca/ConceptLattice.java
index ccb307d..2de4345 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/fca/ConceptLattice.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/fca/ConceptLattice.java
@@ -17,7 +17,6 @@
package opennlp.tools.fca;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -41,7 +40,7 @@ public class ConceptLattice {
this.objectCount = objCount;
this.attributeCount = attrCount;
this.binaryContext = binaryContext;
- this.conceptList = new ArrayList<FormalConcept>();
+ this.conceptList = new ArrayList<>();
FormalConcept bottom = new FormalConcept();
bottom.setPosition(0);
conceptList.add(bottom);
@@ -61,7 +60,7 @@ public class ConceptLattice {
}
}
- public ConceptLattice(String filename, boolean stats) throws FileNotFoundException, IOException {
+ public ConceptLattice(String filename, boolean stats) throws IOException {
FcaReader fr = new FcaReader();
fr.ReadContextFromCxt(filename);
@@ -239,7 +238,7 @@ public class ConceptLattice {
}
}
- public static void main(String []args) throws FileNotFoundException, IOException {
+ public static void main(String []args) throws IOException {
ConceptLattice cl = new ConceptLattice("sports.cxt", true);
cl.printLattice();
}
@@ -277,8 +276,8 @@ public class ConceptLattice {
}
public void printBinContext() {
- for (int i = 0; i < binaryContext.length; i++ ){
- System.out.println(Arrays.toString(binaryContext[i]));
+ for (int[] ints : binaryContext) {
+ System.out.println(Arrays.toString(ints));
}
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaConverter.java b/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaConverter.java
index d8cc3af..663c318 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaConverter.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaConverter.java
@@ -29,8 +29,8 @@ public class FcaConverter {
public int [][] latticeToContext(ConceptLattice cl){
int newAttrCount = cl.conceptList.size();
- int [][] binaryContext = null;
- ArrayList<FormalConcept> cList = new ArrayList<FormalConcept>(cl.conceptList);
+ int [][] binaryContext;
+ ArrayList<FormalConcept> cList = new ArrayList<>(cl.conceptList);
boolean run = true;
int k=0;
while (run && k<cl.conceptList.size()){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaReader.java b/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaReader.java
index 173790d..2d1caeb 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaReader.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaReader.java
@@ -17,11 +17,9 @@
package opennlp.tools.fca;
import java.io.BufferedReader;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
public class FcaReader {
@@ -31,10 +29,10 @@ public class FcaReader {
int objectsNumber = 0;
int attributesNumber = 0;
- public void ReadContextFromCxt(String filename) throws FileNotFoundException, IOException{
+ public void ReadContextFromCxt(String filename) throws IOException{
- obNames = new ArrayList<String>();
- atNames = new ArrayList<String>();
+ obNames = new ArrayList<>();
+ atNames = new ArrayList<>();
BufferedReader br = new BufferedReader(new FileReader(filename));
try {
@@ -84,7 +82,7 @@ public class FcaReader {
}
- public static void main(String []args) throws FileNotFoundException, IOException{
+ public static void main(String []args) throws IOException{
FcaReader loader = new FcaReader();
loader.ReadContextFromCxt("C://Users/Tanya/Desktop/�����/1 �������/������������� ��������� � ������� ������/�������/sports.cxt");
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaWriter.java b/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaWriter.java
index 998efe5..f43dbb8 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaWriter.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/fca/FcaWriter.java
@@ -31,7 +31,7 @@ public class FcaWriter {
new FileOutputStream(filename), StandardCharsets.UTF_8))) {
writer.write("B\n");
writer.write("\n");
- writer.write(String.valueOf(cl.objectCount) + "\n");
+ writer.write(cl.objectCount + "\n");
writer.write(cl.attributeCount + "\n");
writer.write("\n");
@@ -49,8 +49,6 @@ public class FcaWriter {
writer.write("\n");
}
- writer.close();
-
} catch (IOException ex) {
System.err.println(ex.getMessage());
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/fca/FormalConcept.java b/opennlp-similarity/src/main/java/opennlp/tools/fca/FormalConcept.java
index 1b827ad..1fd0b13 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/fca/FormalConcept.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/fca/FormalConcept.java
@@ -25,9 +25,9 @@ import java.util.Set;
public class FormalConcept {
int position;
ArrayList<Integer>intent;
- Set<Integer> children;
- Set<Integer> parents;
- Set<Integer> extent;
+ final Set<Integer> children;
+ final Set<Integer> parents;
+ final Set<Integer> extent;
double intLogStabilityBottom = 0,
intLogStabilityUp = 0,
separation = 0,
@@ -53,10 +53,10 @@ public class FormalConcept {
public FormalConcept() {
position = -1;
- intent = new ArrayList<Integer>();
- extent = new LinkedHashSet<Integer>();
- parents = new HashSet<Integer>();
- children = new HashSet<Integer>();
+ intent = new ArrayList<>();
+ extent = new LinkedHashSet<>();
+ parents = new HashSet<>();
+ children = new HashSet<>();
}
public void setPosition(int newPosition ){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/fca/Measures.java b/opennlp-similarity/src/main/java/opennlp/tools/fca/Measures.java
index 779fa4f..7700e41 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/fca/Measures.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/fca/Measures.java
@@ -23,15 +23,15 @@ import org.apache.commons.math3.special.Gamma;
public class Measures {
- ConceptLattice cl;
+ final ConceptLattice cl;
public Measures(ConceptLattice cl) {
this.cl = cl;
}
public void logStabilityInt(){
- int min_delta = -1, delta = -1;
- float sum = 0;
+ int min_delta, delta;
+ float sum;
for (int i = 0; i < cl.conceptList.size(); ++i) {
min_delta = cl.attributeCount;
sum = 0;
@@ -49,8 +49,8 @@ public class Measures {
}
public void logStabilityExt(){
- int min_delta = -1, delta = -1;
- float sum = 0;
+ int min_delta, delta;
+ float sum;
for (int i = 0; i < cl.conceptList.size(); ++i) {
min_delta = cl.attributeCount;
sum = 0;
@@ -69,8 +69,8 @@ public class Measures {
public void separation(){
ArrayList<Integer> intent;
Set<Integer> extentMembers;
- int extentVolume = 0, intentVolume = 0;
- double sz = 0;
+ int extentVolume, intentVolume;
+ double sz;
for (int i = 0; i < cl.conceptList.size(); ++i) {
intent = cl.conceptList.get(i).getIntent();
extentMembers = cl.conceptList.get(i).extent;
@@ -81,10 +81,10 @@ public class Measures {
extentVolume += cl.binaryContext[ext][attr];
}
}
- for (int attr = 0; attr<intent.size();attr++ ){
- for (int obj = 0; obj < cl.objectCount; obj++){
- intentVolume += cl.binaryContext[obj][intent.get(attr)];
- }
+ for (Integer integer : intent) {
+ for (int obj = 0; obj < cl.objectCount; obj++) {
+ intentVolume += cl.binaryContext[obj][integer];
+ }
}
sz = intent.size()*extentMembers.size();
if (extentVolume+extentVolume-sz!=0)
@@ -104,9 +104,9 @@ public class Measures {
public double intentProbability(ArrayList<Integer> intent){
double pB = 1;
- for (int i=0;i<intent.size();i++){
- pB*=attributeProbability(intent.get(i));
- }
+ for (Integer integer : intent) {
+ pB *= attributeProbability(integer);
+ }
return pB;
}
@@ -116,24 +116,24 @@ public class Measures {
ArrayList<Integer> intent = cl.conceptList.get(i).getIntent();
// out of concept intent
double pB = intentProbability(intent);
- ArrayList<Integer> outOfIntent = new ArrayList<Integer>();
- ArrayList<Double> outOfIntentAttrProb = new ArrayList<Double>();
+ ArrayList<Integer> outOfIntent = new ArrayList<>();
+ ArrayList<Double> outOfIntentAttrProb = new ArrayList<>();
for (int j=0;j<cl.attributeCount; j++){
outOfIntent.add(j);
}
for (int j=intent.size()-1;j>=0;j--){
outOfIntent.remove(intent.get(j));
}
- for (int j=0;j<outOfIntent.size();j++){
- outOfIntentAttrProb.add(attributeProbability(outOfIntent.get(j)));
+ for (Integer integer : outOfIntent) {
+ outOfIntentAttrProb.add(attributeProbability(integer));
}
- double prob = 0, mult = 1, mult1=1;
+ double prob = 0, mult, mult1;
int n = cl.objectCount;
for (int k=0; k<= n; k++){
mult = 1;
mult1 = 1;
- for (int j=0;j<outOfIntentAttrProb.size();j++){
- mult*=(1-Math.pow(outOfIntentAttrProb.get(j),k));
+ for (Double aDouble : outOfIntentAttrProb) {
+ mult *= (1 - Math.pow(aDouble, k));
}
mult1 = Math.pow(pB,k)*Math.pow(1-pB,n-k);
prob+=mult1*mult* Gamma.digamma(n+1)/Gamma.digamma(k+1)/Gamma.digamma(n-k+1);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/FeatureSpaceCoverageProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/FeatureSpaceCoverageProcessor.java
index 24b7cee..87bc3c8 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/FeatureSpaceCoverageProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/FeatureSpaceCoverageProcessor.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.StringUtils;
public class FeatureSpaceCoverageProcessor {
- public Map<String, Integer> paramMap = new HashMap<>();
+ public final Map<String, Integer> paramMap = new HashMap<>();
public String[] header;
String[] attributes;
@@ -80,7 +80,7 @@ public class FeatureSpaceCoverageProcessor {
if (paramMap.isEmpty())
throw new Exception("paramMap.isEmpty()");
- float score = 0f, catScore = 10000f, currCatScore=10000000f;
+ float score, catScore = 10000f, currCatScore=10000000f;
int p1 = paramMap.get("First Level Category");
int p2 = paramMap.get("Second Level Category");
@@ -145,11 +145,11 @@ public class FeatureSpaceCoverageProcessor {
public Map<String, String> computeIntersection(String[] line1,
String[] line2) {
- Map<String, String> attr_value = new HashMap<String, String>();
+ Map<String, String> attr_value = new HashMap<>();
for(String attr: attributes){
int attrIndex = getIdForAttributeName(attr);
- String v1 = line1[attrIndex].toLowerCase().replace("\"", "").replace(", ", ", ").replace(", ", ",");;
- String v2 = line2[attrIndex].toLowerCase().replace("\"", "").replace(", ", ", ").replace(", ", ",");;
+ String v1 = line1[attrIndex].toLowerCase().replace("\"", "").replace(", ", ", ").replace(", ", ",");
+ String v2 = line2[attrIndex].toLowerCase().replace("\"", "").replace(", ", ", ").replace(", ", ",");
String valArr1Str = StringUtils.substringBetween(v1, "{", "}");
String valArr2Str = StringUtils.substringBetween(v2, "{", "}");
if (valArr1Str==null || valArr2Str==null) { // we assume single value, not an array of values
@@ -162,8 +162,8 @@ public class FeatureSpaceCoverageProcessor {
valArr2Str = valArr2Str.replaceAll(", ", ",");
String[] valArr1 = valArr1Str.split(",");
String[] valArr2 = valArr2Str.split(",");
- List<String> valList1 = new ArrayList<String>(Arrays.asList(valArr1));
- List<String> valList2 = new ArrayList<String>(Arrays.asList(valArr2));
+ List<String> valList1 = new ArrayList<>(Arrays.asList(valArr1));
+ List<String> valList2 = new ArrayList<>(Arrays.asList(valArr2));
valList1.retainAll(valList2);
/* verification of coverage
valList1.retainAll(valList2);
@@ -207,8 +207,8 @@ public class FeatureSpaceCoverageProcessor {
else {
String[] valArrCase = valArrCaseStr.split(",");
String[] valArrRule = valArrRuleStr.split(",");
- List<String> valListCase = new ArrayList<String>(Arrays.asList(valArrCase));
- List<String> valListRule = new ArrayList<String>(Arrays.asList(valArrRule));
+ List<String> valListCase = new ArrayList<>(Arrays.asList(valArrCase));
+ List<String> valListRule = new ArrayList<>(Arrays.asList(valArrRule));
int ruleSize = valListRule.size();
//System.out.println(valListRule);
@@ -256,8 +256,8 @@ public class FeatureSpaceCoverageProcessor {
else {
String[] valArrRuleBeingCovered = valArrRuleBeingCoveredStr.split(",");
String[] valArrRule = valArrRuleStr.split(",");
- List<String> valListRuleBeingCovered = new ArrayList<String>(Arrays.asList(valArrRuleBeingCovered));
- List<String> valListRule = new ArrayList<String>(Arrays.asList(valArrRule));
+ List<String> valListRuleBeingCovered = new ArrayList<>(Arrays.asList(valArrRuleBeingCovered));
+ List<String> valListRule = new ArrayList<>(Arrays.asList(valArrRule));
for(String r: valListRule){
if (!strListContainsMember(valListRuleBeingCovered, r)){
soFarCovers = false;
@@ -272,7 +272,7 @@ public class FeatureSpaceCoverageProcessor {
public Map<String, String> computeIntersection(
Map<String, String> rule1, Map<String, String> rule2) {
- Map<String, String> attr_value = new HashMap<String, String>();
+ Map<String, String> attr_value = new HashMap<>();
for(String attr: attributes){
int attrIndex = getIdForAttributeName(attr);
String v1 = rule1.get(attr);
@@ -291,8 +291,8 @@ public class FeatureSpaceCoverageProcessor {
valArr2Str = valArr2Str.replaceAll(", ", ",");
String[] valArr1 = valArr1Str.split(",");
String[] valArr2 = valArr2Str.split(",");
- List<String> valList1 = new ArrayList<String>(Arrays.asList(valArr1));
- List<String> valList2 = new ArrayList<String>(Arrays.asList(valArr2));
+ List<String> valList1 = new ArrayList<>(Arrays.asList(valArr1));
+ List<String> valList2 = new ArrayList<>(Arrays.asList(valArr2));
valList1.retainAll(valList2);
if (!valList1.isEmpty()){
v1 = "{"+valList1.toString().replace("["," ").replace("]", " ").trim()+"}";
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/IntersectionSetBuilder.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/IntersectionSetBuilder.java
index b4c6d99..67e7c6e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/IntersectionSetBuilder.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/IntersectionSetBuilder.java
@@ -53,7 +53,7 @@ public class IntersectionSetBuilder{
private FeatureSpaceCoverageProcessor distProcessorPos, distProcessorNeg;
private final float percentageOfAllowedSetCover = 0.001f;
//The set of attribute in analysis is hard coded
- String[] fieldsToAggr = new String[]{
+ final String[] fieldsToAggr = new String[]{
"reason_code", "risk_rating", "service_type", "device_match_result", "device_result", "http_referer", "device_id_reason_code",
"review_status", "tcp_os_sig_ttl", "tcp_connection_type",
"mime_type_number", "plugin_number", "http_connection_type", "device_last_event", "http_connection_type"
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMDecision.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMDecision.java
index f451b39..643672d 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMDecision.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMDecision.java
@@ -1,6 +1,5 @@
package opennlp.tools.jsmlearning;
-import java.util.ArrayList;
import java.util.List;
import opennlp.tools.textsimilarity.ParseTreeChunk;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeBase.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeBase.java
index b4c0587..8dade6b 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeBase.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeBase.java
@@ -31,9 +31,9 @@ import opennlp.tools.textsimilarity.ParseTreeMatcherDeterministic;
import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcessor;
public class JSMLearnerOnLatticeBase {
- ParserChunker2MatcherProcessor chunk_maker = ParserChunker2MatcherProcessor.getInstance();
+ final ParserChunker2MatcherProcessor chunk_maker = ParserChunker2MatcherProcessor.getInstance();
LinguisticPatternStructure psPos = new LinguisticPatternStructure(0,0), psNeg = new LinguisticPatternStructure(0,0);
- ParseTreeMatcherDeterministic md = new ParseTreeMatcherDeterministic();
+ final ParseTreeMatcherDeterministic md = new ParseTreeMatcherDeterministic();
@@ -47,25 +47,25 @@ public class JSMLearnerOnLatticeBase {
posTexts = pair.getFirst(); negTexts = pair.getSecond();
}
- List<List<List<ParseTreeChunk>>> lingRepsPos = new ArrayList<List<List<ParseTreeChunk>>>(),
- lingRepsNeg = new ArrayList<List<List<ParseTreeChunk>>>();
+ List<List<List<ParseTreeChunk>>> lingRepsPos = new ArrayList<>(),
+ lingRepsNeg = new ArrayList<>();
for(String text: posTexts)
lingRepsPos.add(chunk_maker.formGroupedPhrasesFromChunksForPara(text));
for(String text: negTexts)
lingRepsNeg.add(chunk_maker.formGroupedPhrasesFromChunksForPara(text));
- LinkedHashSet<Integer> obj = null;
+ LinkedHashSet<Integer> obj;
int i=0;
for(List<List<ParseTreeChunk>> chunk: lingRepsPos){
- obj = new LinkedHashSet<Integer>();
+ obj = new LinkedHashSet<>();
obj.add(i);
psPos.AddIntent(chunk, obj, 0);
i++;
}
i=0;
for(List<List<ParseTreeChunk>> chunk: lingRepsNeg){
- obj = new LinkedHashSet<Integer>();
+ obj = new LinkedHashSet<>();
obj.add(i);
psNeg.AddIntent(chunk, obj, 0);
i++;
@@ -74,9 +74,9 @@ public class JSMLearnerOnLatticeBase {
List<List<ParseTreeChunk>> chunksUnknown = chunk_maker.formGroupedPhrasesFromChunksForPara(unknown);
- List<List<List<ParseTreeChunk>>> posIntersections = new ArrayList<List<List<ParseTreeChunk>>>(),
- negIntersections = new ArrayList<List<List<ParseTreeChunk>>>();
- List<List<ParseTreeChunk>> intersection = null;
+ List<List<List<ParseTreeChunk>>> posIntersections = new ArrayList<>(),
+ negIntersections = new ArrayList<>();
+ List<List<ParseTreeChunk>> intersection;
for(int iConcept = 0; iConcept<psPos.conceptList.size(); iConcept++){
if (psPos.conceptList.get(iConcept).intent!=null && psPos.conceptList.get(iConcept).intent.size()>0){
intersection = computeIntersectionWithIntentExtendedByDeduction(psPos, iConcept, chunksUnknown);
@@ -98,23 +98,23 @@ public class JSMLearnerOnLatticeBase {
posIntersections = pair.getFirst();
negIntersections = pair.getSecond();
- List<List<List<ParseTreeChunk>>> posIntersectionsUnderNeg = new ArrayList<List<List<ParseTreeChunk>>>(),
- negIntersectionsUnderPos = new ArrayList<List<List<ParseTreeChunk>>>();
+ List<List<List<ParseTreeChunk>>> posIntersectionsUnderNeg = new ArrayList<>(),
+ negIntersectionsUnderPos = new ArrayList<>();
for(int iConcept = 0; iConcept<psNeg.conceptList.size(); iConcept++){
- for(int iConceptJ = 0; iConceptJ<negIntersections.size(); iConceptJ++){
+ for (List<List<ParseTreeChunk>> negIntersection : negIntersections) {
intersection = md
- .matchTwoSentencesGroupedChunksDeterministic(psNeg.conceptList.get(iConcept).intent, negIntersections.get(iConceptJ));
- if (reduceList(intersection).size()>0)
+ .matchTwoSentencesGroupedChunksDeterministic(psNeg.conceptList.get(iConcept).intent, negIntersection);
+ if (reduceList(intersection).size() > 0)
posIntersectionsUnderNeg.add(reduceList(intersection));
}
}
for(int iConcept = 0; iConcept<psPos.conceptList.size(); iConcept++){
- for(int iConceptJ = 0; iConceptJ<posIntersections.size(); iConceptJ++){
+ for (List<List<ParseTreeChunk>> posIntersection : posIntersections) {
intersection = md
- .matchTwoSentencesGroupedChunksDeterministic(psPos.conceptList.get(iConcept).intent, posIntersections.get(iConceptJ));
- if (reduceList(intersection).size()>0)
+ .matchTwoSentencesGroupedChunksDeterministic(psPos.conceptList.get(iConcept).intent, posIntersection);
+ if (reduceList(intersection).size() > 0)
negIntersectionsUnderPos.add(reduceList(intersection));
}
}
@@ -152,17 +152,17 @@ public class JSMLearnerOnLatticeBase {
public Pair<List<String>, List<String>> reGroupByOccurrenceOfSeparationKeyword(List<String> posTexts, List<String> negTexts, String[] keywords){
// do nothing in base class
- return new Pair<List<String>, List<String>>(posTexts, negTexts);
+ return new Pair<>(posTexts, negTexts);
}
public List<List<ParseTreeChunk>> reduceList(List<List<ParseTreeChunk>> list){
float minScore = 1.3f;
- List<List<ParseTreeChunk>> newList = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> newList = new ArrayList<>();
ParseTreeChunkListScorer scorer = new ParseTreeChunkListScorer();
for( List<ParseTreeChunk> group: list){
- List<ParseTreeChunk> newGroup = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> newGroup = new ArrayList<>();
for(ParseTreeChunk ch: group){
if (scorer.getScore(ch) > minScore)
newGroup.add(ch);
@@ -176,27 +176,27 @@ public class JSMLearnerOnLatticeBase {
}
public List<List<ParseTreeChunk>> flattenParseTreeChunkListList(List<List<List<ParseTreeChunk>>> listOfLists){
- List<List<ParseTreeChunk>> newList = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> newList = new ArrayList<>();
for( List<List<ParseTreeChunk>> member: listOfLists){
- Set<ParseTreeChunk> newSet= new HashSet<ParseTreeChunk>();
+ Set<ParseTreeChunk> newSet= new HashSet<>();
for( List<ParseTreeChunk> group: member){
if (group.size()>0)
newSet.addAll(group);
}
- newList.add(new ArrayList<ParseTreeChunk>(newSet));
+ newList.add(new ArrayList<>(newSet));
}
return newList;
}
public List<ParseTreeChunk> flattenParseTreeChunkLst(List<List<List<ParseTreeChunk>>> listOfLists){
- List<ParseTreeChunk> newList = new ArrayList<ParseTreeChunk>();
- Set<ParseTreeChunk> newSetAll = new HashSet<ParseTreeChunk>();
+ List<ParseTreeChunk> newList = new ArrayList<>();
+ Set<ParseTreeChunk> newSetAll = new HashSet<>();
for( List<List<ParseTreeChunk>> member: listOfLists){
- Set<ParseTreeChunk> newSet= new HashSet<ParseTreeChunk>();
+ Set<ParseTreeChunk> newSet= new HashSet<>();
for( List<ParseTreeChunk> group: member){
if (group.size()>0)
newSet.addAll(group);
@@ -204,18 +204,18 @@ public class JSMLearnerOnLatticeBase {
newSetAll.addAll(newSet);
}
- return removeDuplicates(new ArrayList<ParseTreeChunk>(newSetAll));
+ return removeDuplicates(new ArrayList<>(newSetAll));
}
public List<ParseTreeChunk> removeDuplicates(List<ParseTreeChunk> dupes){
- List<Integer> toDelete = new ArrayList<Integer>();
+ List<Integer> toDelete = new ArrayList<>();
for(int i=0; i<dupes.size(); i++)
for(int j=i+1; j<dupes.size(); j++){
if (dupes.get(i).equals(dupes.get(j))){
toDelete.add(j);
}
}
- List<ParseTreeChunk> cleaned = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> cleaned = new ArrayList<>();
for(int i=0; i<dupes.size(); i++){
if (!toDelete.contains(i))
cleaned.add(dupes.get(i));
@@ -224,14 +224,14 @@ public class JSMLearnerOnLatticeBase {
}
public List<ParseTreeChunk> subtract(List<ParseTreeChunk> main, List<ParseTreeChunk> toSubtract){
- List<Integer> toDelete = new ArrayList<Integer>();
+ List<Integer> toDelete = new ArrayList<>();
for(int i=0; i<main.size(); i++)
- for(int j=0; j<toSubtract.size(); j++){
- if (main.get(i).equals(toSubtract.get(j))){
+ for (ParseTreeChunk parseTreeChunk : toSubtract) {
+ if (main.get(i).equals(parseTreeChunk)) {
toDelete.add(i);
}
}
- List<ParseTreeChunk> cleaned = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> cleaned = new ArrayList<>();
for(int i=0; i<main.size(); i++){
if (!toDelete.contains(i))
cleaned.add(main.get(i));
@@ -239,14 +239,14 @@ public class JSMLearnerOnLatticeBase {
return cleaned;
}
public List<ParseTreeChunk> intesectParseTreeChunkLists(List<ParseTreeChunk> a, List<ParseTreeChunk> b){
- List<Integer> inters = new ArrayList<Integer>();
+ List<Integer> inters = new ArrayList<>();
for(int i=0; i<a.size(); i++)
- for(int j=0; j<b.size(); j++){
- if (a.get(i).equals(b.get(j))){
+ for (ParseTreeChunk parseTreeChunk : b) {
+ if (a.get(i).equals(parseTreeChunk)) {
inters.add(i);
}
}
- List<ParseTreeChunk> cleaned = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> cleaned = new ArrayList<>();
for(int i=0; i<a.size(); i++){
if (inters.contains(i))
cleaned.add(a.get(i));
@@ -263,8 +263,8 @@ public class JSMLearnerOnLatticeBase {
List<ParseTreeChunk> intersParseTreeChunkLists = intesectParseTreeChunkLists(posIntersectionsFl, negIntersectionsFl);
- List<List<List<ParseTreeChunk>>> cleanedFromInconsPos = new ArrayList<List<List<ParseTreeChunk>>>(),
- cleanedFromInconsNeg = new ArrayList<List<List<ParseTreeChunk>>>();
+ List<List<List<ParseTreeChunk>>> cleanedFromInconsPos = new ArrayList<>(),
+ cleanedFromInconsNeg = new ArrayList<>();
/*
System.out.println("pos = "+ pos);
System.out.println("neg = "+ neg);
@@ -274,9 +274,9 @@ public class JSMLearnerOnLatticeBase {
*/
for( List<List<ParseTreeChunk>> member: pos){
- List<List<ParseTreeChunk>> memberList = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> memberList = new ArrayList<>();
for( List<ParseTreeChunk> group: member){
- List<ParseTreeChunk> newGroup = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> newGroup = new ArrayList<>();
for(ParseTreeChunk ch: group){
boolean bSkip = false;
for(ParseTreeChunk check: intersParseTreeChunkLists){
@@ -294,9 +294,9 @@ public class JSMLearnerOnLatticeBase {
}
for( List<List<ParseTreeChunk>> member: neg){
- List<List<ParseTreeChunk>> memberList = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> memberList = new ArrayList<>();
for( List<ParseTreeChunk> group: member){
- List<ParseTreeChunk> newGroup = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> newGroup = new ArrayList<>();
for(ParseTreeChunk ch: group){
boolean bSkip = false;
for(ParseTreeChunk check: intersParseTreeChunkLists){
@@ -312,7 +312,7 @@ public class JSMLearnerOnLatticeBase {
if (memberList.size()>0)
cleanedFromInconsNeg.add(memberList);
}
- return new Pair<List<List<List<ParseTreeChunk>>>, List<List<List<ParseTreeChunk>>>>(cleanedFromInconsPos, cleanedFromInconsNeg);
+ return new Pair<>(cleanedFromInconsPos, cleanedFromInconsNeg);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithAbduction.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithAbduction.java
index 4c1c917..76ae8ed 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithAbduction.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithAbduction.java
@@ -17,26 +17,8 @@
package opennlp.tools.jsmlearning;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.collections.ListUtils;
-
-import opennlp.tools.fca.ConceptLattice;
-import opennlp.tools.fca.FcaWriter;
-import opennlp.tools.fca.FormalConcept;
-import opennlp.tools.parse_thicket.pattern_structure.LinguisticPatternStructure;
-import opennlp.tools.similarity.apps.BingWebQueryRunner;
-import opennlp.tools.similarity.apps.HitBase;
-import opennlp.tools.similarity.apps.utils.Pair;
-import opennlp.tools.textsimilarity.ParseTreeChunk;
-import opennlp.tools.textsimilarity.ParseTreeChunkListScorer;
-import opennlp.tools.textsimilarity.ParseTreeMatcherDeterministic;
-import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcessor;
public class JSMLearnerOnLatticeWithAbduction extends JSMLearnerOnLatticeWithDeduction{
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithDeduction.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithDeduction.java
index 748a15a..82efd06 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithDeduction.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/JSMLearnerOnLatticeWithDeduction.java
@@ -19,20 +19,17 @@ package opennlp.tools.jsmlearning;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Set;
import org.apache.commons.collections.ListUtils;
-import org.apache.commons.lang.StringUtils;
import opennlp.tools.parse_thicket.pattern_structure.LinguisticPatternStructure;
import opennlp.tools.similarity.apps.utils.Pair;
import opennlp.tools.textsimilarity.ParseTreeChunk;
public class JSMLearnerOnLatticeWithDeduction extends JSMLearnerOnLatticeBase{
- List<JSMDecision> accumulatedJSMResults = new ArrayList<JSMDecision>();
+ final List<JSMDecision> accumulatedJSMResults = new ArrayList<>();
@@ -44,34 +41,34 @@ public class JSMLearnerOnLatticeWithDeduction extends JSMLearnerOnLatticeBase{
posTexts = pair.getFirst(); negTexts = pair.getSecond();
}
- List<List<List<ParseTreeChunk>>> lingRepsPos = new ArrayList<List<List<ParseTreeChunk>>>(),
- lingRepsNeg = new ArrayList<List<List<ParseTreeChunk>>>();
+ List<List<List<ParseTreeChunk>>> lingRepsPos = new ArrayList<>(),
+ lingRepsNeg = new ArrayList<>();
for(String text: posTexts)
lingRepsPos.add(chunk_maker.formGroupedPhrasesFromChunksForPara(text));
for(String text: negTexts)
lingRepsNeg.add(chunk_maker.formGroupedPhrasesFromChunksForPara(text));
- LinkedHashSet<Integer> obj = null;
+ LinkedHashSet<Integer> obj;
int i=0;
for(List<List<ParseTreeChunk>> chunk: lingRepsPos){
- obj = new LinkedHashSet<Integer>();
+ obj = new LinkedHashSet<>();
obj.add(i);
psPos.AddIntent(chunk, obj, 0);
i++;
}
i=0;
for(List<List<ParseTreeChunk>> chunk: lingRepsNeg){
- obj = new LinkedHashSet<Integer>();
+ obj = new LinkedHashSet<>();
obj.add(i);
psNeg.AddIntent(chunk, obj, 0);
i++;
}
List<List<ParseTreeChunk>> chunksUnknown = chunk_maker.formGroupedPhrasesFromChunksForPara(unknown);
- List<List<List<ParseTreeChunk>>> posIntersections = new ArrayList<List<List<ParseTreeChunk>>>(),
- negIntersections = new ArrayList<List<List<ParseTreeChunk>>>();
- List<List<ParseTreeChunk>> intersection = null;
+ List<List<List<ParseTreeChunk>>> posIntersections = new ArrayList<>(),
+ negIntersections = new ArrayList<>();
+ List<List<ParseTreeChunk>> intersection;
for(int iConcept = 0; iConcept<psPos.conceptList.size(); iConcept++){
if (psPos.conceptList.get(iConcept).intent!=null && psPos.conceptList.get(iConcept).intent.size()>0){
intersection = computeIntersectionWithIntentExtendedByDeduction(psPos, iConcept, chunksUnknown);
@@ -94,23 +91,23 @@ public class JSMLearnerOnLatticeWithDeduction extends JSMLearnerOnLatticeBase{
posIntersections = pair.getFirst();
negIntersections = pair.getSecond();
- List<List<List<ParseTreeChunk>>> posIntersectionsUnderNeg = new ArrayList<List<List<ParseTreeChunk>>>(),
- negIntersectionsUnderPos = new ArrayList<List<List<ParseTreeChunk>>>();
+ List<List<List<ParseTreeChunk>>> posIntersectionsUnderNeg = new ArrayList<>(),
+ negIntersectionsUnderPos = new ArrayList<>();
for(int iConcept = 0; iConcept<psNeg.conceptList.size(); iConcept++){
- for(int iConceptJ = 0; iConceptJ<negIntersections.size(); iConceptJ++){
+ for (List<List<ParseTreeChunk>> negIntersection : negIntersections) {
intersection = md
- .matchTwoSentencesGroupedChunksDeterministic(psNeg.conceptList.get(iConcept).intent, negIntersections.get(iConceptJ));
- if (reduceList(intersection).size()>0)
+ .matchTwoSentencesGroupedChunksDeterministic(psNeg.conceptList.get(iConcept).intent, negIntersection);
+ if (reduceList(intersection).size() > 0)
posIntersectionsUnderNeg.add(reduceList(intersection));
}
}
for(int iConcept = 0; iConcept<psPos.conceptList.size(); iConcept++){
- for(int iConceptJ = 0; iConceptJ<posIntersections.size(); iConceptJ++){
+ for (List<List<ParseTreeChunk>> posIntersection : posIntersections) {
intersection = md
- .matchTwoSentencesGroupedChunksDeterministic(psPos.conceptList.get(iConcept).intent, posIntersections.get(iConceptJ));
- if (reduceList(intersection).size()>0)
+ .matchTwoSentencesGroupedChunksDeterministic(psPos.conceptList.get(iConcept).intent, posIntersection);
+ if (reduceList(intersection).size() > 0)
negIntersectionsUnderPos.add(reduceList(intersection));
}
}
@@ -142,11 +139,11 @@ public class JSMLearnerOnLatticeWithDeduction extends JSMLearnerOnLatticeBase{
List<List<ParseTreeChunk>> chunksUnknown) {
List<List<ParseTreeChunk>> intent = psPos.conceptList.get(iConcept).intent,
- intentExtendedByDeduction = new ArrayList<List<ParseTreeChunk>>();
+ intentExtendedByDeduction = new ArrayList<>();
for( List<ParseTreeChunk> group: intent){
- List<ParseTreeChunk> newGroup = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> newGroup = new ArrayList<>();
for(ParseTreeChunk ch: group){
newGroup.add(ch);
List<String> lemmas = ch.getLemmas();
@@ -178,11 +175,11 @@ public class JSMLearnerOnLatticeWithDeduction extends JSMLearnerOnLatticeBase{
}
public Pair<List<String>, List<String>> reGroupByOccurrenceOfSeparationKeyword(List<String> posTexts, List<String> negTexts, String[] keywords){
- List<String> posTextsNew = new ArrayList<String>(), negTextsNew = new ArrayList<String>();
+ List<String> posTextsNew = new ArrayList<>(), negTextsNew = new ArrayList<>();
for(String posText:posTexts){
Boolean multiwordOccurs = true;
for(String keyword: keywords){
- if (posText.indexOf(keyword)<0)
+ if (!posText.contains(keyword))
multiwordOccurs = false;
break;
}
@@ -194,7 +191,7 @@ public class JSMLearnerOnLatticeWithDeduction extends JSMLearnerOnLatticeBase{
for(String negText:negTexts){
Boolean multiwordOccurs = true;
for(String keyword: keywords){
- if (negText.indexOf(keyword)<0)
+ if (!negText.contains(keyword))
multiwordOccurs = false;
break;
}
@@ -205,7 +202,7 @@ public class JSMLearnerOnLatticeWithDeduction extends JSMLearnerOnLatticeBase{
}
- return new Pair<List<String>, List<String>>(posTextsNew , negTextsNew);
+ return new Pair<>(posTextsNew, negTextsNew);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/ProfileReaderWriter.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/ProfileReaderWriter.java
index 298ade9..ddf99af 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/ProfileReaderWriter.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/ProfileReaderWriter.java
@@ -29,36 +29,31 @@ import au.com.bytecode.opencsv.CSVWriter;
public class ProfileReaderWriter {
public static List<String[]> readProfiles(String filename) {
- CSVReader reader = null;
+ CSVReader reader;
List<String[]> profiles = null;
try {
reader = new CSVReader(new FileReader(filename), ',');
profiles = reader.readAll();
- } catch (FileNotFoundException e) {
+ } catch (IOException e) {
e.printStackTrace();
- } catch (IOException ioe) {
- ioe.printStackTrace();
}
return profiles;
}
public static List<String[]> readProfiles(String filename, char delimiter) {
- CSVReader reader = null;
+ CSVReader reader;
List<String[]> profiles = null;
try {
reader = new CSVReader(new FileReader(filename), delimiter);
profiles = reader.readAll();
- } catch (FileNotFoundException e) {
+ } catch (IOException e) {
e.printStackTrace();
- } catch (IOException ioe) {
- ioe.printStackTrace();
}
return profiles;
}
public static void writeReportArr( String[][] allLines, String reportName){
- List<String[]> rep = new ArrayList<String[]>();
- rep.addAll(Arrays.asList(allLines));
+ List<String[]> rep = new ArrayList<>(Arrays.asList(allLines));
writeReport( rep, reportName);
}
@@ -153,7 +148,7 @@ public class ProfileReaderWriter {
}
public static void main(String[] args){
- List<String[]> allLines = new ArrayList<String[]>();
+ List<String[]> allLines = new ArrayList<>();
allLines.add(new String[] {"aa " , " bb", "ccc" });
ProfileReaderWriter.writeReport( allLines, "reportName.txt", ' ');
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/TreeKernelRunner.java b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/TreeKernelRunner.java
index 58ca03b..70ec586 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/TreeKernelRunner.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/jsmlearning/TreeKernelRunner.java
@@ -66,7 +66,7 @@ public class TreeKernelRunner {
static class StreamLogger extends Thread{
- private InputStream mInputStream;
+ private final InputStream mInputStream;
public StreamLogger(InputStream is) {
this.mInputStream = is;
@@ -76,7 +76,7 @@ public class TreeKernelRunner {
try {
InputStreamReader isr = new InputStreamReader(mInputStream);
BufferedReader br = new BufferedReader(isr);
- String line = null;
+ String line;
while ((line = br.readLine()) != null) {
System.out.println(line);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2Obj.java b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2Obj.java
index ef0aba9..424f060 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2Obj.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2Obj.java
@@ -43,7 +43,7 @@ public class NL2Obj {
parser = ParserChunker2MatcherProcessor.getInstance();
}
- public static String[] epistemicStatesList = new String[] {
+ public static final String[] epistemicStatesList = new String[] {
"select", "verify", "find", "start", "stop", "go", "check"
};
@@ -55,12 +55,12 @@ public class NL2Obj {
};
protected ParserChunker2MatcherProcessor parser;
- private TextSimilarityBagOfWords parserBOW = new TextSimilarityBagOfWords();
- private ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
+ private final TextSimilarityBagOfWords parserBOW = new TextSimilarityBagOfWords();
+ private final ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
public ObjectPhraseListForSentence convertSentenceToControlObjectPhrase(String sentence){
- List<ObjectPhrase> oPhrases = new ArrayList<ObjectPhrase>();
+ List<ObjectPhrase> oPhrases = new ArrayList<>();
parser = ParserChunker2MatcherProcessor.getInstance();
List<List<ParseTreeChunk>> lingPhrases =
parser.formGroupedPhrasesFromChunksForSentence(sentence);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2ObjCreateAssign.java b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2ObjCreateAssign.java
index df2dd51..421a124 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2ObjCreateAssign.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/NL2ObjCreateAssign.java
@@ -30,15 +30,15 @@ public class NL2ObjCreateAssign extends NL2Obj {
"create", "assign", "set",
};
- public static String[] dataTypesList = new String[] {
+ public static final String[] dataTypesList = new String[] {
"text", "double", "array",
};
- public static String[] arrayElementList = new String[] {
+ public static final String[] arrayElementList = new String[] {
"first", "second", "third", "fourth"
};
- public static String[] arrayElementListInsdex = new String[] {
+ public static final String[] arrayElementListInsdex = new String[] {
"0", "1", "2", "3"
};
@@ -55,13 +55,13 @@ public class NL2ObjCreateAssign extends NL2Obj {
@Override
public ObjectPhraseListForSentence convertSentenceToControlObjectPhrase(String sentence){
String expression = null;
- if (sentence.indexOf(":")>-1){
+ if (sentence.contains(":")){
expression = sentence.split(":")[1];
sentence = sentence.split(":")[0]+".";
}
- List<ObjectPhrase> oPhrases = new ArrayList<ObjectPhrase>();
+ List<ObjectPhrase> oPhrases = new ArrayList<>();
parser = ParserChunker2MatcherProcessor.getInstance();
List<List<ParseTreeChunk>> lingPhrases =
parser.formGroupedPhrasesFromChunksForSentence(sentence);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhrase.java b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhrase.java
index ceeb239..059603e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhrase.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhrase.java
@@ -46,8 +46,8 @@ public class ObjectPhrase {
}
public ObjectPhrase(){
- paramType = new ArrayList<String>();
- paramValues = new ArrayList<String>();
+ paramType = new ArrayList<>();
+ paramValues = new ArrayList<>();
}
public String getObjectName() {
return objectName;
@@ -108,7 +108,7 @@ public class ObjectPhrase {
List<String> comparativePrpList = Arrays.asList(new String[]{"below", "more", "less", "above"});
if (this.getParamChunk()==null)
return;
- List<String> pOSs = this.getParamChunk().getPOSs(), lemmas = this.getParamChunk().getLemmas(), cleanedArgs = new ArrayList<String>();
+ List<String> pOSs = this.getParamChunk().getPOSs(), lemmas = this.getParamChunk().getLemmas(), cleanedArgs = new ArrayList<>();
for(int i=0; i<pOSs.size(); i++){
String pos = pOSs.get(i);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhraseListForSentence.java b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhraseListForSentence.java
index b06ab2a..f7b3275 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhraseListForSentence.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/nl2code/ObjectPhraseListForSentence.java
@@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.List;
public class ObjectPhraseListForSentence {
- List<ObjectPhrase> oPhrases;
- ObjectControlOp contrOp;
+ final List<ObjectPhrase> oPhrases;
+ final ObjectControlOp contrOp;
public ObjectPhraseListForSentence(List<ObjectPhrase> oPhrases2,
ObjectControlOp op) {
@@ -60,7 +60,7 @@ public class ObjectPhraseListForSentence {
ObjectPhrase o1new = new ObjectPhrase();
o1new.setObjectName(o1.getObjectName());
o1new.setMethod(o1.getMethod());
- List<String> paramValues = new ArrayList<String>();
+ List<String> paramValues = new ArrayList<>();
paramValues.add(newArgs);
o1new.setParamValues(paramValues);
oPhrases.set(i, o1new);
@@ -79,7 +79,7 @@ public class ObjectPhraseListForSentence {
ObjectPhrase o1new = new ObjectPhrase();
o1new.setObjectName(o1.getObjectName());
o1new.setMethod(o1.getMethod());
- List<String> paramValues = new ArrayList<String>();
+ List<String> paramValues = new ArrayList<>();
paramValues.add(newArgs);
o1new.setParamValues(paramValues);
oPhrases.set(i, o1new);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/IGeneralizer.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/IGeneralizer.java
index a95f817..d26799b 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/IGeneralizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/IGeneralizer.java
@@ -8,5 +8,5 @@ public interface IGeneralizer<T> {
*
* In this project Everything is subject to generalization, and returns a list of generic objects
*/
- public List<T> generalize(Object o1, Object o2);
+ List<T> generalize(Object o1, Object o2);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/ParseTreeNode.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/ParseTreeNode.java
index 59cad3b..e5888e4 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/ParseTreeNode.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/ParseTreeNode.java
@@ -81,7 +81,7 @@ public class ParseTreeNode implements IGeneralizer<ParseTreeNode>{
}
public enum PhraseType {NP("NP"), VP("VP"), PRP("PRP");
- private PhraseType(final String text) {
+ PhraseType(final String text) {
this.text = text;
}
private final String text;
@@ -135,7 +135,7 @@ public class ParseTreeNode implements IGeneralizer<ParseTreeNode>{
}
public String toString(){
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (id!=null)
buf.append("<").append(id).append(">");
if(phraseType!=null)
@@ -148,7 +148,7 @@ public class ParseTreeNode implements IGeneralizer<ParseTreeNode>{
}
public static String toTreeRepresentationString(List<ParseTreeNode> chList){
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for(ParseTreeNode ch: chList){
if (ch.getPos().startsWith(".") || ch.getPos().startsWith(",") || ch.getPos().startsWith(";") || ch.getPos().startsWith("!"))
continue;
@@ -166,7 +166,7 @@ public class ParseTreeNode implements IGeneralizer<ParseTreeNode>{
@Override
public List<ParseTreeNode> generalize(Object o1, Object o2) {
- List<ParseTreeNode> result = new ArrayList<ParseTreeNode>();
+ List<ParseTreeNode> result = new ArrayList<>();
ParseTreeNode w1 = (ParseTreeNode) o1;
ParseTreeNode w2 = (ParseTreeNode) o2;
@@ -184,8 +184,6 @@ public class ParseTreeNode implements IGeneralizer<ParseTreeNode>{
return lemma1;
if (lemma1.equals("*"))
return "*";
- if (lemma2.equals("*"))
- return "*";
//TODO
return "*";
@@ -232,5 +230,5 @@ public class ParseTreeNode implements IGeneralizer<ParseTreeNode>{
}
-};
+}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/Triple.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/Triple.java
index 5263133..ab73aa8 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/Triple.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/Triple.java
@@ -1,7 +1,5 @@
package opennlp.tools.parse_thicket;
-import java.util.Comparator;
-
public class Triple<T1, T2, T3> {
private T1 first;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/VerbNetProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/VerbNetProcessor.java
index abd5b90..6b5b7f6 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/VerbNetProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/VerbNetProcessor.java
@@ -2,7 +2,6 @@ package opennlp.tools.parse_thicket;
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -78,14 +77,11 @@ public class VerbNetProcessor implements IGeneralizer<Map<String, List<String>>>
public IVerbClass getVerbNetForAVerb(String verb){
- Iterator<IVerbClass> iter = index.iterator();
- while(iter.hasNext()){
- IVerbClass v = iter.next();
-
+ for (IVerbClass v : index) {
if (v.getID().startsWith(verb))
return v;
- if (!v.getMembers().isEmpty() && v.getMembers().get(0).getName().equals(verb)){
+ if (!v.getMembers().isEmpty() && v.getMembers().get(0).getName().equals(verb)) {
return v;
}
}
@@ -102,16 +98,16 @@ public class VerbNetProcessor implements IGeneralizer<Map<String, List<String>>>
v1 = (IVerbClass)o1;
v2 = (IVerbClass)o2;
- List<Map<String, List<String>>> resList = new ArrayList<Map<String, List<String>>>();
+ List<Map<String, List<String>>> resList = new ArrayList<>();
if (v1 ==null || v2==null) // not found
return resList;
// lists for results
- List<String> roles = new ArrayList<String>();
+ List<String> roles = new ArrayList<>();
List<IThematicRole> roles1 = v1.getThematicRoles(), roles2 = v2.getThematicRoles();
- Map<String, List<String>> results = new HashMap<String, List<String>>();
+ Map<String, List<String>> results = new HashMap<>();
for(int i=0; i< roles1.size()&& i< roles2.size(); i++){
if (roles1.get(i).getType().equals(roles2.get(i).getType())){
@@ -121,28 +117,28 @@ public class VerbNetProcessor implements IGeneralizer<Map<String, List<String>>>
}
List<IFrame> frames1 = v1.getFrames(), frames2 = v2.getFrames();
- List<String> patterns1 = new ArrayList<String>(), patterns2 = new ArrayList<String>();
- for(int i=0; i< frames1.size(); i++){
- patterns1.add(frames1.get(i).getPrimaryType().getID());
+ List<String> patterns1 = new ArrayList<>(), patterns2 = new ArrayList<>();
+ for (IFrame item : frames1) {
+ patterns1.add(item.getPrimaryType().getID());
}
- for(int i=0; i< frames2.size(); i++){
- patterns2.add(frames2.get(i).getPrimaryType().getID());
+ for (IFrame value : frames2) {
+ patterns2.add(value.getPrimaryType().getID());
}
patterns2.retainAll(patterns1);
results.put("phrStr", patterns2) ;
- List<String> patternsWord1 = new ArrayList<String>(), patternsWord2 = new ArrayList<String>();
- for(int i=0; i< frames1.size(); i++){
+ List<String> patternsWord1 = new ArrayList<>(), patternsWord2 = new ArrayList<>();
+ for (IFrame frame : frames1) {
try {
- patternsWord1.add(frames1.get(i).getSecondaryType().getID());
+ patternsWord1.add(frame.getSecondaryType().getID());
} catch (Exception e) {
e.printStackTrace();
}
}
- for(int i=0; i< frames2.size(); i++){
+ for (IFrame iFrame : frames2) {
try {
- if (frames2.get(i).getSecondaryType()!=null && frames2.get(i).getSecondaryType().getID()!=null)
- patternsWord2.add(frames2.get(i).getSecondaryType().getID());
+ if (iFrame.getSecondaryType() != null && iFrame.getSecondaryType().getID() != null)
+ patternsWord2.add(iFrame.getSecondaryType().getID());
} catch (Exception e) {
e.printStackTrace();
}
@@ -167,19 +163,19 @@ public class VerbNetProcessor implements IGeneralizer<Map<String, List<String>>>
sb.append(verb).append(" (");
List<IThematicRole> roles = v.getThematicRoles();
- for(int i=0; i< roles.size(); i++){
- sb.append(roles.get(i).getVerbClass().getID().replace(".", "")).append(" ");
+ for (IThematicRole role : roles) {
+ sb.append(role.getVerbClass().getID().replace(".", "")).append(" ");
}
sb.append( ") (" );
List<IFrame> frames = v.getFrames();
- for(int i=0; i< frames.size(); i++){
+ for (IFrame iFrame : frames) {
//" ("+
- sb.append(frames.get(i).getPrimaryType().getID().replace(".", "-")).append(" ");
+ sb.append(iFrame.getPrimaryType().getID().replace(".", "-")).append(" ");
}
sb.append( ") (" );
- for(int i=0; i< frames.size(); i++){
- sb.append(frames.get(i).getSecondaryType().getID().
+ for (IFrame frame : frames) {
+ sb.append(frame.getSecondaryType().getID().
replace(".", "").replace(",", " ").replace("\"", "-").replace("/", "-").replace("(", "").replace(")", "")).append(" ");
}
sb.append( ") " );
@@ -195,19 +191,17 @@ public class VerbNetProcessor implements IGeneralizer<Map<String, List<String>>>
}
public void testIndex () throws Exception {
- Iterator<IVerbClass> iter = index.iterator();
- while(iter.hasNext()){
- IVerbClass v = iter.next();
- System.out.println(v.getID() + " +> " + v.getFrames().get(0).getVerbClass().getID() + " \n ===> " + v.getMembers().get(0).getName() );
+ for (IVerbClass v : index) {
+ System.out.println(v.getID() + " +> " + v.getFrames().get(0).getVerbClass().getID() + " \n ===> " + v.getMembers().get(0).getName());
List<IThematicRole> roles = v.getThematicRoles();
- for (IThematicRole r: roles){
+ for (IThematicRole r : roles) {
System.out.println(r.getType());
}
List<IFrame> frames = v.getFrames();
- for(IFrame f: frames){
+ for (IFrame f : frames) {
try {
- System.out.println(f.getPrimaryType().getID() + " => " + f.getXTag() + " >> "+ f.getSecondaryType().getID() + " : " + f.getExamples().get(0));
+ System.out.println(f.getPrimaryType().getID() + " => " + f.getXTag() + " >> " + f.getSecondaryType().getID() + " : " + f.getExamples().get(0));
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/BingQueryRunnerMultipageSearchResults.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/BingQueryRunnerMultipageSearchResults.java
index a3b206b..70c8cc8 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/BingQueryRunnerMultipageSearchResults.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/BingQueryRunnerMultipageSearchResults.java
@@ -17,11 +17,6 @@
package opennlp.tools.parse_thicket.apps;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
@@ -33,17 +28,13 @@ import net.billylieurance.azuresearch.AzureSearchWebResult;
import opennlp.tools.similarity.apps.BingQueryRunner;
import opennlp.tools.similarity.apps.HitBase;
-import org.apache.commons.lang.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
public class BingQueryRunnerMultipageSearchResults extends BingQueryRunner {
- private static String BING_KEY = "e8ADxIjn9YyHx36EihdjH/tMqJJItUrrbPTUpKahiU0=";
+ private static final String BING_KEY = "e8ADxIjn9YyHx36EihdjH/tMqJJItUrrbPTUpKahiU0=";
private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.BingQueryRunnerMultipageSearchResults");
- private AzureSearchWebQuery aq = new AzureSearchWebQuery();
+ private final AzureSearchWebQuery aq = new AzureSearchWebQuery();
public List<HitBase> runSearch(String query, int nRes, boolean bHighRank) {
aq.setAppid(BING_KEY);
@@ -53,7 +44,7 @@ public class BingQueryRunnerMultipageSearchResults extends BingQueryRunner {
aq.setPage(5);
aq.setPerPage(nRes);
- List<HitBase> results = new ArrayList<HitBase> ();
+ List<HitBase> results = new ArrayList<>();
AzureSearchResultSet<AzureSearchWebResult> ars = aq.getQueryResult();
for (AzureSearchWebResult anr : ars){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MinedSentenceProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MinedSentenceProcessor.java
index 5c5e0e0..fddef77 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MinedSentenceProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MinedSentenceProcessor.java
@@ -17,9 +17,6 @@
package opennlp.tools.parse_thicket.apps;
-import java.util.Arrays;
-import java.util.List;
-
import opennlp.tools.similarity.apps.utils.Utils;
import org.apache.commons.lang.StringUtils;
@@ -70,54 +67,54 @@ public class MinedSentenceProcessor {
// suspicious
return null;
- if (sentTry.indexOf("click here") > -1 || sentTry.indexOf(" wikip") > -1
- || sentTry.indexOf("copyright") > -1
- || sentTry.indexOf("operating hours") > -1
- || sentTry.indexOf("days per week") > -1
- || sentTry.indexOf("click for") > -1 || sentTry.indexOf("photos") > -1
- || sentTry.indexOf("find the latest") > -1
+ if (sentTry.contains("click here") || sentTry.contains(" wikip")
+ || sentTry.contains("copyright")
+ || sentTry.contains("operating hours")
+ || sentTry.contains("days per week")
+ || sentTry.contains("click for") || sentTry.contains("photos")
+ || sentTry.contains("find the latest")
|| sentTry.startsWith("subscribe")
- || sentTry.indexOf("Terms of Service") > -1
- || sentTry.indexOf("clicking here") > -1
- || sentTry.indexOf("skip to") > -1 || sentTry.indexOf("sidebar") > -1
- || sentTry.indexOf("Tags:") > -1 || sentTry.startsWith("Posted by")
- || sentTry.indexOf("available online") > -1
- || sentTry.indexOf("get online") > -1
- || sentTry.indexOf("buy online") > -1
- || sentTry.indexOf("not valid") > -1 || sentTry.indexOf("discount") > -1
- || sentTry.indexOf("official site") > -1
- || sentTry.indexOf("this video") > -1
- || sentTry.indexOf("this book") > -1
- || sentTry.indexOf("this product") > -1
- || sentTry.indexOf("paperback") > -1 || sentTry.indexOf("hardcover") > -1
- || sentTry.indexOf("audio cd") > -1
- || sentTry.indexOf("related searches") > -1
- || sentTry.indexOf("permission is granted") > -1
- || sentTry.indexOf("[edit") > -1
- || sentTry.indexOf("edit categories") > -1
- || sentTry.indexOf("free license") > -1
- || sentTry.indexOf("permission is granted") > -1
- || sentTry.indexOf("under the terms") > -1
- || sentTry.indexOf("rights reserved") > -1
- || sentTry.indexOf("wikipedia") > -1 || sentTry.endsWith("the")
+ || sentTry.contains("Terms of Service")
+ || sentTry.contains("clicking here")
+ || sentTry.contains("skip to") || sentTry.contains("sidebar")
+ || sentTry.contains("Tags:") || sentTry.startsWith("Posted by")
+ || sentTry.contains("available online")
+ || sentTry.contains("get online")
+ || sentTry.contains("buy online")
+ || sentTry.contains("not valid") || sentTry.contains("discount")
+ || sentTry.contains("official site")
+ || sentTry.contains("this video")
+ || sentTry.contains("this book")
+ || sentTry.contains("this product")
+ || sentTry.contains("paperback") || sentTry.contains("hardcover")
+ || sentTry.contains("audio cd")
+ || sentTry.contains("related searches")
+ || sentTry.contains("permission is granted")
+ || sentTry.contains("[edit")
+ || sentTry.contains("edit categories")
+ || sentTry.contains("free license")
+ || sentTry.contains("permission is granted")
+ || sentTry.contains("under the terms")
+ || sentTry.contains("rights reserved")
+ || sentTry.contains("wikipedia") || sentTry.endsWith("the")
|| sentTry.endsWith("the.") || sentTry.startsWith("below")
- || sentTry.indexOf("recipient of")>-1 || sentTry.indexOf("this message")>-1
- ||sentTry.indexOf( "mailing list")>-1 ||sentTry.indexOf( "purchase order")>-1
- ||sentTry.indexOf( "mon-fri")>-1 ||sentTry.indexOf( "email us")>-1 ||sentTry.indexOf( "privacy pol")>-1 ||sentTry.indexOf( "back to top")>-1
- ||sentTry.indexOf( "click here")>-1 ||sentTry.indexOf( "for details")>-1 ||sentTry.indexOf( "assistance?")>-1 ||sentTry.indexOf( "chat live")>-1
- ||sentTry.indexOf( "free shipping")>-1 ||sentTry.indexOf( "company info")>-1 ||sentTry.indexOf( "satisfaction g")>-1 ||sentTry.indexOf( "contact us")>-1
- ||sentTry.startsWith( "fax") ||sentTry.startsWith( "write") || sentTry.startsWith( "email")||sentTry.indexOf( "conditions")>-1 ||sentTry.indexOf( "chat live")>-1
- ||sentTry.startsWith( "we ") ||sentTry.indexOf( "the recipient")>-1 ||sentTry.indexOf( "day return")>-1 ||sentTry.indexOf( "days return")>-1
+ || sentTry.contains("recipient of") || sentTry.contains("this message")
+ || sentTry.contains("mailing list") || sentTry.contains("purchase order")
+ || sentTry.contains("mon-fri") || sentTry.contains("email us") || sentTry.contains("privacy pol") || sentTry.contains("back to top")
+ || sentTry.contains("click here") || sentTry.contains("for details") || sentTry.contains("assistance?") || sentTry.contains("chat live")
+ || sentTry.contains("free shipping") || sentTry.contains("company info") || sentTry.contains("satisfaction g") || sentTry.contains("contact us")
+ ||sentTry.startsWith( "fax") ||sentTry.startsWith( "write") || sentTry.startsWith( "email")|| sentTry.contains("conditions") || sentTry.contains("chat live")
+ ||sentTry.startsWith( "we ") || sentTry.contains("the recipient") || sentTry.contains("day return") || sentTry.contains("days return")
- ||sentTry.startsWith( "fax") ||sentTry.indexOf( "refund it")>-1 || sentTry.indexOf( "your money")>-1
- ||sentTry.startsWith( "free") ||sentTry.indexOf( "purchase orders")>-1
- ||sentTry.startsWith( "exchange it ") ||sentTry.indexOf( "return it")>-1 ||sentTry.indexOf( "credit card")>-1
+ ||sentTry.startsWith( "fax") || sentTry.contains("refund it") || sentTry.contains("your money")
+ ||sentTry.startsWith( "free") || sentTry.contains("purchase orders")
+ ||sentTry.startsWith( "exchange it ") || sentTry.contains("return it") || sentTry.contains("credit card")
- ||sentTry.indexOf( "storeshop")>-1 || sentTry.startsWith( "find") || sentTry.startsWith( "shop") || sentTry.startsWith( "unlimited")
- ||sentTry.indexOf( "for a limited time")>-1 ||sentTry.indexOf( "prime members")>-1 ||sentTry.indexOf( "amazon members")>-1 ||sentTry.indexOf( "unlimited free")>-1
- ||sentTry.indexOf( "shipping")>-1 || sentTry.startsWith( "amazon")
+ || sentTry.contains("storeshop") || sentTry.startsWith( "find") || sentTry.startsWith( "shop") || sentTry.startsWith( "unlimited")
+ || sentTry.contains("for a limited time") || sentTry.contains("prime members") || sentTry.contains("amazon members") || sentTry.contains("unlimited free")
+ || sentTry.contains("shipping") || sentTry.startsWith( "amazon")
// not a script text
- ||sentTry.indexOf( "document.body")>-1 ||sentTry.indexOf( " var ")>-1 ||sentTry.indexOf( "search suggestions")>-1 ||sentTry.startsWith( "Search")
+ || sentTry.contains("document.body") || sentTry.contains(" var ") || sentTry.contains("search suggestions") ||sentTry.startsWith( "Search")
)
return null;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MultiSentenceSearchResultsProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MultiSentenceSearchResultsProcessor.java
index 9084402..47f5fad 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MultiSentenceSearchResultsProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/MultiSentenceSearchResultsProcessor.java
@@ -17,31 +17,27 @@
package opennlp.tools.parse_thicket.apps;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.logging.Logger;
-
-import opennlp.tools.jsmlearning.ProfileReaderWriter;
import opennlp.tools.similarity.apps.BingQueryRunner;
import opennlp.tools.similarity.apps.HitBase;
import opennlp.tools.similarity.apps.HitBaseComparable;
import opennlp.tools.similarity.apps.WebSearchEngineResultsScraper;
-import opennlp.tools.textsimilarity.ParseTreeChunk;
import opennlp.tools.textsimilarity.ParseTreeChunkListScorer;
import opennlp.tools.textsimilarity.SentencePairMatchResult;
import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcessor;
public class MultiSentenceSearchResultsProcessor {
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.SearchResultsProcessor");
- private WebSearchEngineResultsScraper scraper = new WebSearchEngineResultsScraper();
- private ParserChunker2MatcherProcessor matcher = ParserChunker2MatcherProcessor.getInstance();
- private ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
- private BingQueryRunner bingSearcher = new BingQueryRunner();
- private SnippetToParagraph snp = new SnippetToParagraph();
+ private final WebSearchEngineResultsScraper scraper = new WebSearchEngineResultsScraper();
+ private final ParserChunker2MatcherProcessor matcher = ParserChunker2MatcherProcessor.getInstance();
+ private final ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
+ private final BingQueryRunner bingSearcher = new BingQueryRunner();
+ private final SnippetToParagraph snp = new SnippetToParagraph();
protected static final int NUM_OF_SEARCH_RESULTS = 10;
@@ -55,7 +51,7 @@ public class MultiSentenceSearchResultsProcessor {
protected List<HitBase> calculateMatchScoreResortHits(List<HitBase> hits,
String searchQuery) {
- List<HitBase> newHitList = new ArrayList<HitBase>();
+ List<HitBase> newHitList = new ArrayList<>();
int count = 0;
for (HitBase hit : hits) {
if (count>10)
@@ -65,7 +61,7 @@ public class MultiSentenceSearchResultsProcessor {
Double score = 0.0;
try {
- SentencePairMatchResult match = null;
+ SentencePairMatchResult match;
if (pageSentsAndSnippet!=null && pageSentsAndSnippet[0].length()>50){
match = matcher.assessRelevance(pageSentsAndSnippet[0] ,
searchQuery);
@@ -92,7 +88,7 @@ public class MultiSentenceSearchResultsProcessor {
System.out.println(hit.getOriginalSentences().toString() + " => "+hit.getGenerWithQueryScore());
System.out.println("match = "+hit.getSource());
}
- Collections.sort(newHitList, new HitBaseComparable());
+ newHitList.sort(new HitBaseComparable());
System.out.println("\n\n ============= NEW ORDER ================= ");
for (HitBase hit : newHitList) {
@@ -147,9 +143,9 @@ public class MultiSentenceSearchResultsProcessor {
public List<HitBase> runSearchViaAPI(String query) {
- List<String[]> reportData = new ArrayList<String[]>();
+ List<String[]> reportData = new ArrayList<>();
reportData.add(new String[]{query});
- List<HitBase> hits = null;
+ List<HitBase> hits;
try {
List<HitBase> resultList = bingSearcher.runSearch(query, NUM_OF_SEARCH_RESULTS);
reportData.add(convertListHitBaseIntoStringAr(resultList));
@@ -167,7 +163,7 @@ public class MultiSentenceSearchResultsProcessor {
}
private String[] convertListHitBaseIntoStringAr(List<HitBase> list){
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
for(HitBase h: list ){
results.add(h.getTitle()+ " | "+h.getAbstractText());
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/SnippetToParagraph.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/SnippetToParagraph.java
index 9558450..81a6f40 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/SnippetToParagraph.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/SnippetToParagraph.java
@@ -18,7 +18,6 @@ package opennlp.tools.parse_thicket.apps;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.logging.Logger;
@@ -30,7 +29,6 @@ import opennlp.tools.similarity.apps.ContentGeneratorSupport;
import opennlp.tools.similarity.apps.Fragment;
import opennlp.tools.similarity.apps.GeneratedSentenceProcessor;
import opennlp.tools.similarity.apps.HitBase;
-import opennlp.tools.similarity.apps.RelatedSentenceFinder;
import opennlp.tools.similarity.apps.utils.PageFetcher;
import opennlp.tools.similarity.apps.utils.StringDistanceMeasurer;
import opennlp.tools.similarity.apps.utils.Utils;
@@ -38,20 +36,20 @@ import opennlp.tools.textsimilarity.TextProcessor;
public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenceFinder */{
- private PageFetcher pFetcher = new PageFetcher();
- private static Logger LOG = Logger
+ private final PageFetcher pFetcher = new PageFetcher();
+ private static final Logger LOG = Logger
.getLogger("com.become.parse_thicket.apps.SnippetToParagraph");
public HitBase formTextFromOriginalPageGivenSnippetDirect(HitBase item) {
// put orig sentence in structure
- List<String> origs = new ArrayList<String>();
+ List<String> origs = new ArrayList<>();
item.setOriginalSentences(origs);
String title = item.getTitle().replace("<b>", " ").replace("</b>", " ")
.replace(" ", " ").replace(" ", " ");
// generation results for this sentence
- List<Fragment> result = new ArrayList<Fragment>();
+ List<Fragment> result = new ArrayList<>();
// form plain text from snippet
String snapshot = item.getAbstractText().replace("<b>", " ")
.replace("</b>", " ").replace(" ", " ").replace(" ", " ");
@@ -59,9 +57,9 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
String snapshotMarked = snapshot.replace("...",
" _should_find_orig_ . _should_find_orig_");
List<String> fragments = TextProcessor.splitToSentences(snapshotMarked);
- List<String> allFragms = new ArrayList<String>(fragments);
+ List<String> allFragms = new ArrayList<>(fragments);
- List<String> sents = new ArrayList<String>();
+ List<String> sents = new ArrayList<>();
String downloadedPage;
try {
if (snapshotMarked.length() != snapshot.length()) {
@@ -95,7 +93,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
continue;
String pageSentence = "";
// try to find original sentence from webpage
- if (fragment.indexOf("_should_find_orig_") > -1 && sents != null
+ if (fragment.contains("_should_find_orig_") && sents != null
&& sents.size() > 0)
try {
String[] mainAndFollowSent = getFullOriginalSentenceFromWebpageBySnippetFragment(
@@ -147,7 +145,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
String title = item.getTitle().replace("<b>", " ").replace("</b>", " ")
.replace(" ", " ").replace(" ", " ");
// generation results for this sentence
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
// form plain text from snippet
String snapshot = item.getAbstractText().replace("<b>", " ")
.replace("</b>", " ").replace(" ", " ").replace(" ", " ").replace("\"", "");
@@ -164,7 +162,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
String followSent = null;
if (f.length() < 50)
continue;
- String pageSentence = "";
+ String pageSentence;
// try to find original sentence from webpage
try {
@@ -190,7 +188,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
}
public List<String> cleanListOfSents(List<String> sents) {
- List<String> sentsClean = new ArrayList<String>();
+ List<String> sentsClean = new ArrayList<>();
for (String s : sents) {
if (s == null || s.trim().length() < 30 || s.length() < 20)
continue;
@@ -205,8 +203,8 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
{
StringDistanceMeasurer meas = new StringDistanceMeasurer();
- List<Integer> idsToRemove = new ArrayList<Integer>();
- List<String> hitsDedup = new ArrayList<String>();
+ List<Integer> idsToRemove = new ArrayList<>();
+ List<String> hitsDedup = new ArrayList<>();
try
{
for (int i = 0; i < hits.length; i++)
@@ -244,7 +242,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
{
int maxSentsFromPage= 100;
- List<String[]> results = new ArrayList<String[]>();
+ List<String[]> results = new ArrayList<>();
String downloadedPage = pFetcher.fetchPage(url, 20000);
if (downloadedPage == null || downloadedPage.length() < 100)
@@ -257,7 +255,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
downloadedPage= downloadedPage.replace(" ", "&");
downloadedPage = downloadedPage.replaceAll("(?:&)+", "#");
String[] sents = downloadedPage.split("#");
- List<TextChunk> sentsList = new ArrayList<TextChunk>();
+ List<TextChunk> sentsList = new ArrayList<>();
for(String s: sents){
s = s.trim().replace(" ", ". ").replace("..", ".").replace(". . .", " ")
.replace(": ", ". ").replace("- ", ". ").
@@ -265,7 +263,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
sentsList.add(new TextChunk(s, s.length()));
}
- Collections.sort(sentsList, new TextChunkComparable());
+ sentsList.sort(new TextChunkComparable());
String[] longestSents = new String[maxSentsFromPage];
int j=0;
int initIndex = sentsList.size()-1 -maxSentsFromPage;
@@ -287,7 +285,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
protected String[] cleanSplitListOfSents(String[] longestSents){
float minFragmentLength = 40, minFragmentLengthSpace=4;
- List<String> sentsClean = new ArrayList<String>();
+ List<String> sentsClean = new ArrayList<>();
for (String sentenceOrMultSent : longestSents)
{
if (sentenceOrMultSent==null || sentenceOrMultSent.length()<20)
@@ -339,7 +337,7 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
}
private List<String> cleanProductFeatures(List<String> productFeaturesList) {
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
for(String feature: productFeaturesList){
if (feature.startsWith("Unlimited Free") || feature.startsWith("View Larger") || feature.startsWith("View Larger") || feature.indexOf("shipping")>0)
continue;
@@ -352,26 +350,17 @@ public class SnippetToParagraph extends ContentGeneratorSupport /*RelatedSentenc
this.text = s;
this.len = length;
}
- public String text;
- public int len;
+ public final String text;
+ public final int len;
}
- public class TextChunkComparable implements Comparator<TextChunk>
- {
- public int compare(TextChunk ch1, TextChunk ch2)
- {
- if (ch1.len>ch2.len)
- return 1;
- else if (ch1.len<ch2.len)
- return -1;
- else return 0;
+ public static class TextChunkComparable implements Comparator<TextChunk> {
+ @Override
+ public int compare(TextChunk ch1, TextChunk ch2) {
+ return Integer.compare(ch1.len, ch2.len);
}
}
-
- public static void main(String[] args){
-
- }
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageContentSentenceExtractor.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageContentSentenceExtractor.java
index caa4123..83851c7 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageContentSentenceExtractor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageContentSentenceExtractor.java
@@ -18,14 +18,10 @@ package opennlp.tools.parse_thicket.apps;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import opennlp.tools.similarity.apps.GeneratedSentenceProcessor;
import opennlp.tools.similarity.apps.HitBase;
-import opennlp.tools.similarity.apps.utils.StringDistanceMeasurer;
-import opennlp.tools.similarity.apps.utils.Utils;
-import opennlp.tools.textsimilarity.TextProcessor;
import org.apache.commons.lang.StringUtils;
@@ -45,7 +41,7 @@ public class WebPageContentSentenceExtractor extends WebPageExtractor {
downloadedPage= downloadedPage.replace(" ", "&");
downloadedPage = downloadedPage.replaceAll("(?:&)+", "#");
String[] sents = downloadedPage.split("#");
- List<TextChunk> sentsList = new ArrayList<TextChunk>();
+ List<TextChunk> sentsList = new ArrayList<>();
for(String s: sents){
s = s.trim().replace(" ", ". ").replace("..", ".").replace(". . .", " ")
.replace(": ", ". ").replace("- ", ". ").
@@ -53,7 +49,7 @@ public class WebPageContentSentenceExtractor extends WebPageExtractor {
sentsList.add(new TextChunk(s, s.length()));
}
- Collections.sort(sentsList, new TextChunkComparable());
+ sentsList.sort(new TextChunkComparable());
String[] longestSents = new String[maxSentsFromPage];
int j=0; // -1 removed
@@ -89,7 +85,7 @@ public class WebPageContentSentenceExtractor extends WebPageExtractor {
}
private List<String> cleanProductFeatures(List<String> productFeaturesList) {
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
for(String feature: productFeaturesList){
if (feature.startsWith("Unlimited Free") || feature.startsWith("View Larger") || feature.startsWith("View Larger") || feature.indexOf("shipping")>0)
continue;
@@ -103,7 +99,7 @@ public class WebPageContentSentenceExtractor extends WebPageExtractor {
{
float minFragmentLength = 40, minFragmentLengthSpace=4;
- List<String> sentsClean = new ArrayList<String>();
+ List<String> sentsClean = new ArrayList<>();
for (String sentenceOrMultSent : longestSents)
{
if (GeneratedSentenceProcessor.acceptableMinedSentence(sentenceOrMultSent)==null){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageExtractor.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageExtractor.java
index 75c0013..ca12830 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageExtractor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/apps/WebPageExtractor.java
@@ -18,7 +18,6 @@ package opennlp.tools.parse_thicket.apps;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -30,17 +29,17 @@ import opennlp.tools.textsimilarity.TextProcessor;
import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcessor;
public class WebPageExtractor {
- protected PageFetcher pageFetcher = new PageFetcher();
+ protected final PageFetcher pageFetcher = new PageFetcher();
protected ParserChunker2MatcherProcessor nlProc;
- protected MostFrequentWordsFromPageGetter mostFrequentWordsFromPageGetter = new MostFrequentWordsFromPageGetter();
+ protected final MostFrequentWordsFromPageGetter mostFrequentWordsFromPageGetter = new MostFrequentWordsFromPageGetter();
- protected static int sentThresholdLength = 70;
+ protected static final int sentThresholdLength = 70;
public List<String[]> extractSentencesWithPotentialProductKeywords(String url)
{
int maxSentsFromPage= 20;
- List<String[]> results = new ArrayList<String[]>();
+ List<String[]> results = new ArrayList<>();
String downloadedPage = pageFetcher.fetchPage(url, 20000);
if (downloadedPage == null || downloadedPage.length() < 100)
@@ -53,7 +52,7 @@ public class WebPageExtractor {
pageTitle = pageTitle.replace(" ", ". ").replace("..", ".").replace(". . .", " ")
.replace(": ", ". ").replace("- ", ". ").replace(" |", ". ").
replace (". .",".").trim();
- List<String> pageTitles = new ArrayList<String>();
+ List<String> pageTitles = new ArrayList<>();
pageTitles.addAll(TextProcessor.splitToSentences(pageTitle));
pageTitles.addAll(Arrays.asList(pageTitle.split(".")));
@@ -71,7 +70,7 @@ public class WebPageExtractor {
downloadedPage= downloadedPage.replace(" ", "&");
downloadedPage = downloadedPage.replaceAll("(?:&)+", "#");
String[] sents = downloadedPage.split("#");
- List<TextChunk> sentsList = new ArrayList<TextChunk>();
+ List<TextChunk> sentsList = new ArrayList<>();
for(String s: sents){
s = s.trim().replace(" ", ". ").replace("..", ".").replace(". . .", " ")
.replace(": ", ". ").replace("- ", ". ").
@@ -79,7 +78,7 @@ public class WebPageExtractor {
sentsList.add(new TextChunk(s, s.length()));
}
- Collections.sort(sentsList, new TextChunkComparable());
+ sentsList.sort(new TextChunkComparable());
String[] longestSents = new String[maxSentsFromPage];
@@ -103,7 +102,7 @@ public class WebPageExtractor {
protected String[] cleanListOfSents(String[] longestSents)
{
- List<String> sentsClean = new ArrayList<String>();
+ List<String> sentsClean = new ArrayList<>();
for (String sentenceOrMultSent : longestSents)
{
List<String> furtherSplit = TextProcessor.splitToSentences(sentenceOrMultSent);
@@ -130,19 +129,15 @@ public class WebPageExtractor {
this.text = s;
this.len = length;
}
- public String text;
- public int len;
+ public final String text;
+ public final int len;
}
- public class TextChunkComparable implements Comparator<TextChunk>
- {
- public int compare(TextChunk ch1, TextChunk ch2)
- {
- if (ch1.len>ch2.len)
- return 1;
- else if (ch1.len<ch2.len)
- return -1;
- else return 0;
+ public static class TextChunkComparable implements Comparator<TextChunk> {
+
+ @Override
+ public int compare(TextChunk ch1, TextChunk ch2) {
+ return Integer.compare(ch1.len, ch2.len);
}
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/communicative_actions/CommunicativeActionsAttribute.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/communicative_actions/CommunicativeActionsAttribute.java
index a7bc65c..550e7e7 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/communicative_actions/CommunicativeActionsAttribute.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/communicative_actions/CommunicativeActionsAttribute.java
@@ -21,7 +21,7 @@ public class CommunicativeActionsAttribute implements IGeneralizer<Integer[]>{
else if (arr2[i]==0)
result[i]=arr1[i];
}
- List<Integer[]> results = new ArrayList<Integer[]>();
+ List<Integer[]> results = new ArrayList<>();
results.add(result);
return results;
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaFormManager.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaFormManager.java
index 694abce..bdb4052 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaFormManager.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaFormManager.java
@@ -17,8 +17,6 @@
package opennlp.tools.parse_thicket.matching;
-import java.util.List;
-
import opennlp.tools.stemmer.PStemmer;
public class LemmaFormManager {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaGeneralizer.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaGeneralizer.java
index 37ca917..d92345e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaGeneralizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/LemmaGeneralizer.java
@@ -26,9 +26,9 @@ import opennlp.tools.word2vec.W2VDistanceMeasurer;
public class LemmaGeneralizer implements IGeneralizer<String> {
public static final String w2vPrefix = "w2v_";
- PStemmer ps = new PStemmer();
+ final PStemmer ps = new PStemmer();
String pos = null;
- W2VDistanceMeasurer w2v = null;
+ final W2VDistanceMeasurer w2v;
public LemmaGeneralizer() {
w2v = W2VDistanceMeasurer.getInstance();
}
@@ -39,7 +39,7 @@ public class LemmaGeneralizer implements IGeneralizer<String> {
@Override
public List<String> generalize(Object o1, Object o2) {
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
boolean bEqual = false;
String lemma1 = (String)o1, lemma2 = (String)o2;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/NERPhraseGeneralizer.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/NERPhraseGeneralizer.java
index 9e82389..ca7a799 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/NERPhraseGeneralizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/NERPhraseGeneralizer.java
@@ -44,8 +44,8 @@ public class NERPhraseGeneralizer extends PhraseGeneralizer {
Object chunk1o, Object chunk2o) {
ParseTreeChunk chunk1 = (ParseTreeChunk)chunk1o, chunk2 = (ParseTreeChunk)chunk2o;
- List<ParseTreeNode> results = new ArrayList<ParseTreeNode>();
- List<ParseTreeChunk> resultChunks = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeNode> results = new ArrayList<>();
+ List<ParseTreeChunk> resultChunks = new ArrayList<>();
List<String> pos1 = chunk1.getPOSs();
@@ -53,8 +53,8 @@ public class NERPhraseGeneralizer extends PhraseGeneralizer {
List<String> lem1 = chunk1.getLemmas();
List<String> lem2 = chunk2.getLemmas();
- List<String> ner1 = new ArrayList<String>();
- List<String> ner2 = new ArrayList<String>();
+ List<String> ner1 = new ArrayList<>();
+ List<String> ner2 = new ArrayList<>();
for (ParseTreeNode node: chunk1.getParseTreeNodes()) {
@@ -68,15 +68,15 @@ public class NERPhraseGeneralizer extends PhraseGeneralizer {
}
- List<String> overlap = new ArrayList<String>(ner1);
+ List<String> overlap = new ArrayList<>(ner1);
overlap.retainAll(ner2);
- overlap = new ArrayList<String>(new HashSet<String>(overlap));
+ overlap = new ArrayList<>(new HashSet<>(overlap));
if (overlap == null || overlap.size() < 1)
return null;
- List<Integer> occur1 = new ArrayList<Integer>(), occur2 = new ArrayList<Integer>();
+ List<Integer> occur1 = new ArrayList<>(), occur2 = new ArrayList<>();
for (String word : overlap) {
Integer i1 = ner1.indexOf(word);
Integer i2 = ner2.indexOf(word);
@@ -108,9 +108,9 @@ public class NERPhraseGeneralizer extends PhraseGeneralizer {
// if at some position correspondence is inverse (one of two position
// decreases instead of increases)
// then we terminate current alignment accum and start a new one
- List<List<int[]>> overlapsPlaus = new ArrayList<List<int[]>>();
+ List<List<int[]>> overlapsPlaus = new ArrayList<>();
// starts from 1, not 0
- List<int[]> accum = new ArrayList<int[]>();
+ List<int[]> accum = new ArrayList<>();
accum.add(new int[] { occur1.get(0), occur2.get(0) });
for (int i = 1; i < occur1.size(); i++) {
@@ -120,7 +120,7 @@ public class NERPhraseGeneralizer extends PhraseGeneralizer {
else {
overlapsPlaus.add(accum);
if (occur1!=null && occur2!=null && i<occur1.size() && i<occur2.size() ){
- accum = new ArrayList<int[]>();
+ accum = new ArrayList<>();
accum.add(new int[] { occur1.get(i), occur2.get(i) });
}
}
@@ -131,14 +131,14 @@ public class NERPhraseGeneralizer extends PhraseGeneralizer {
for (List<int[]> occur : overlapsPlaus) {
- List<Integer> occr1 = new ArrayList<Integer>(), occr2 = new ArrayList<Integer>();
+ List<Integer> occr1 = new ArrayList<>(), occr2 = new ArrayList<>();
for (int[] column : occur) {
occr1.add(column[0]);
occr2.add(column[1]);
}
int ov1 = 0, ov2 = 0; // iterators over common words;
- List<String> commonPOS = new ArrayList<String>(), commonLemmas = new ArrayList<String>();
+ List<String> commonPOS = new ArrayList<>(), commonLemmas = new ArrayList<>();
// we start two words before first word
int k1 = occr1.get(ov1) - 2, k2 = occr2.get(ov2) - 2;
Boolean bReachedCommonWord = false;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PartOfSpeechGeneralizer.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PartOfSpeechGeneralizer.java
index 66efe23..92649da 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PartOfSpeechGeneralizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PartOfSpeechGeneralizer.java
@@ -27,7 +27,7 @@ public class PartOfSpeechGeneralizer implements IGeneralizer<String>{
@Override
public List<String> generalize(Object o1, Object o2){
String pos1 = (String)o1, pos2 = (String) o2;
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
String res = computeSimilarity(pos1, pos2);
if (res!=null)
results.add(res);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGeneralizer.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGeneralizer.java
index 61ef397..f2c7df1 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGeneralizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGeneralizer.java
@@ -29,12 +29,12 @@ import opennlp.tools.textsimilarity.ParseTreeChunk;
public class PhraseGeneralizer implements IGeneralizer<ParseTreeChunk> {
private final GeneralizationListReducer generalizationListReducer = new GeneralizationListReducer();
- protected LemmaGeneralizer lemmaFormManager = new LemmaGeneralizer();
+ protected final LemmaGeneralizer lemmaFormManager = new LemmaGeneralizer();
- protected PartOfSpeechGeneralizer posManager = new PartOfSpeechGeneralizer();
+ protected final PartOfSpeechGeneralizer posManager = new PartOfSpeechGeneralizer();
- protected PStemmer ps = new PStemmer();
- protected ParseTreeNodeGeneralizer nodeGen = new ParseTreeNodeGeneralizer();
+ protected final PStemmer ps = new PStemmer();
+ protected final ParseTreeNodeGeneralizer nodeGen = new ParseTreeNodeGeneralizer();
/**
* key matching function which takes two phrases, aligns them and finds a set
@@ -50,7 +50,7 @@ public class PhraseGeneralizer implements IGeneralizer<ParseTreeChunk> {
ParseTreeChunk chunk1 = (ParseTreeChunk)chunk1o, chunk2 = (ParseTreeChunk)chunk2o;
- List<ParseTreeChunk> resultChunks = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> resultChunks = new ArrayList<>();
List<String> pos1 = chunk1.getPOSs();
@@ -58,8 +58,8 @@ public class PhraseGeneralizer implements IGeneralizer<ParseTreeChunk> {
List<String> lem1 = chunk1.getLemmas();
List<String> lem2 = chunk2.getLemmas();
- List<String> lem1stem = new ArrayList<String>();
- List<String> lem2stem = new ArrayList<String>();
+ List<String> lem1stem = new ArrayList<>();
+ List<String> lem2stem = new ArrayList<>();
for (String word : lem1) {
try {
@@ -79,14 +79,14 @@ public class PhraseGeneralizer implements IGeneralizer<ParseTreeChunk> {
System.err.println("problem processing word " + lem2.toString());
}
- List<String> overlap = new ArrayList<String>(lem1stem);
+ List<String> overlap = new ArrayList<>(lem1stem);
overlap.retainAll(lem2stem);
if (overlap == null || overlap.size() < 1)
return null;
// to accumulate starts of alignments
- List<Integer> occur1 = new ArrayList<Integer>(), occur2 = new ArrayList<Integer>();
+ List<Integer> occur1 = new ArrayList<>(), occur2 = new ArrayList<>();
// for verbs find alignment even if no same verb lemmas, just any pair of verbs. Usually should be 0,0
if (chunk1.getMainPOS().startsWith("VP") && chunk2.getMainPOS().startsWith("VP")) {
@@ -123,9 +123,9 @@ public class PhraseGeneralizer implements IGeneralizer<ParseTreeChunk> {
// if at some position correspondence is inverse (one of two position
// decreases instead of increases)
// then we terminate current alignment accum and start a new one
- List<List<int[]>> overlapsPlaus = new ArrayList<List<int[]>>();
+ List<List<int[]>> overlapsPlaus = new ArrayList<>();
// starts from 1, not 0
- List<int[]> accum = new ArrayList<int[]>();
+ List<int[]> accum = new ArrayList<>();
accum.add(new int[] { occur1.get(0), occur2.get(0) });
for (int i = 1; i < occur1.size() && i< occur2.size(); i++) {
@@ -134,7 +134,7 @@ public class PhraseGeneralizer implements IGeneralizer<ParseTreeChunk> {
accum.add(new int[] { occur1.get(i), occur2.get(i) });
else {
overlapsPlaus.add(accum);
- accum = new ArrayList<int[]>();
+ accum = new ArrayList<>();
accum.add(new int[] { occur1.get(i), occur2.get(i) });
}
}
@@ -144,15 +144,15 @@ public class PhraseGeneralizer implements IGeneralizer<ParseTreeChunk> {
for (List<int[]> occur : overlapsPlaus) {
- List<ParseTreeNode> results = new ArrayList<ParseTreeNode>();
- List<Integer> occr1 = new ArrayList<Integer>(), occr2 = new ArrayList<Integer>();
+ List<ParseTreeNode> results = new ArrayList<>();
+ List<Integer> occr1 = new ArrayList<>(), occr2 = new ArrayList<>();
for (int[] column : occur) {
occr1.add(column[0]);
occr2.add(column[1]);
}
int ov1 = 0, ov2 = 0; // iterators over common words;
- List<String> commonPOS = new ArrayList<String>(), commonLemmas = new ArrayList<String>();
+ List<String> commonPOS = new ArrayList<>(), commonLemmas = new ArrayList<>();
// we start two words before first word
int k1 = occr1.get(ov1) - 2, k2 = occr2.get(ov2) - 2;
// if (k1<0) k1=0; if (k2<0) k2=0;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGroupGeneralizer.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGroupGeneralizer.java
index abd9f86..01fe299 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGroupGeneralizer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/matching/PhraseGroupGeneralizer.java
@@ -44,7 +44,7 @@ public class PhraseGroupGeneralizer implements IGeneralizer<List<ParseTreeChunk>
public List<List<ParseTreeChunk>> generalize(Object o1, Object o2) {
- List<List<ParseTreeChunk>> sent1 = (List<List<ParseTreeChunk>>)o1,
+ List<List<ParseTreeChunk>> sent1 = (List<List<ParseTreeChunk>>)o1,
sent2 = (List<List<ParseTreeChunk>>) o2 ;
List<List<ParseTreeChunk>> results = new ArrayList<>();
// first iterate through component
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/LinguisticPatternStructure.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/LinguisticPatternStructure.java
index 6ddca1e..ff6c412 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/LinguisticPatternStructure.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/LinguisticPatternStructure.java
@@ -58,7 +58,7 @@ public class LinguisticPatternStructure extends PhrasePatternStructure {
return generator;
}
Set<Integer> generatorParents = conceptList.get(generator).parents;
- Set<Integer> newParents = new HashSet<Integer>();
+ Set<Integer> newParents = new HashSet<>();
for (int candidate : generatorParents) {
if (!intent.containsAll(conceptList.get(candidate).intent)) {
List<List<ParseTreeChunk>> intersection = md
@@ -172,8 +172,8 @@ public class LinguisticPatternStructure extends PhrasePatternStructure {
public void logStability(){
- int min_delta = -1, delta = -1;
- float sum = 0;
+ int min_delta, delta;
+ float sum;
for (PhraseConcept phraseConcept : conceptList) {
min_delta = Integer.MAX_VALUE;
sum = 0;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PatternStructureWriter.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PatternStructureWriter.java
index 3cc1f78..548c740 100755
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PatternStructureWriter.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PatternStructureWriter.java
@@ -17,15 +17,11 @@
package opennlp.tools.parse_thicket.pattern_structure;
import java.io.BufferedWriter;
-import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
-
-import opennlp.tools.fca.ConceptLattice;
-import opennlp.tools.fca.FormalConcept;
+import java.nio.charset.StandardCharsets;
public class PatternStructureWriter {
@@ -36,7 +32,7 @@ public class PatternStructureWriter {
try {
writer = new BufferedWriter(new OutputStreamWriter(
- new FileOutputStream(filename), "utf-8"));
+ new FileOutputStream(filename), StandardCharsets.UTF_8));
writer.write("PatternStructure size: " + ps.conceptList.size()+ " with " + ps.objectCount + "objects\n");
for (PhraseConcept c : ps.conceptList){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhraseConcept.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhraseConcept.java
index 49adb6e..6204fe5 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhraseConcept.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhraseConcept.java
@@ -27,10 +27,10 @@ import java.util.Set;
public class PhraseConcept {
int position;
- public List<List<ParseTreeChunk>> intent;
- Set<Integer> parents;
- Set<Integer> children;
- Set<Integer> extent;
+ public final List<List<ParseTreeChunk>> intent;
+ final Set<Integer> parents;
+ final Set<Integer> children;
+ final Set<Integer> extent;
double intLogStabilityBottom = 0;
double intLogStabilityUp = 0;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhrasePatternStructure.java b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhrasePatternStructure.java
index fa4d00a..86d9523 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhrasePatternStructure.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/parse_thicket/pattern_structure/PhrasePatternStructure.java
@@ -27,10 +27,10 @@ import opennlp.tools.textsimilarity.ParseTreeChunk;
import opennlp.tools.textsimilarity.ParseTreeMatcherDeterministic;
public class PhrasePatternStructure {
- int objectCount;
- int attributeCount;
- public List<PhraseConcept> conceptList;
- ParseTreeMatcherDeterministic md;
+ final int objectCount;
+ final int attributeCount;
+ public final List<PhraseConcept> conceptList;
+ final ParseTreeMatcherDeterministic md;
public PhrasePatternStructure(int objectCounts, int attributeCounts) {
objectCount = objectCounts;
attributeCount = attributeCounts;
@@ -157,9 +157,9 @@ public class PhrasePatternStructure {
public List<List<ParseTreeChunk>> formGroupedPhrasesFromChunksForPara(
List<List<ParseTreeNode>> phrs) {
- List<List<ParseTreeChunk>> results = new ArrayList<List<ParseTreeChunk>>();
- List<ParseTreeChunk> nps = new ArrayList<ParseTreeChunk>(), vps = new ArrayList<ParseTreeChunk>(),
- pps = new ArrayList<ParseTreeChunk>();
+ List<List<ParseTreeChunk>> results = new ArrayList<>();
+ List<ParseTreeChunk> nps = new ArrayList<>(), vps = new ArrayList<>(),
+ pps = new ArrayList<>();
for(List<ParseTreeNode> ps:phrs){
ParseTreeChunk ch = convertNodeListIntoChunk(ps);
String ptype = ps.get(0).getPhraseType();
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingQueryRunner.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingQueryRunner.java
index 414ffec..34efc91 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingQueryRunner.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingQueryRunner.java
@@ -33,26 +33,23 @@ public class BingQueryRunner {
protected static String BING_KEY =
"WFoNMM706MMJ5JYfcHaSEDP+faHj3xAxt28CPljUAHA";
- //"pjtCgujmf9TtfjCVBdcQ2rBUQwGLmtLtgCG4Ex7kekw";
- //"e8ADxIjn9YyHx36EihdjH/tMqJJItUrrbPTUpKahiU0=";
- //"Cec1TlE67kPGDA/1MbeqPfHzP0I1eJypf3o0pYxRsuU=";
private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.BingQueryRunner");
- protected AzureSearchWebQuery aq = new AzureSearchWebQuery();
- private AzureSearchImageQuery iq = new AzureSearchImageQuery();
+ protected final AzureSearchWebQuery aq = new AzureSearchWebQuery();
+ private final AzureSearchImageQuery iq = new AzureSearchImageQuery();
public void setKey(String key){
BING_KEY = key;
}
- private int MAX_QUERY_LENGTH = 100;
+ private final int MAX_QUERY_LENGTH = 100;
public void setLang(String language){
aq.setMarket(language);
}
public List<HitBase> runSearchMultiplePages(String query, int nPages) {
- List<HitBase> results = new ArrayList<HitBase>();
+ List<HitBase> results = new ArrayList<>();
for(int i=0; i< nPages; i++){
aq.setPage(i);
results.addAll( runSearch(query, 50));
@@ -93,7 +90,7 @@ public class BingQueryRunner {
//org.xml.sax.SAXParseException
- List<HitBase> results = new ArrayList<HitBase> ();
+ List<HitBase> results = new ArrayList<>();
AzureSearchResultSet<AzureSearchWebResult> ars = aq.getQueryResult();
for (AzureSearchWebResult anr : ars){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingRelatedSpellingQueryRunner.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingRelatedSpellingQueryRunner.java
index 653cfc2..05e6936 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingRelatedSpellingQueryRunner.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingRelatedSpellingQueryRunner.java
@@ -39,12 +39,10 @@ import net.billylieurance.azuresearch.AzureSearchRelatedSearchResult;
import net.billylieurance.azuresearch.AzureSearchResultSet;
import net.billylieurance.azuresearch.AzureSearchSpellingSuggestionQuery;
import net.billylieurance.azuresearch.AzureSearchSpellingSuggestionResult;
-import net.billylieurance.azuresearch.AzureSearchWebQuery;
-import net.billylieurance.azuresearch.AzureSearchWebResult;
public class BingRelatedSpellingQueryRunner extends BingQueryRunner{
- private AzureSearchRelatedSearchQuery aq = new AzureSearchRelatedSearchQuery ();
- private AzureSearchSpellingSuggestionQuery ssq = new AzureSearchSpellingSuggestionQuery ();
+ private final AzureSearchRelatedSearchQuery aq = new AzureSearchRelatedSearchQuery ();
+ private final AzureSearchSpellingSuggestionQuery ssq = new AzureSearchSpellingSuggestionQuery ();
public List<HitBase> runSearch(String query, int nRes) {
@@ -53,7 +51,7 @@ public class BingRelatedSpellingQueryRunner extends BingQueryRunner{
aq.setPerPage(nRes);
aq.doQuery();
- List<HitBase> results = new ArrayList<HitBase> ();
+ List<HitBase> results = new ArrayList<>();
AzureSearchResultSet<AzureSearchRelatedSearchResult> ars = aq.getQueryResult();
for (AzureSearchRelatedSearchResult anr : ars){
@@ -71,7 +69,7 @@ public class BingRelatedSpellingQueryRunner extends BingQueryRunner{
ssq.setPerPage(nRes);
ssq.doQuery();
- List<HitBase> results = new ArrayList<HitBase> ();
+ List<HitBase> results = new ArrayList<>();
AzureSearchResultSet<AzureSearchSpellingSuggestionResult> ars = ssq.getQueryResult();
for ( AzureSearchSpellingSuggestionResult anr : ars){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingResponse.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingResponse.java
index dff5710..b66ee80 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingResponse.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingResponse.java
@@ -36,7 +36,7 @@ public class BingResponse {
int pageSize;
public BingResponse() {
- hits = new ArrayList<HitBase>();
+ hits = new ArrayList<>();
}
public void appendHits(HitBase hit) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingWebQueryRunner.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingWebQueryRunner.java
index 8afab13..edda919 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingWebQueryRunner.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/BingWebQueryRunner.java
@@ -35,14 +35,14 @@ public class BingWebQueryRunner {
private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.BingWebQueryRunner");
public static final String BING_KEY = "TyfmF/4t1qbnA5X6sBXiTf80l29cSn+7IT0fPw2FNsU=";
- private AzureSearchWebQuery aq = new AzureSearchWebQuery();
+ private final AzureSearchWebQuery aq = new AzureSearchWebQuery();
public List<HitBase> runSearch(String query, int nRes) {
aq.setAppid(BING_KEY);
aq.setQuery(query);
aq.doQuery();
- List<HitBase> results = new ArrayList<HitBase> ();
+ List<HitBase> results = new ArrayList<>();
AzureSearchResultSet<AzureSearchWebResult> ars = aq.getQueryResult();
for (AzureSearchWebResult anr : ars){
@@ -61,8 +61,8 @@ public class BingWebQueryRunner {
double imageDupeThresh) {
StringDistanceMeasurer meas = new StringDistanceMeasurer();
- List<Integer> idsToRemove = new ArrayList<Integer>();
- List<HitBase> hitsDedup = new ArrayList<HitBase>();
+ List<Integer> idsToRemove = new ArrayList<>();
+ List<HitBase> hitsDedup = new ArrayList<>();
try {
for (int i = 0; i < hits.size(); i++)
for (int j = i + 1; j < hits.size(); j++) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGenerator.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGenerator.java
index e61a379..f3f49e1 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGenerator.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGenerator.java
@@ -38,13 +38,13 @@ import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcess
*/
public class ContentGenerator /*extends RelatedSentenceFinder*/ {
- PageFetcher pFetcher = new PageFetcher();
- ParserChunker2MatcherProcessor sm = ParserChunker2MatcherProcessor.getInstance();
- protected ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
- protected ParseTreeChunk parseTreeChunk = new ParseTreeChunk();
- protected static StringDistanceMeasurer stringDistanceMeasurer = new StringDistanceMeasurer();
- protected BingQueryRunner yrunner = new BingQueryRunner();
- protected ContentGeneratorSupport support = new ContentGeneratorSupport();
+ final PageFetcher pFetcher = new PageFetcher();
+ final ParserChunker2MatcherProcessor sm = ParserChunker2MatcherProcessor.getInstance();
+ protected final ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
+ protected final ParseTreeChunk parseTreeChunk = new ParseTreeChunk();
+ protected static final StringDistanceMeasurer stringDistanceMeasurer = new StringDistanceMeasurer();
+ protected final BingQueryRunner yrunner = new BingQueryRunner();
+ protected final ContentGeneratorSupport support = new ContentGeneratorSupport();
protected int MAX_STEPS = 1;
protected int MAX_SEARCH_RESULTS = 1;
protected float RELEVANCE_THRESHOLD = 1.1f;
@@ -242,7 +242,7 @@ public class ContentGenerator /*extends RelatedSentenceFinder*/ {
return null;
String pageSentence = "";
// try to find original sentence from webpage
- if (fragment.indexOf("_should_find_orig_") > -1 && sents != null
+ if (fragment.contains("_should_find_orig_") && sents != null
&& sents.length > 0){
try {
// first try sorted sentences from page by length approach
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorRunner.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorRunner.java
index abb0016..b6bc2b1 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorRunner.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorRunner.java
@@ -21,7 +21,6 @@ import java.util.List;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
-import opennlp.tools.apps.utils.email.EmailSender;
import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcessor;
public class ContentGeneratorRunner {
@@ -44,7 +43,7 @@ public class ContentGeneratorRunner {
bingKey = "e8ADxIjn9YyHx36EihdjH/tMqJJItUrrbPTUpKahiU0=";
}
- RelatedSentenceFinder f = null;
+ RelatedSentenceFinder f;
String lang = args[6];
if (lang.startsWith("es")){
f = new RelatedSentenceFinderML(Integer.parseInt(args[3]), Integer.parseInt(args[4]), Float.parseFloat(args[5]), bingKey);
@@ -56,7 +55,7 @@ public class ContentGeneratorRunner {
else
f = new RelatedSentenceFinder();
- List<HitBase> hits = null;
+ List<HitBase> hits;
try {
hits = f.generateContentAbout(args[0].replace('+', ' ').replace('"', ' ').trim());
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorSupport.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorSupport.java
index ad33001..4389ab6 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorSupport.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/ContentGeneratorSupport.java
@@ -18,7 +18,6 @@
package opennlp.tools.similarity.apps;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.logging.Logger;
@@ -37,7 +36,7 @@ import org.apache.commons.lang.StringUtils;
*/
public class ContentGeneratorSupport {
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.ContentGeneratorSupport");
/**
@@ -125,7 +124,7 @@ public class ContentGeneratorSupport {
}
public static String[] cleanListOfSents(String[] sents) {
- List<String> sentsClean = new ArrayList<String>();
+ List<String> sentsClean = new ArrayList<>();
for (String s : sents) {
if (s == null || s.trim().length() < 30 || s.length() < 20)
continue;
@@ -156,8 +155,8 @@ public class ContentGeneratorSupport {
StringDistanceMeasurer meas = new StringDistanceMeasurer();
double dupeThresh = 0.8; // if more similar, then considered dupes was
// 0.7
- List<Integer> idsToRemove = new ArrayList<Integer>();
- List<String> hitsDedup = new ArrayList<String>();
+ List<Integer> idsToRemove = new ArrayList<>();
+ List<String> hitsDedup = new ArrayList<>();
try {
for (int i = 0; i < hits.size(); i++)
for (int j = i + 1; j < hits.size(); j++) {
@@ -308,20 +307,20 @@ public class ContentGeneratorSupport {
{
int maxSentsFromPage= 100;
- List<String[]> results = new ArrayList<String[]>();
+ List<String[]> results = new ArrayList<>();
//String pageOrigHTML = pFetcher.fetchOrigHTML(url);
downloadedPage= downloadedPage.replace(" ", "&");
downloadedPage = downloadedPage.replaceAll("(?:&)+", "#");
String[] sents = downloadedPage.split("#");
- List<TextChunk> sentsList = new ArrayList<TextChunk>();
+ List<TextChunk> sentsList = new ArrayList<>();
for(String s: sents){
s = ContentGeneratorSupport.cleanSpacesInCleanedHTMLpage(s);
sentsList.add(new TextChunk(s, s.length()));
}
- Collections.sort(sentsList, new TextChunkComparable());
+ sentsList.sort(new TextChunkComparable());
String[] longestSents = new String[maxSentsFromPage];
int j=0;
int initIndex = sentsList.size()-1 -maxSentsFromPage;
@@ -345,27 +344,22 @@ public class ContentGeneratorSupport {
this.text = s;
this.len = length;
}
- public String text;
- public int len;
+ public final String text;
+ public final int len;
}
- public class TextChunkComparable implements Comparator<TextChunk>
- {
- public int compare(TextChunk ch1, TextChunk ch2)
- {
- if (ch1.len>ch2.len)
- return 1;
- else if (ch1.len<ch2.len)
- return -1;
- else return 0;
-
+ public static class TextChunkComparable implements Comparator<TextChunk> {
+
+ @Override
+ public int compare(TextChunk ch1, TextChunk ch2) {
+ return Integer.compare(ch1.len, ch2.len);
}
}
protected String[] cleanSplitListOfSents(String[] longestSents){
float minFragmentLength = 40, minFragmentLengthSpace=4;
- List<String> sentsClean = new ArrayList<String>();
+ List<String> sentsClean = new ArrayList<>();
for (String sentenceOrMultSent : longestSents)
{
if (sentenceOrMultSent==null || sentenceOrMultSent.length()<20)
@@ -406,7 +400,7 @@ public class ContentGeneratorSupport {
protected String[] cleanSplitListOfSentsFirstSplit(String[] longestSents){
float minFragmentLength = 40, minFragmentLengthSpace=4;
- List<String> sentsClean = new ArrayList<String>();
+ List<String> sentsClean = new ArrayList<>();
for (String sentenceOrMultSent : longestSents)
{
if (sentenceOrMultSent==null || sentenceOrMultSent.length()<minFragmentLength)
@@ -452,7 +446,7 @@ public class ContentGeneratorSupport {
String[] split = title.split(delim);
if (split.length>1){
for(String s: split){
- if (s.indexOf(".")<0)
+ if (!s.contains("."))
return s;
}
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GeneratedSentenceProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GeneratedSentenceProcessor.java
index 8164292..d9abf51 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GeneratedSentenceProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GeneratedSentenceProcessor.java
@@ -26,7 +26,7 @@ import opennlp.tools.similarity.apps.utils.Utils;
public class GeneratedSentenceProcessor {
- public static String[] occurs = new String[]{ "click here", "wikipedia", "retrieved", "isbn",
+ public static final String[] occurs = new String[]{ "click here", "wikipedia", "retrieved", "isbn",
"http", "www.",
"copyright", "advertise", "(accessed", "[edit]", "[citation needed]",
"site map", "email updates", "contact us", "rss feeds", "cite this site",
@@ -67,7 +67,7 @@ public class GeneratedSentenceProcessor {
"menu.", "search.", "sign in", "home.",
"additional terms", "may apply"};
- public static String[] occursStartsWith = new String[]{
+ public static final String[] occursStartsWith = new String[]{
"fax", "write","email", "contact", "conditions", "chat live",
"we ", "the recipient", "day return", "days return",
"refund it", "your money",
@@ -198,7 +198,7 @@ public class GeneratedSentenceProcessor {
public static boolean isProhibitiveWordsOccurOrStartWith(String sentenceLowercase){
for(String o: occurs){
- if (sentenceLowercase.indexOf(o)>-1){
+ if (sentenceLowercase.contains(o)){
//System.out.println("Found prohibited occurrence "+ o +" \n in sentence = "+ sentenceLowercase);
return true;
}
@@ -220,7 +220,7 @@ public class GeneratedSentenceProcessor {
String sentence = "Accepted sentence: Educational. Video. About Us menu. Home. Nobel Prizes and Laureates. Nobel Prizes and Laureates. Physics Prize. Chemistry Prize. Medicine Prize. Literature Prize. Peace Prize. Prize in Economic Sciences. Quick Facts. Nomination. Nomination. Physics Prize. Chemistry Prize. Medicine Prize. Literature Prize. Peace Prize. Prize in Economic Sciences. Nomination Archive. Ceremonies. Ceremonies. Ceremony Archive. Nobel Banquet Menus. Nobel Banquet Dress C [...]
String res = GeneratedSentenceProcessor.acceptableMinedSentence(sentence);
- String para = "About Albert Einstein 15 External links 16 Credits Youth and schooling Albert Einstein was born into a Jewish family";
+ String para;
para = "inventions of albert einstein what was albert einsteins invention invention of einstein what were albert einsteins inventions ";
para = para.replaceAll(" [A-Z]", ". $0");
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GoogleAutoCompleteQueryRunner.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GoogleAutoCompleteQueryRunner.java
index 52f6c9b..2549c29 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GoogleAutoCompleteQueryRunner.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/GoogleAutoCompleteQueryRunner.java
@@ -16,8 +16,8 @@
*/
package opennlp.tools.similarity.apps;
-import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -27,7 +27,7 @@ import org.apache.commons.lang.StringUtils;
import opennlp.tools.similarity.apps.utils.PageFetcher;
public class GoogleAutoCompleteQueryRunner {
- protected PageFetcher pageFetcher = new PageFetcher();
+ protected final PageFetcher pageFetcher = new PageFetcher();
private final static String searchRequest = "http://google.com/complete/search?q=", suffix = "&output=toolbar";
@@ -35,12 +35,8 @@ public class GoogleAutoCompleteQueryRunner {
// insert spaces into camel cases
rawExpr= rawExpr.replaceAll("([a-z][a-z])([A-Z][a-z])", "$1 $2");
String query = rawExpr.replace(' ', '+');
- try {
- query = URLEncoder.encode(query, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
+ query = URLEncoder.encode(query, StandardCharsets.UTF_8);
+
String pageOrigHTML = pageFetcher.fetchOrigHTML(searchRequest +query+suffix);
String[] results = StringUtils.substringsBetween(pageOrigHTML, "<CompleteSuggestion>", "</CompleteSuggestion>");
List<List<String>> accum = new ArrayList<>();
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/HitBase.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/HitBase.java
index 0a2de46..2da1c05 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/HitBase.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/HitBase.java
@@ -60,10 +60,10 @@ public class HitBase {
}
public HitBase(String orig, String[] generateds) {
- originalSentences = new ArrayList<String>();
+ originalSentences = new ArrayList<>();
originalSentences.add(orig);
- fragments = new ArrayList<Fragment>();
+ fragments = new ArrayList<>();
for (String sent : generateds) {
Fragment f = new Fragment(sent, 0.0);
fragments.add(f);
@@ -165,7 +165,7 @@ public class HitBase {
}
public static String toString(List<HitBase> hits) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
Boolean pBreak = true;
for (HitBase hit : hits) {
String fragm = (hit.toString());
@@ -186,7 +186,7 @@ public class HitBase {
}
public static String toResultantString(List<HitBase> hits) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
Boolean pBreak = true;
for (HitBase hit : hits) {
try {
@@ -215,7 +215,7 @@ public class HitBase {
}
public static String produceReferenceSection(List<HitBase> hits) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (HitBase hit : hits) {
try {
if (hit.getUrl()==null)
@@ -233,8 +233,8 @@ public class HitBase {
public static List<HitBase> removeDuplicates(List<HitBase> hits) {
StringDistanceMeasurer meas = new StringDistanceMeasurer();
double imageDupeThresh = 0.8; // if more similar, then considered dupes
- List<Integer> idsToRemove = new ArrayList<Integer>();
- List<HitBase> hitsDedup = new ArrayList<HitBase>();
+ List<Integer> idsToRemove = new ArrayList<>();
+ List<HitBase> hitsDedup = new ArrayList<>();
try {
for (int i = 0; i < hits.size(); i++)
for (int j = i + 1; j < hits.size(); j++) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinder.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinder.java
index f513a91..a6941ee 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinder.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinder.java
@@ -48,19 +48,19 @@ import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcess
*/
public class RelatedSentenceFinder {
private static final Logger LOG = Logger.getLogger("opennlp.tools.similarity.apps.RelatedSentenceFinder");
- PageFetcher pFetcher = new PageFetcher();
- ParserChunker2MatcherProcessor sm = ParserChunker2MatcherProcessor.getInstance();
- protected ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
- protected ParseTreeChunk parseTreeChunk = new ParseTreeChunk();
- protected static StringDistanceMeasurer stringDistanceMeasurer = new StringDistanceMeasurer();
- protected BingQueryRunner yrunner = new BingQueryRunner();
+ final PageFetcher pFetcher = new PageFetcher();
+ final ParserChunker2MatcherProcessor sm = ParserChunker2MatcherProcessor.getInstance();
+ protected final ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
+ protected final ParseTreeChunk parseTreeChunk = new ParseTreeChunk();
+ protected static final StringDistanceMeasurer stringDistanceMeasurer = new StringDistanceMeasurer();
+ protected final BingQueryRunner yrunner = new BingQueryRunner();
protected int MAX_STEPS = 1;
protected int MAX_SEARCH_RESULTS = 1;
protected float RELEVANCE_THRESHOLD = 1.1f;
- protected Set<String> visitedURLs = new HashSet<>();
+ protected final Set<String> visitedURLs = new HashSet<>();
// used to indicate that a sentence is an opinion, so more appropriate
- static List<String> MENTAL_VERBS = new ArrayList<>(
+ static final List<String> MENTAL_VERBS = new ArrayList<>(
Arrays.asList(new String[] { "want", "know", "believe", "appeal", "ask",
"accept", "agree", "allow", "appeal", "ask", "assume", "believe",
"check", "confirm", "convince", "deny", "disagree", "explain",
@@ -654,8 +654,8 @@ public class RelatedSentenceFinder {
this.text = s;
this.len = length;
}
- public String text;
- public int len;
+ public final String text;
+ public final int len;
}
public static class TextChunkComparable implements Comparator<TextChunk> {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinderML.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinderML.java
index 03b100d..a47c057 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinderML.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/RelatedSentenceFinderML.java
@@ -43,9 +43,9 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
}
public List<HitBase> generateContentAbout(String sentence) throws Exception {
- List<HitBase> opinionSentencesToAdd = new ArrayList<HitBase>();
+ List<HitBase> opinionSentencesToAdd = new ArrayList<>();
System.out.println(" \n=== Entity to write about = " + sentence);
- List<String> nounPhraseQueries = new ArrayList<String>();
+ List<String> nounPhraseQueries = new ArrayList<>();
List<HitBase> searchResult = yrunner.runSearch(sentence, 100);
if (MAX_SEARCH_RESULTS<searchResult.size())
@@ -80,15 +80,15 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
public HitBase augmentWithMinedSentencesAndVerifyRelevance(HitBase item,
String originalSentence, List<String> sentsAll) {
if (sentsAll == null)
- sentsAll = new ArrayList<String>();
+ sentsAll = new ArrayList<>();
// put orig sentence in structure
- List<String> origs = new ArrayList<String>();
+ List<String> origs = new ArrayList<>();
origs.add(originalSentence);
item.setOriginalSentences(origs);
String title = item.getTitle().replace("<b>", " ").replace("</b>", " ")
.replace(" ", " ").replace(" ", " ");
// generation results for this sentence
- List<Fragment> result = new ArrayList<Fragment>();
+ List<Fragment> result = new ArrayList<>();
// form plain text from snippet
String snapshot = item.getAbstractText().replace("<b>", " ")
.replace("</b>", " ").replace(" ", " ").replace(" ", " ");
@@ -99,7 +99,7 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
String snapshotMarked = snapshot.replace("...",
" _should_find_orig_ . _should_find_orig_");
String[] fragments = sm.splitSentences(snapshotMarked);
- List<String> allFragms = new ArrayList<String>(Arrays.asList(fragments));
+ List<String> allFragms = new ArrayList<>(Arrays.asList(fragments));
String[] sents = null;
String downloadedPage = null;
@@ -131,7 +131,7 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
continue;
String pageSentence = "";
// try to find original sentence from webpage
- if (fragment.indexOf("_should_find_orig_") > -1 && sents != null
+ if (fragment.contains("_should_find_orig_") && sents != null
&& sents.length > 0)
try {
// first try sorted sentences from page by lenght approach
@@ -167,7 +167,7 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
try { // get score from syntactic match between sentence in
// original text and mined sentence
- double measScore = 0.0, syntScore = 0.0, mentalScore = 0.0;
+ double measScore, syntScore, mentalScore = 0.0;
syntScore = calculateKeywordScore(pageSentence + " " + title, originalSentence);
@@ -192,7 +192,7 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
// now possibly increase score by finding mental verbs
// indicating opinions
for (String s : MENTAL_VERBS) {
- if (pageSentence.indexOf(s) > -1) {
+ if (pageSentence.contains(s)) {
mentalScore += 0.3;
break;
}
@@ -241,7 +241,7 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
private double calculateKeywordScore(String currSent, String pageSentence) {
List<String> list1 =TextProcessor.fastTokenize(currSent, false);
List<String> list2 =TextProcessor.fastTokenize(pageSentence, false);
- List<String> overlap1 = new ArrayList<String>(list1);
+ List<String> overlap1 = new ArrayList<>(list1);
overlap1.retainAll(list2);
return overlap1.size();
@@ -251,7 +251,7 @@ public class RelatedSentenceFinderML extends RelatedSentenceFinder{
public static void main(String[] args) {
RelatedSentenceFinderML f = new RelatedSentenceFinderML();
- List<HitBase> hits = null;
+ List<HitBase> hits;
try {
// uncomment the sentence you would like to serve as a seed sentence for
// content generation for an event description
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SearchResultsProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SearchResultsProcessor.java
index e6b7be2..339a6e1 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SearchResultsProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SearchResultsProcessor.java
@@ -17,7 +17,6 @@
package opennlp.tools.similarity.apps;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.logging.Logger;
@@ -31,7 +30,7 @@ public class SearchResultsProcessor extends BingQueryRunner {
Logger.getLogger("opennlp.tools.similarity.apps.SearchResultsProcessor");
private final ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
ParserChunker2MatcherProcessor sm;
- WebSearchEngineResultsScraper scraper = new WebSearchEngineResultsScraper();
+ final WebSearchEngineResultsScraper scraper = new WebSearchEngineResultsScraper();
/*
* Takes a search engine API (or scraped) search results and calculates the parse tree similarity
@@ -43,7 +42,7 @@ public class SearchResultsProcessor extends BingQueryRunner {
private List<HitBase> calculateMatchScoreResortHits(List<HitBase> hits,
String searchQuery) {
- List<HitBase> newHitList = new ArrayList<HitBase>();
+ List<HitBase> newHitList = new ArrayList<>();
sm = ParserChunker2MatcherProcessor.getInstance();
for (HitBase hit : hits) {
@@ -94,7 +93,7 @@ public class SearchResultsProcessor extends BingQueryRunner {
}
public List<HitBase> runSearchViaAPI(String query) {
- List<HitBase> hits = null;
+ List<HitBase> hits;
try {
List<HitBase> resultList = runSearch(query);
// now we apply our own relevance filter
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SpeechRecognitionResultsProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SpeechRecognitionResultsProcessor.java
index 28df9a7..533f8e2 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SpeechRecognitionResultsProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/SpeechRecognitionResultsProcessor.java
@@ -121,8 +121,8 @@ public class SpeechRecognitionResultsProcessor /*extends BingWebQueryRunner*/ {
}
public static class SentenceMeaningfullnessScore {
- String sentence;
- double score;
+ final String sentence;
+ final double score;
public SentenceMeaningfullnessScore(String sent, double sc) {
sentence = sent;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/StoryDiscourseNavigator.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/StoryDiscourseNavigator.java
index a12c2aa..b24dc45 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/StoryDiscourseNavigator.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/StoryDiscourseNavigator.java
@@ -34,11 +34,11 @@ import opennlp.tools.textsimilarity.TextProcessor;
import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcessor;
public class StoryDiscourseNavigator {
- protected BingQueryRunner yrunner = new BingQueryRunner();
- ParserChunker2MatcherProcessor sm = ParserChunker2MatcherProcessor
+ protected final BingQueryRunner yrunner = new BingQueryRunner();
+ final ParserChunker2MatcherProcessor sm = ParserChunker2MatcherProcessor
.getInstance();
- private PStemmer ps = new PStemmer();
- PageFetcher pFetcher = new PageFetcher();
+ private final PStemmer ps = new PStemmer();
+ final PageFetcher pFetcher = new PageFetcher();
public static final String[] frequentPerformingVerbs = {
" born raised meet learn ", " graduated enter discover",
@@ -62,19 +62,19 @@ public class StoryDiscourseNavigator {
yrunner.setKey("xdnRVcVf9m4vDvW1SkTAz5kS5DFYa19CrPYGelGJxnc");
List<HitBase> resultList = yrunner.runSearch(entity, 20);
HitBase h = null;
- for (int i = 0; i < resultList.size(); i++) {
- h = resultList.get(i);
- if (h.getUrl().indexOf("wikipedia.")>-1)
+ for (HitBase hitBase : resultList) {
+ h = hitBase;
+ if (h.getUrl().contains("wikipedia."))
break;
}
String content = pFetcher.fetchOrigHTML(h.getUrl());
content = content.replace("\"><a href=\"#", "&_&_&_&");
String[] portions = StringUtils.substringsBetween(content, "&_&_&_&", "\"><span");
- List<String> results = new ArrayList<String>();
- for(int i = 0; i< portions.length; i++){
- if (portions[i].indexOf("cite_note")>-1)
+ List<String> results = new ArrayList<>();
+ for (String portion : portions) {
+ if (portion.contains("cite_note"))
continue;
- results.add(entity + " " + portions[i].replace('_', ' ').replace('.',' '));
+ results.add(entity + " " + portion.replace('_', ' ').replace('.', ' '));
}
return results.toArray(new String[0]);
}
@@ -102,7 +102,7 @@ public class StoryDiscourseNavigator {
private List<List<ParseTreeChunk>> runSearchForTaxonomyPath(String query,
String domain, String lang, int numbOfHits) {
- List<List<ParseTreeChunk>> genResult = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> genResult = new ArrayList<>();
try {
List<HitBase> resultList = yrunner.runSearch(query, numbOfHits);
@@ -131,9 +131,9 @@ public class StoryDiscourseNavigator {
}
private List<List<String>> getCommonWordsFromList_List_ParseTreeChunk(
List<List<ParseTreeChunk>> matchList) {
- List<List<String>> res = new ArrayList<List<String>>();
+ List<List<String>> res = new ArrayList<>();
for (List<ParseTreeChunk> chunks : matchList) {
- List<String> wordRes = new ArrayList<String>();
+ List<String> wordRes = new ArrayList<>();
for (ParseTreeChunk ch : chunks) {
List<String> lemmas = ch.getLemmas();
for (int w = 0; w < lemmas.size(); w++)
@@ -146,12 +146,12 @@ public class StoryDiscourseNavigator {
wordRes.add(formedWord);
}
}
- wordRes = new ArrayList<String>(new HashSet<String>(wordRes));
+ wordRes = new ArrayList<>(new HashSet<>(wordRes));
if (wordRes.size() > 0) {
res.add(wordRes);
}
}
- res = new ArrayList<List<String>>(new HashSet<List<String>>(res));
+ res = new ArrayList<>(new HashSet<>(res));
return res;
}
public static void main(String[] args){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/WebSearchEngineResultsScraper.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/WebSearchEngineResultsScraper.java
index ad4bdda..f870259 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/WebSearchEngineResultsScraper.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/WebSearchEngineResultsScraper.java
@@ -38,7 +38,7 @@ public class WebSearchEngineResultsScraper {
protected static String fetchPageSearchEngine(String url) {
System.out.println("fetch url " + url);
String pageContent = null;
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
try {
URLConnection connection = new URL(url).openConnection();
connection.setReadTimeout(50000);
@@ -69,7 +69,7 @@ public class WebSearchEngineResultsScraper {
}
private static List<String> extractURLsFromPage(String content, String domain) {
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
if (content == null)
return results;
content = StringUtils.substringBetween(content, ">Advanced</a></div>",
@@ -94,7 +94,7 @@ public class WebSearchEngineResultsScraper {
}
private static List<HitBase> extractSearchResultFromPage(String content) {
- List<HitBase> results = new ArrayList<HitBase>();
+ List<HitBase> results = new ArrayList<>();
if (content == null)
return results;
content = StringUtils.substringBetween(content, "<div id=\"results",
@@ -141,17 +141,17 @@ public class WebSearchEngineResultsScraper {
}
public Set<String> getURLsForWebDomainIterations(String domain) {
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
List<String> res = extractURLsFromPage(
fetchPageSearchEngine(formRequestURL(domain)), domain);
for (String r : res)
results.addAll(extractURLsFromPage(fetchPageSearchEngine(formRequestURL(r)), r));
- return new HashSet<String>(results);
+ return new HashSet<>(results);
}
public List<HitBase> runSearch(String query) {
- List<HitBase> hits = new ArrayList<HitBase>();
+ List<HitBase> hits = new ArrayList<>();
/* Actual external web search is commented out
try {
String serp = fetchPageSearchEngine(formRequestURL(query));
@@ -183,7 +183,7 @@ public class WebSearchEngineResultsScraper {
System.out.println(scraper.runSearch("lady gaga in san francisco"));
}
- Map<String, String[][]> cachedSearchEngineData = new HashMap<String, String[][]>();
+ final Map<String, String[][]> cachedSearchEngineData = new HashMap<>();
private void buildCache(){
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/Comment.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/Comment.java
index 4ba6896..45f6657 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/Comment.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/Comment.java
@@ -34,8 +34,8 @@ import org.docx4j.wml.ObjectFactory;
public class Comment {
- private WordprocessingMLPackage wordMlPackage;
- private boolean relSet = false;
+ private final WordprocessingMLPackage wordMlPackage;
+ private final boolean relSet = false;
public Comment(WordprocessingMLPackage wordMLPack) {
this.wordMlPackage = wordMLPack;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/CommentsRel.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/CommentsRel.java
index f9870d1..a33521e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/CommentsRel.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/CommentsRel.java
@@ -20,11 +20,11 @@ import org.docx4j.wml.Comments;
public class CommentsRel {
- private WordprocessingMLPackage wordMlPackage;
- private MainDocumentPart mainPart;
- private boolean relSet = false;
- private org.docx4j.wml.ObjectFactory wmlObjectFactory;
- private CommentsPart cmPart;
+ private final WordprocessingMLPackage wordMlPackage;
+ private final MainDocumentPart mainPart;
+ private final boolean relSet = false;
+ private final org.docx4j.wml.ObjectFactory wmlObjectFactory;
+ private final CommentsPart cmPart;
public CommentsRel(WordprocessingMLPackage wordMLPack) {
@@ -77,7 +77,7 @@ public class CommentsRel {
// WordprocessingMLPackage wordML;
- public static void main(String args[]) throws IOException {
+ public static void main(String[] args) throws IOException {
File document = new File("C:/workspace/TestSolr/mydoc.docx");
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/ContentGeneratorRequestHandler.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/ContentGeneratorRequestHandler.java
index 08091ec..a40c0bb 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/ContentGeneratorRequestHandler.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/ContentGeneratorRequestHandler.java
@@ -109,7 +109,7 @@ public class ContentGeneratorRequestHandler extends SearchHandler {
try {
InputStreamReader isr = new InputStreamReader(mInputStream);
BufferedReader br = new BufferedReader(isr);
- String line = null;
+ String line;
while ((line = br.readLine()) != null) {
System.out.println(line);
}
@@ -142,7 +142,7 @@ public class ContentGeneratorRequestHandler extends SearchHandler {
//"xdnRVcVf9m4vDvW1SkTAz5kS5DFYa19CrPYGelGJxnc";
}
- RelatedSentenceFinder f = null;
+ RelatedSentenceFinder f;
String lang = args[6];
if (lang.startsWith("es") || lang.startsWith("ru") || lang.startsWith("de")){
f = new RelatedSentenceFinderML(Integer.parseInt(args[3]), Integer.parseInt(args[4]), Float.parseFloat(args[5]), bingKey);
@@ -154,7 +154,7 @@ public class ContentGeneratorRequestHandler extends SearchHandler {
else
f = new RelatedSentenceFinder();
String generatedContent = null;
- List<HitBase> hits = null;
+ List<HitBase> hits;
try {
hits = f.generateContentAbout(args[0].replace('+', ' ').replace('"', ' ').trim());
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/IterativeSearchRequestHandler.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/IterativeSearchRequestHandler.java
index 2e75a51..b1ece30 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/IterativeSearchRequestHandler.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/IterativeSearchRequestHandler.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -87,6 +86,7 @@ public class IterativeSearchRequestHandler extends SearchHandler {
return req;
}
+ @SuppressWarnings("unchecked")
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp){
SolrQueryResponse rsp1 = new SolrQueryResponse(), rsp2=new SolrQueryResponse(), rsp3=new SolrQueryResponse();
@@ -123,8 +123,9 @@ public class IterativeSearchRequestHandler extends SearchHandler {
rsp.setAllValues(rsp3.getValues());
}
+ @SuppressWarnings("unchecked")
public DocList filterResultsBySyntMatchReduceDocSet(DocList docList,
- SolrQueryRequest req, SolrParams params) {
+ SolrQueryRequest req, SolrParams params) {
//if (!docList.hasScores())
// return docList;
@@ -237,9 +238,8 @@ public class IterativeSearchRequestHandler extends SearchHandler {
// build and write response
float maxScore = 0.0F;
int numFound = 0;
- List<SolrDocument> slice = new ArrayList<SolrDocument>();
- for (Iterator<SolrDocument> it = results.iterator(); it.hasNext(); ) {
- SolrDocument sdoc = it.next();
+ List<SolrDocument> slice = new ArrayList<>();
+ for (SolrDocument sdoc : results) {
Float score = (Float) sdoc.getFieldValue("score");
if (maxScore < score) {
maxScore = score;
@@ -323,7 +323,8 @@ public class IterativeSearchRequestHandler extends SearchHandler {
alreadyFound.add(hit.doc);
}
}
- public class PairComparable implements Comparator<Pair> {
+ public static class PairComparable implements Comparator<Pair> {
+
@Override
public int compare(Pair o1, Pair o2) {
int b = -2;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/NLProgram2CodeRequestHandler.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/NLProgram2CodeRequestHandler.java
index a7785ac..0ed7350 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/NLProgram2CodeRequestHandler.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/NLProgram2CodeRequestHandler.java
@@ -39,7 +39,7 @@ public class NLProgram2CodeRequestHandler extends SearchHandler {
"C:/workspace/TestSolr/src/test/resources";
//"/data1/solr/example/src/test/resources";
- NL2Obj compiler = new NL2ObjCreateAssign(resourceDir);
+ final NL2Obj compiler = new NL2ObjCreateAssign(resourceDir);
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp){
// get query string
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SearchResultsReRankerRequestHandler.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SearchResultsReRankerRequestHandler.java
index de81497..b059d27 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SearchResultsReRankerRequestHandler.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SearchResultsReRankerRequestHandler.java
@@ -17,7 +17,6 @@
package opennlp.tools.similarity.apps.solr;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -66,7 +65,7 @@ public class SearchResultsReRankerRequestHandler extends SearchHandler {
keys.add(iter.next());
}
- List<HitBase> searchResults = new ArrayList<HitBase>();
+ List<HitBase> searchResults = new ArrayList<>();
@@ -109,7 +108,7 @@ public class SearchResultsReRankerRequestHandler extends SearchHandler {
}
- List<HitBase> reRankedResults = null;
+ List<HitBase> reRankedResults;
query = query.replace('+', ' ');
if (tooFewKeywords(query)|| orQuery(query)){
reRankedResults = searchResults;
@@ -138,7 +137,7 @@ public class SearchResultsReRankerRequestHandler extends SearchHandler {
scoreNum.add(hit.getSource(), hit.getGenerWithQueryScore());
}
- StringBuffer bufNums = new StringBuffer();
+ StringBuilder bufNums = new StringBuilder();
bufNums.append("order>");
for(HitBase hit: reRankedResults){
bufNums.append(hit.getSource()).append("_");
@@ -155,10 +154,7 @@ public class SearchResultsReRankerRequestHandler extends SearchHandler {
}
private boolean orQuery(String query) {
- if (query.indexOf('|')>-1)
- return true;
-
- return false;
+ return query.indexOf('|') > -1;
}
private boolean tooFewKeywords(String query) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SyntGenRequestHandler.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SyntGenRequestHandler.java
index 91cf253..4a25654 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SyntGenRequestHandler.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/SyntGenRequestHandler.java
@@ -136,7 +136,7 @@ public class SyntGenRequestHandler extends SearchHandler {
int[] docIDsHits = new int[len];
IndexReader indexReader = req.getSearcher().getIndexReader();
- List<Integer> bestMatchesDocIds = new ArrayList<>(); List<Float> bestMatchesScore = new ArrayList<Float>();
+ List<Integer> bestMatchesDocIds = new ArrayList<>(); List<Float> bestMatchesScore = new ArrayList<>();
List<Pair<Integer, Float>> docIdsScores = new ArrayList<> ();
try {
for (int i=0; i<docList.size(); ++i) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilder.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilder.java
index 1b9097a..d781f9e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilder.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilder.java
@@ -46,8 +46,8 @@ import opennlp.tools.similarity.apps.HitBase;
public class WordDocBuilder{
protected static final String IMG_REL_PATH = "images/";
- protected BingQueryRunner imageSearcher = new BingQueryRunner();
- protected String absPath = null;
+ protected final BingQueryRunner imageSearcher = new BingQueryRunner();
+ protected String absPath;
public WordDocBuilder(){
absPath = new File(".").getAbsolutePath();
@@ -192,7 +192,7 @@ public class WordDocBuilder{
}
byte[] bytes = new byte[(int)length];
int offset = 0;
- int numRead = 0;
+ int numRead;
while (offset < bytes.length && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) {
offset += numRead;
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderEndNotes.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderEndNotes.java
index 3791ab4..afe37fc 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderEndNotes.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderEndNotes.java
@@ -18,40 +18,21 @@ package opennlp.tools.similarity.apps.solr;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.JAXBException;
-import net.billylieurance.azuresearch.AzureSearchImageResult;
-import net.billylieurance.azuresearch.AzureSearchResultSet;
-import net.billylieurance.azuresearch.AzureSearchWebResult;
-
import org.apache.commons.lang.StringUtils;
import org.docx4j.XmlUtils;
-import org.docx4j.dml.wordprocessingDrawing.Inline;
import org.docx4j.jaxb.Context;
-import org.docx4j.openpackaging.exceptions.Docx4JException;
import org.docx4j.openpackaging.exceptions.InvalidFormatException;
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage;
import org.docx4j.openpackaging.parts.WordprocessingML.EndnotesPart;
import org.docx4j.wml.CTEndnotes;
import org.docx4j.wml.CTFtnEdn;
-import org.docx4j.wml.Drawing;
-import org.docx4j.wml.P;
-import org.docx4j.wml.R;
-import opennlp.tools.similarity.apps.BingQueryRunner;
import opennlp.tools.similarity.apps.Fragment;
import opennlp.tools.similarity.apps.HitBase;
@@ -194,11 +175,11 @@ public class WordDocBuilderEndNotes extends WordDocBuilderSingleImageSearchCall{
public static void main(String[] args){
WordDocBuilderEndNotes b = new WordDocBuilderEndNotes();
- List<HitBase> content = new ArrayList<HitBase>();
+ List<HitBase> content = new ArrayList<>();
for(int i = 0; i<10; i++){
HitBase h = new HitBase();
h.setTitle("albert einstein "+i);
- List<Fragment> frs = new ArrayList<Fragment>();
+ List<Fragment> frs = new ArrayList<>();
frs.add(new Fragment(" content "+i, 0));
h.setFragments(frs);
h.setUrl("http://www."+i+".com");
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderSingleImageSearchCall.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderSingleImageSearchCall.java
index 5218511..79aa5d1 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderSingleImageSearchCall.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/solr/WordDocBuilderSingleImageSearchCall.java
@@ -18,32 +18,18 @@ package opennlp.tools.similarity.apps.solr;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import net.billylieurance.azuresearch.AzureSearchImageResult;
import net.billylieurance.azuresearch.AzureSearchResultSet;
-import net.billylieurance.azuresearch.AzureSearchWebResult;
-import org.apache.commons.lang.StringUtils;
-//import org.docx4j.Docx4J;
-//import org.docx4j.convert.out.FOSettings;
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
import opennlp.tools.similarity.apps.ContentGeneratorSupport;
import opennlp.tools.similarity.apps.Fragment;
import opennlp.tools.similarity.apps.HitBase;
-
-
public class WordDocBuilderSingleImageSearchCall extends WordDocBuilder{
public String buildWordDoc(List<HitBase> content, String title){
@@ -129,8 +115,6 @@ public class WordDocBuilderSingleImageSearchCall extends WordDocBuilder{
try {
byte[] bytes = convertImageToByteArray(file);
addImageToPackage(wordMLPackage, bytes);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
@@ -138,7 +122,7 @@ public class WordDocBuilderSingleImageSearchCall extends WordDocBuilder{
}
protected List<String> getAllImageSearchResults(String title) {
- List<String> imageURLs = new ArrayList<String>();
+ List<String> imageURLs = new ArrayList<>();
AzureSearchResultSet<AzureSearchImageResult> res = imageSearcher.runImageSearch(title);
for(AzureSearchImageResult imResult: res){
imageURLs.add(imResult.getMediaUrl());
@@ -150,11 +134,11 @@ public class WordDocBuilderSingleImageSearchCall extends WordDocBuilder{
public static void main(String[] args){
WordDocBuilderSingleImageSearchCall b = new WordDocBuilderSingleImageSearchCall();
- List<HitBase> content = new ArrayList<HitBase>();
+ List<HitBase> content = new ArrayList<>();
for(int i = 0; i<10; i++){
HitBase h = new HitBase();
h.setTitle("albert einstein "+i);
- List<Fragment> frs = new ArrayList<Fragment>();
+ List<Fragment> frs = new ArrayList<>();
frs.add(new Fragment(" content "+i, 0));
h.setFragments(frs);
content.add(h);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/AriAdapter.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/AriAdapter.java
index 50a36fd..be68796 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/AriAdapter.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/AriAdapter.java
@@ -32,7 +32,7 @@ import java.util.Map;
*/
public class AriAdapter {
// income_taks(state,company(cafeteria,_)):-do(71100).
- Map<String, List<List<String>>> lemma_AssocWords = new HashMap<String, List<List<String>>>();
+ final Map<String, List<List<String>>> lemma_AssocWords = new HashMap<>();
public void getChainsFromARIfile(String fileName) {
@@ -51,12 +51,12 @@ public class AriAdapter {
.replace('.', '&').replace("&&&", "&").replace("&&", "&")
.replace("&", " ");
String[] chains = chain0.split(" ");
- List<String> chainList = new ArrayList<String>(); // Arrays.asList(chains);
+ List<String> chainList = new ArrayList<>(); // Arrays.asList(chains);
for (String word : chains) {
- if (word != null && word.length() > 2 && word.indexOf("0") < 0
- && word.indexOf("1") < 0 && word.indexOf("2") < 0
- && word.indexOf("3") < 0 && word.indexOf("4") < 0
- && word.indexOf("5") < 0)
+ if (word != null && word.length() > 2 && !word.contains("0")
+ && !word.contains("1") && !word.contains("2")
+ && !word.contains("3") && !word.contains("4")
+ && !word.contains("5"))
chainList.add(word);
}
if (chains.length < 1 || chainList.size() < 1
@@ -68,7 +68,7 @@ public class AriAdapter {
chainList.remove(entry);
List<List<String>> res = lemma_AssocWords.get(entry);
if (res == null) {
- List<List<String>> resList = new ArrayList<List<String>>();
+ List<List<String>> resList = new ArrayList<>();
resList.add(chainList);
lemma_AssocWords.put(entry, resList);
} else {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/CsvAdapter.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/CsvAdapter.java
index 8d718f3..d8bf2e0 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/CsvAdapter.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/CsvAdapter.java
@@ -26,8 +26,9 @@ import java.util.Map;
import opennlp.tools.jsmlearning.ProfileReaderWriter;
public class CsvAdapter {
- Map<String, List<List<String>>> lemma_AssocWords = new HashMap<String, List<List<String>>>();
- private String resourceDir=null, fileNameToImport = null;
+ final Map<String, List<List<String>>> lemma_AssocWords = new HashMap<>();
+ private String resourceDir = null;
+ private final String fileNameToImport;
public CsvAdapter(){
if (resourceDir==null)
@@ -44,8 +45,8 @@ public class CsvAdapter {
String topNode=null;
for(String[] line: lines){
String line0 = extractEntity(line[0]).toLowerCase();
- List<String> path = new ArrayList<String>();
- List<List<String>> paths = new ArrayList<List<String>>();
+ List<String> path = new ArrayList<>();
+ List<List<String>> paths = new ArrayList<>();
if (line[1]!=null && line[1].equals("1")){
topNode = line0;
} else {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/DomainTaxonomyExtender.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/DomainTaxonomyExtender.java
index 45ca419..9f6a11f 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/DomainTaxonomyExtender.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/DomainTaxonomyExtender.java
@@ -40,22 +40,22 @@ import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcess
*/
public class DomainTaxonomyExtender {
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.taxo_builder.DomainTaxonomyExtender");
- private BingQueryRunner brunner = new BingQueryRunner();
- private ParserChunker2MatcherProcessor matcher = ParserChunker2MatcherProcessor.getInstance();
+ private final BingQueryRunner brunner = new BingQueryRunner();
+ private final ParserChunker2MatcherProcessor matcher = ParserChunker2MatcherProcessor.getInstance();
- protected static String BING_KEY = "WFoNMM706MMJ5JYfcHaSEDP+faHj3xAxt28CPljUAHA";
+ protected static final String BING_KEY = "WFoNMM706MMJ5JYfcHaSEDP+faHj3xAxt28CPljUAHA";
private final static String TAXO_FILENAME = "taxo_data.dat";
- private Map<String, List<List<String>>> lemma_ExtendedAssocWords = new HashMap<String, List<List<String>>>();
- private Map<List<String>, List<List<String>>> assocWords_ExtendedAssocWords = new HashMap<List<String>, List<List<String>>>();
- private PStemmer ps;
+ private Map<String, List<List<String>>> lemma_ExtendedAssocWords = new HashMap<>();
+ private final Map<List<String>, List<List<String>>> assocWords_ExtendedAssocWords = new HashMap<>();
+ private final PStemmer ps;
- CsvAdapter adapter = new CsvAdapter();
+ final CsvAdapter adapter = new CsvAdapter();
public Map<List<String>, List<List<String>>> getAssocWords_ExtendedAssocWords() {
return assocWords_ExtendedAssocWords;
@@ -79,9 +79,9 @@ public class DomainTaxonomyExtender {
private List<List<String>> getCommonWordsFromList_List_ParseTreeChunk(
List<List<ParseTreeChunk>> matchList, List<String> queryWordsToRemove,
List<String> toAddAtEnd) {
- List<List<String>> res = new ArrayList<List<String>>();
+ List<List<String>> res = new ArrayList<>();
for (List<ParseTreeChunk> chunks : matchList) {
- List<String> wordRes = new ArrayList<String>();
+ List<String> wordRes = new ArrayList<>();
for (ParseTreeChunk ch : chunks) {
List<String> lemmas = ch.getLemmas();
for (int w = 0; w < lemmas.size(); w++)
@@ -94,8 +94,8 @@ public class DomainTaxonomyExtender {
wordRes.add(formedWord);
}
}
- wordRes = new ArrayList<String>(new HashSet<String>(wordRes));
- List<String> cleanedRes = new ArrayList<String>();
+ wordRes = new ArrayList<>(new HashSet<>(wordRes));
+ List<String> cleanedRes = new ArrayList<>();
for(String s: wordRes){
if (!queryWordsToRemove.contains(s))
cleanedRes .add(s);
@@ -106,14 +106,14 @@ public class DomainTaxonomyExtender {
res.add(cleanedRes);
}
}
- res = new ArrayList<List<String>>(new HashSet<List<String>>(res));
+ res = new ArrayList<>(new HashSet<>(res));
return res;
}
public void extendTaxonomy(String fileNameWithTaxonomyRoot, String domain, String lang) {
- List<String> entries = new ArrayList<String>((adapter.lemma_AssocWords.keySet()));
+ List<String> entries = new ArrayList<>((adapter.lemma_AssocWords.keySet()));
try {
for (String entity : entries) { // .
List<List<String>> paths = adapter.lemma_AssocWords.get(entity);
@@ -123,7 +123,7 @@ public class DomainTaxonomyExtender {
.replace('_', ' ');
List<List<ParseTreeChunk>> matchList = runSearchForTaxonomyPath(
query, "", lang, 20); //30
- List<String> toRemoveFromExtension = new ArrayList<String>(taxoPath);
+ List<String> toRemoveFromExtension = new ArrayList<>(taxoPath);
toRemoveFromExtension.add(entity);
toRemoveFromExtension.add(domain);
List<List<String>> resList = getCommonWordsFromList_List_ParseTreeChunk(
@@ -147,7 +147,7 @@ public class DomainTaxonomyExtender {
public List<List<ParseTreeChunk>> runSearchForTaxonomyPath(String query,
String domain, String lang, int numbOfHits) {
- List<List<ParseTreeChunk>> genResult = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> genResult = new ArrayList<>();
try {
List<HitBase> resultList = brunner.runSearch(query, numbOfHits);
@@ -176,7 +176,7 @@ public class DomainTaxonomyExtender {
public List<String> runSearchForTaxonomyPathFlatten(String query,
String domain, String lang, int numbOfHits) {
- List<String> genResult = new ArrayList<String>();
+ List<String> genResult = new ArrayList<>();
try {
List<HitBase> resultList = brunner.runSearch(query, numbOfHits);
@@ -205,7 +205,7 @@ public class DomainTaxonomyExtender {
private List<String> assessKeywordOverlap(String snapshot1, String snapshot2) {
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
List<String> firstList = TextProcessor.fastTokenize(snapshot1, false),
secondList = TextProcessor.fastTokenize(snapshot2, false);
firstList.retainAll(secondList);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxoQuerySnapshotMatcher.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxoQuerySnapshotMatcher.java
index f605555..efb2687 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxoQuerySnapshotMatcher.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxoQuerySnapshotMatcher.java
@@ -20,12 +20,10 @@ package opennlp.tools.similarity.apps.taxo_builder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
-import opennlp.tools.similarity.apps.utils.FileHandler;
import opennlp.tools.textsimilarity.TextProcessor;
import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcessor;
@@ -38,11 +36,11 @@ import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcess
*/
public class TaxoQuerySnapshotMatcher {
- ParserChunker2MatcherProcessor sm;
+ final ParserChunker2MatcherProcessor sm;
// XStream xStream= new XStream();
Map<String, List<List<String>>> lemma_ExtendedAssocWords;
- TaxonomySerializer taxo;
- private static Logger LOG = Logger
+ final TaxonomySerializer taxo;
+ private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.taxo_builder.TaxoQuerySnapshotMatcher");
public TaxoQuerySnapshotMatcher(String taxoFileName) {
@@ -67,7 +65,7 @@ public class TaxoQuerySnapshotMatcher {
query = query.toLowerCase();
snapshot = snapshot.toLowerCase();
- String[] queryWords = null, snapshotWords = null;
+ String[] queryWords, snapshotWords;
try {
queryWords = sm.getTokenizer().tokenize(query);
snapshotWords = sm.getTokenizer().tokenize(snapshot);
@@ -79,18 +77,18 @@ public class TaxoQuerySnapshotMatcher {
List<String> queryList = Arrays.asList(queryWords);
List<String> snapshotList = Arrays.asList(snapshotWords);
- List<String> commonBetweenQuerySnapshot = (new ArrayList<String>(queryList));
+ List<String> commonBetweenQuerySnapshot = (new ArrayList<>(queryList));
commonBetweenQuerySnapshot.retainAll(snapshotList);// Still could be
// duplicated words (even
// more if I would retain
// all the opposite ways)
int score = 0;
- List<String> accumCommonParams = new ArrayList<String>();
+ List<String> accumCommonParams = new ArrayList<>();
for (String qWord : commonBetweenQuerySnapshot) {
if (!lemma_ExtendedAssocWords.containsKey(qWord))
continue;
- List<List<String>> foundParams = new ArrayList<List<String>>();
+ List<List<String>> foundParams;
foundParams = lemma_ExtendedAssocWords.get(qWord);
for (List<String> paramsForGivenMeaning : foundParams) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomyExtenderViaMebMining.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomyExtenderViaMebMining.java
index 3a77f8c..64a65de 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomyExtenderViaMebMining.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomyExtenderViaMebMining.java
@@ -42,14 +42,14 @@ import opennlp.tools.textsimilarity.chunker2matcher.ParserChunker2MatcherProcess
*/
public class TaxonomyExtenderViaMebMining extends BingQueryRunner {
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.taxo_builder.TaxonomyExtenderSearchResultFromYahoo");
- private ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
+ private final ParseTreeChunkListScorer parseTreeChunkListScorer = new ParseTreeChunkListScorer();
ParserChunker2MatcherProcessor sm;
- private Map<String, List<List<String>>> lemma_ExtendedAssocWords = new HashMap<String, List<List<String>>>();
- private Map<List<String>, List<List<String>>> assocWords_ExtendedAssocWords = new HashMap<List<String>, List<List<String>>>();
- private PStemmer ps;
+ private Map<String, List<List<String>>> lemma_ExtendedAssocWords = new HashMap<>();
+ private final Map<List<String>, List<List<String>>> assocWords_ExtendedAssocWords = new HashMap<>();
+ private final PStemmer ps;
public Map<List<String>, List<List<String>>> getAssocWords_ExtendedAssocWords() {
return assocWords_ExtendedAssocWords;
@@ -78,9 +78,9 @@ public class TaxonomyExtenderViaMebMining extends BingQueryRunner {
private List<List<String>> getCommonWordsFromList_List_ParseTreeChunk(
List<List<ParseTreeChunk>> matchList, List<String> queryWordsToRemove,
List<String> toAddAtEnd) {
- List<List<String>> res = new ArrayList<List<String>>();
+ List<List<String>> res = new ArrayList<>();
for (List<ParseTreeChunk> chunks : matchList) {
- List<String> wordRes = new ArrayList<String>();
+ List<String> wordRes = new ArrayList<>();
for (ParseTreeChunk ch : chunks) {
List<String> lemmas = ch.getLemmas();
for (int w = 0; w < lemmas.size(); w++)
@@ -93,21 +93,21 @@ public class TaxonomyExtenderViaMebMining extends BingQueryRunner {
wordRes.add(formedWord);
}
}
- wordRes = new ArrayList<String>(new HashSet<String>(wordRes));
+ wordRes = new ArrayList<>(new HashSet<>(wordRes));
wordRes.removeAll(queryWordsToRemove);
if (wordRes.size() > 0) {
wordRes.addAll(toAddAtEnd);
res.add(wordRes);
}
}
- res = new ArrayList<List<String>>(new HashSet<List<String>>(res));
+ res = new ArrayList<>(new HashSet<>(res));
return res;
}
public void extendTaxonomy(String fileName, String domain, String lang) {
AriAdapter ad = new AriAdapter();
ad.getChainsFromARIfile(fileName);
- List<String> entries = new ArrayList<String>((ad.lemma_AssocWords.keySet()));
+ List<String> entries = new ArrayList<>((ad.lemma_AssocWords.keySet()));
try {
for (String entity : entries) { // .
List<List<String>> paths = ad.lemma_AssocWords.get(entity);
@@ -121,7 +121,7 @@ public class TaxonomyExtenderViaMebMining extends BingQueryRunner {
.replace('_', ' ');
List<List<ParseTreeChunk>> matchList = runSearchForTaxonomyPath(
query, "", lang, 30);
- List<String> toRemoveFromExtension = new ArrayList<String>(taxoPath);
+ List<String> toRemoveFromExtension = new ArrayList<>(taxoPath);
toRemoveFromExtension.add(entity);
toRemoveFromExtension.add(domain);
List<List<String>> resList = getCommonWordsFromList_List_ParseTreeChunk(
@@ -142,7 +142,7 @@ public class TaxonomyExtenderViaMebMining extends BingQueryRunner {
public List<List<ParseTreeChunk>> runSearchForTaxonomyPath(String query,
String domain, String lang, int numbOfHits) {
- List<List<ParseTreeChunk>> genResult = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> genResult = new ArrayList<>();
try {
List<HitBase> resultList = runSearch(query, numbOfHits);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomySerializer.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomySerializer.java
index 0fc1387..445b62c 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomySerializer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/taxo_builder/TaxonomySerializer.java
@@ -38,8 +38,8 @@ import opennlp.tools.jsmlearning.ProfileReaderWriter;
public class TaxonomySerializer implements Serializable {
private static final long serialVersionUID = 7431412616514648388L;
- private Map<String, List<List<String>>> lemma_ExtendedAssocWords = new HashMap<String, List<List<String>>>();
- private Map<List<String>, List<List<String>>> assocWords_ExtendedAssocWords = new HashMap<List<String>, List<List<String>>>();
+ private Map<String, List<List<String>>> lemma_ExtendedAssocWords = new HashMap<>();
+ private Map<List<String>, List<List<String>>> assocWords_ExtendedAssocWords = new HashMap<>();
public TaxonomySerializer(
Map<String, List<List<String>>> lemma_ExtendedAssocWords,
@@ -71,8 +71,8 @@ public class TaxonomySerializer implements Serializable {
}
public void writeTaxonomy(String filename) {
- FileOutputStream fos = null;
- ObjectOutputStream out = null;
+ FileOutputStream fos;
+ ObjectOutputStream out;
try {
fos = new FileOutputStream(filename);
out = new ObjectOutputStream(fos);
@@ -83,10 +83,10 @@ public class TaxonomySerializer implements Serializable {
}
String csvFilename = filename+".csv";
- List<String[]> taxo_list = new ArrayList<String[]>();
- List<String> entries = new ArrayList<String>(lemma_ExtendedAssocWords.keySet());
+ List<String[]> taxo_list = new ArrayList<>();
+ List<String> entries = new ArrayList<>(lemma_ExtendedAssocWords.keySet());
for(String e: entries){
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
lines.add(e);
for(List<String> ls: lemma_ExtendedAssocWords.get(e)){
lines.add(ls.toString());
@@ -96,10 +96,10 @@ public class TaxonomySerializer implements Serializable {
ProfileReaderWriter.writeReport(taxo_list, csvFilename);
String csvFilenameListEntries = filename+"_ListEntries.csv";
- taxo_list = new ArrayList<String[]>();
- List<List<String>> entriesList = new ArrayList<List<String>>( assocWords_ExtendedAssocWords.keySet());
+ taxo_list = new ArrayList<>();
+ List<List<String>> entriesList = new ArrayList<>(assocWords_ExtendedAssocWords.keySet());
for(List<String> e: entriesList){
- List<String> lines = new ArrayList<String>(e);
+ List<String> lines = new ArrayList<>(e);
for(List<String> ls: assocWords_ExtendedAssocWords.get(e)){
lines.add(ls.toString());
}
@@ -110,16 +110,14 @@ public class TaxonomySerializer implements Serializable {
public static TaxonomySerializer readTaxonomy(String filename) {
TaxonomySerializer data = null;
- FileInputStream fis = null;
- ObjectInputStream in = null;
+ FileInputStream fis;
+ ObjectInputStream in;
try {
fis = new FileInputStream(filename);
in = new ObjectInputStream(fis);
data = (TaxonomySerializer) in.readObject();
in.close();
- } catch (IOException ex) {
- ex.printStackTrace();
- } catch (ClassNotFoundException ex) {
+ } catch (IOException | ClassNotFoundException ex) {
ex.printStackTrace();
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/CountItemsList.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/CountItemsList.java
index 8705675..541d766 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/CountItemsList.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/CountItemsList.java
@@ -30,7 +30,7 @@ public class CountItemsList<E> extends ArrayList<E> {
private static final long serialVersionUID = 1L;
// This is private. It is not visible from outside.
- private Map<E, Integer> count = new HashMap<E, Integer>();
+ private final Map<E, Integer> count = new HashMap<>();
// There are several entry points to this class
// this is just to show one of them.
@@ -54,7 +54,7 @@ public class CountItemsList<E> extends ArrayList<E> {
public List<E> getFrequentTags() {
Map<E, Integer> sortedMap = ValueSortMap.sortMapByValue(count, false);
- List<E> vals = new ArrayList<E>(sortedMap.keySet());
+ List<E> vals = new ArrayList<>(sortedMap.keySet());
if (vals.size() > 3) {
vals = vals.subList(0, 3);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/FileHandler.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/FileHandler.java
index 3604234..67c65ff 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/FileHandler.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/FileHandler.java
@@ -42,7 +42,7 @@ import java.util.logging.Logger;
*/
public class FileHandler {
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger("opennlp.tools.similarity.apps.utils.FileHandler");
public void writeToTextFile(String data, String filepath, boolean append)
@@ -93,7 +93,7 @@ public class FileHandler {
if (!isFileOrDirectoryExists(getDirPathfromFullPath(filepath))) {
createFolder(getDirPathfromFullPath(filepath));
}
- ObjectOutputStream outputStream = null;
+ ObjectOutputStream outputStream;
try {
outputStream = new ObjectOutputStream(new FileOutputStream(filepath));
outputStream.writeObject(obj);
@@ -107,18 +107,14 @@ public class FileHandler {
try {
// Construct the ObjectInputStream object
inputStream = new ObjectInputStream(new FileInputStream(filePath));
- Object obj = null;
+ Object obj;
while ((obj = inputStream.readObject()) != null) {
return obj;
}
} catch (EOFException ex) { // This exception will be caught when EOF is
// reached
- LOG.severe("End of file reached.\n" + ex.toString());
- } catch (ClassNotFoundException ex) {
- LOG.severe(ex.toString());
- } catch (FileNotFoundException ex) {
- LOG.severe(ex.toString());
- } catch (IOException ex) {
+ LOG.severe("End of file reached.\n" + ex);
+ } catch (ClassNotFoundException | IOException ex) {
LOG.severe(ex.toString());
} finally {
// Close the ObjectInputStream
@@ -150,8 +146,7 @@ public class FileHandler {
oos.flush();
oos.close();
bos.close();
- byte[] data = bos.toByteArray();
- return data;
+ return bos.toByteArray();
}
/**
@@ -170,9 +165,8 @@ public class FileHandler {
// TODO be sure that the default encoding is OK!!!!! Otherwise
// change it
- BufferedReader input = new BufferedReader(new FileReader(aFile));
- try {
- String line = null; // not declared within while loop
+ try (BufferedReader input = new BufferedReader(new FileReader(aFile))) {
+ String line; // not declared within while loop
/*
* readLine is a bit quirky : it returns the content of a line MINUS the
* newline. it returns null only for the END of the stream. it returns
@@ -182,8 +176,6 @@ public class FileHandler {
contents.append(line);
contents.append(System.getProperty("line.separator"));
}
- } finally {
- input.close();
}
} catch (IOException ex) {
LOG.severe("fileName: " + filePath +"\n " + ex);
@@ -199,7 +191,7 @@ public class FileHandler {
* @return
*/
public List<String> readLinesFromTextFile(String filePath) {
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
// ...checks on aFile are edited
File aFile = new File(filePath);
try {
@@ -210,7 +202,7 @@ public class FileHandler {
BufferedReader input = new BufferedReader(new FileReader(aFile));
try {
- String line = null; // not declared within while loop
+ String line; // not declared within while loop
/*
* readLine is a bit quirky : it returns the content of a line MINUS the
* newline. it returns null only for the END of the stream. it returns
@@ -229,10 +221,8 @@ public class FileHandler {
}
private void appendtofile(String data, String filePath) {
- try {
- BufferedWriter out = new BufferedWriter(new FileWriter(filePath, true));
+ try (BufferedWriter out = new BufferedWriter(new FileWriter(filePath, true))) {
out.write(data + "\n");
- out.close();
} catch (IOException e) {
}
}
@@ -250,8 +240,7 @@ public class FileHandler {
public boolean isFileOrDirectoryExists(String path) {
File file = new File(path);
- boolean exists = file.exists();
- return exists;
+ return file.exists();
}
/**
@@ -263,7 +252,7 @@ public class FileHandler {
private String getDirPathfromFullPath(String filePath) {
String dirPath = "";
if (filePath != null) {
- if (filePath != "" && filePath.contains("\\"))
+ if (filePath.contains("\\"))
dirPath = filePath.substring(0, filePath.lastIndexOf("\\"));
}
return dirPath;
@@ -277,15 +266,15 @@ public class FileHandler {
* @return
*/
public ArrayList<String> getFileNamesInFolder(String dirPath) {
- ArrayList<String> fileNames = new ArrayList<String>();
+ ArrayList<String> fileNames = new ArrayList<>();
File folder = new File(dirPath);
File[] listOfFiles = folder.listFiles();
- for (int i = 0; i < listOfFiles.length; i++) {
- if (listOfFiles[i].isFile()) {
- fileNames.add(listOfFiles[i].getName());
- } else if (listOfFiles[i].isDirectory()) {
+ for (File listOfFile : listOfFiles) {
+ if (listOfFile.isFile()) {
+ fileNames.add(listOfFile.getName());
+ } else if (listOfFile.isDirectory()) {
// TODO if I want to use it recursive I should handle this case
}
}
@@ -295,12 +284,12 @@ public class FileHandler {
public void deleteAllfilesinDir(String dirName) {
ArrayList<String> fileNameList = getFileNamesInFolder(dirName);
if (fileNameList != null) {
- for (int i = 0; i < fileNameList.size(); i++) {
+ for (String s : fileNameList) {
try {
- deleteFile(dirName + fileNameList.get(i));
+ deleteFile(dirName + s);
} catch (IllegalArgumentException e) {
- LOG.severe("No way to delete file: " + dirName + fileNameList.get(i) + "\n"+
- e);
+ LOG.severe("No way to delete file: " + dirName + s + "\n" +
+ e);
}
}
}
@@ -332,11 +321,11 @@ public class FileHandler {
public boolean deleteDirectory(File path) {
if (path.exists()) {
File[] files = path.listFiles();
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory()) {
- deleteDirectory(files[i]);
+ for (File file : files) {
+ if (file.isDirectory()) {
+ deleteDirectory(file);
} else {
- files[i].delete();
+ file.delete();
}
}
}
@@ -350,16 +339,16 @@ public class FileHandler {
* @return
*/
public ArrayList<String> getFilePathsInFolder(String dirPath) {
- ArrayList<String> filePaths = new ArrayList<String>();
+ ArrayList<String> filePaths = new ArrayList<>();
File folder = new File(dirPath);
File[] listOfFiles = folder.listFiles();
if (listOfFiles == null)
return null;
- for (int i = 0; i < listOfFiles.length; i++) {
- if (listOfFiles[i].isFile()) {
- filePaths.add(listOfFiles[i].getAbsolutePath());
- } else if (listOfFiles[i].isDirectory()) {
+ for (File listOfFile : listOfFiles) {
+ if (listOfFile.isFile()) {
+ filePaths.add(listOfFile.getAbsolutePath());
+ } else if (listOfFile.isDirectory()) {
// TODO if I want to use it recursive I should handle this case
}
}
@@ -373,7 +362,7 @@ public class FileHandler {
* @return
*/
public int getFileNumInFolder(String dirPath) {
- int num = 0;
+ int num;
try {
num = getFileNamesInFolder(dirPath).size();
} catch (Exception e) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/LevensteinDistanceFinder.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/LevensteinDistanceFinder.java
index 7848371..d7a8f05 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/LevensteinDistanceFinder.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/LevensteinDistanceFinder.java
@@ -65,7 +65,7 @@ public class LevensteinDistanceFinder {
cost = digitInsDelCost;
}
upper[j] = upper[j - 1] + cost;
- int min = 0;
+ int min;
for (int i = 1; i < length1; i++) {
cost = letterInsDelCost; // 1 is a cost for inserting a character
if (Character.isDigit(str1.charAt(i - 1))) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/PageFetcher.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/PageFetcher.java
index aaf66f6..1355d8c 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/PageFetcher.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/PageFetcher.java
@@ -98,7 +98,7 @@ public class PageFetcher {
public String fetchOrigHTML(String url) {
log.info("fetch url " + url);
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
try {
URLConnection connection = new URL(url).openConnection();
connection.setReadTimeout(DEFAULT_TIMEOUT);
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Pair.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Pair.java
index f5f2d90..1aa814d 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Pair.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Pair.java
@@ -19,8 +19,6 @@ package opennlp.tools.similarity.apps.utils;
import java.util.Comparator;
-import opennlp.tools.similarity.apps.HitBase;
-
/**
* Generic pair class for holding two objects. Often used as return object.
*
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/StringDistanceMeasurer.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/StringDistanceMeasurer.java
index bca875b..4f2e17f 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/StringDistanceMeasurer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/StringDistanceMeasurer.java
@@ -24,11 +24,11 @@ import opennlp.tools.stemmer.PStemmer;
public class StringDistanceMeasurer {
// external tools
- private PStemmer ps; // stemmer
+ private final PStemmer ps; // stemmer
private static final int MIN_STRING_LENGTH_FOR_WORD = 4;
- protected int MIN_STRING_LENGTH_FOR_DISTORTED_WORD = 6;
+ protected final int MIN_STRING_LENGTH_FOR_DISTORTED_WORD = 6;
protected static final int ACCEPTABLE_DEVIATION_IN_CHAR = 2;
@@ -44,7 +44,7 @@ public class StringDistanceMeasurer {
// gets string array and process numbers, applies stemming and forms a list
protected List<String> filterWordArray(String[] strWords) {
- List<String> strList = new ArrayList<String>();
+ List<String> strList = new ArrayList<>();
for (String w : strWords) {
Boolean bInteger = true;
try {
@@ -70,7 +70,7 @@ public class StringDistanceMeasurer {
}
protected List<String> filterWordArrayNoStem(String[] strWords) {
- List<String> strList = new ArrayList<String>();
+ List<String> strList = new ArrayList<>();
for (String w : strWords) {
Boolean bInteger = true;
try {
@@ -93,7 +93,7 @@ public class StringDistanceMeasurer {
// main entry point. Gets two strings and applies string match
// and also linguistic match if score > a threshold
public double measureStringDistance(String str1, String str2) {
- double result = -1.0;
+ double result;
try {
str1 = StringCleaner.processSnapshotForMatching(str1);
str2 = StringCleaner.processSnapshotForMatching(str2);
@@ -112,7 +112,7 @@ public class StringDistanceMeasurer {
l2 = str2Words.length;
int lOverlap = 0;
- List<String> strListOverlap = new ArrayList<String>(str1List);
+ List<String> strListOverlap = new ArrayList<>(str1List);
strListOverlap.retainAll(str2List);
for (String w : strListOverlap) {
if (w.toLowerCase().equals(w)) // no special interest word
@@ -169,7 +169,7 @@ public class StringDistanceMeasurer {
}
public double measureStringDistanceNoStemming(String str1, String str2) {
- double result = -1.0;
+ double result;
try {
str1 = StringCleaner.processSnapshotForMatching(str1);
str2 = StringCleaner.processSnapshotForMatching(str2);
@@ -188,7 +188,7 @@ public class StringDistanceMeasurer {
l2 = str2Words.length;
int lOverlap = 0;
- List<String> strListOverlap = new ArrayList<String>(str1List);
+ List<String> strListOverlap = new ArrayList<>(str1List);
strListOverlap.retainAll(str2List);
for (String w : strListOverlap) {
if (w.toLowerCase().equals(w)) // no special interest word
@@ -293,7 +293,7 @@ public class StringDistanceMeasurer {
// common sub-chunk = [NN-defence NN-minister ]
- List<Double> matchRes = new ArrayList<Double>();
+ List<Double> matchRes = new ArrayList<>();
matchRes.add(meas.measureStringDistance(sent2a, sent2b));
matchRes.add(meas.measureStringDistance(sent4a, sent4b));
matchRes.add(meas.measureStringDistance(sent5a, sent5b));
@@ -304,7 +304,7 @@ public class StringDistanceMeasurer {
// [0.8178702752867737, 0.21082473737065027, 0.27594593229224296,
// 0.7517586466500455, 0.9100766715907641]
- matchRes = new ArrayList<Double>();
+ matchRes = new ArrayList<>();
matchRes.add(meas.measureStringDistance(sent8a, sent8b));
matchRes.add(meas.measureStringDistance(sent8a, sent8c));
matchRes.add(meas.measureStringDistance(sent8a, sent8d));
@@ -317,7 +317,7 @@ public class StringDistanceMeasurer {
// 0.48044977359257246, 0.27594593229224296,
// 0.6391010941257969]
- matchRes = new ArrayList<Double>();
+ matchRes = new ArrayList<>();
// to verify that the same sentence gives 1
matchRes.add(meas.measureStringDistance(sent8dd, sent8d));
// to verify that totally different sentences give 0
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Utils.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Utils.java
index 30d609b..23198fc 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Utils.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/Utils.java
@@ -219,9 +219,9 @@ public class Utils {
}
public static class KeyValue {
- public Object key = null;
+ public final Object key;
- public float value = 0;
+ public final float value;
public KeyValue(Object o, Float i) {
this.key = o;
@@ -229,14 +229,10 @@ public class Utils {
}
public static class SortByValue implements Comparator<KeyValue> {
+
@Override
public int compare(KeyValue obj1, KeyValue obj2) {
- float i1 = obj1.value;
- float i2 = obj2.value;
-
- if (i1 < i2)
- return 1;
- return -1;
+ return Float.compare(obj1.value, obj2.value);
}
}
}
@@ -328,7 +324,7 @@ public class Utils {
}
public static ArrayList<KeyValue> sortByValue(HashMap<Object, Float> h) {
- ArrayList<KeyValue> res = new ArrayList<KeyValue>();
+ ArrayList<KeyValue> res = new ArrayList<>();
for (Object o : h.keySet()) {
// form a pair
res.add(new KeyValue(o, h.get(o)));
@@ -578,7 +574,7 @@ public class Utils {
}
public static String truncateOnSpace(String text, Integer length) {
- String retVal = "";
+ String retVal;
if (text.length() <= length) {
retVal = text;
} else {
@@ -650,7 +646,7 @@ public class Utils {
public static float computeScoreForRanking(List<Float> scores,
int desiredRanking) {
- float newScore = 0f;
+ float newScore;
if (desiredRanking == 1) {
newScore = scores.get(0) + 50000;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/ValueSortMap.java b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/ValueSortMap.java
index e3587c2..0788952 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/ValueSortMap.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/similarity/apps/utils/ValueSortMap.java
@@ -140,8 +140,8 @@ public class ValueSortMap {
if (ascendingOrder == null) {
// If Boolean ascendingOrder is null, use passed comparator for order of
// sorting values
- Collections.sort(valueList, comparator);
- } else if (ascendingOrder.booleanValue()) {
+ valueList.sort(comparator);
+ } else if (ascendingOrder) {
// If Boolean ascendingOrder is not null and is true, sort values in
// ascending order
Collections.sort(valueList);
@@ -158,9 +158,9 @@ public class ValueSortMap {
if (iSize != (distinctValues.size() + iNullValueCount))
bAllDistinct = false;
- Object key = null, value = null, sortedValue;
- Set keySet = null;
- Iterator itKeyList = null;
+ Object key, value, sortedValue;
+ Set keySet;
+ Iterator itKeyList;
HashMap hmTmpMap = new HashMap(iSize);
HashMap hmNullValueMap = new HashMap();
@@ -180,21 +180,21 @@ public class ValueSortMap {
// Map
}
- if (ascendingOrder != null && !ascendingOrder.booleanValue()) {
+ if (ascendingOrder != null && !ascendingOrder) {
// As it is descending order, Add Null Values in first place of the
// LinkedHasMap
sortedMap.putAll(hmNullValueMap);
}
// Put all not null values in returning LinkedHashMap
- for (int i = 0; i < valueList.size(); i++) {
- value = valueList.get(i);
+ for (Object o : valueList) {
+ value = o;
key = hmTmpMap.get(value);
sortedMap.put(key, value);
}
- if (ascendingOrder == null || ascendingOrder.booleanValue()) {
+ if (ascendingOrder == null || ascendingOrder) {
// Add Null Values in the last of the LinkedHasMap
sortedMap.putAll(hmNullValueMap);
}
@@ -214,15 +214,15 @@ public class ValueSortMap {
// Map
}
- if (ascendingOrder != null && !ascendingOrder.booleanValue()) {
+ if (ascendingOrder != null && !ascendingOrder) {
// As it is descending order, Add Null Values in first place of the
// LinkedHasMap
sortedMap.putAll(hmNullValueMap);
}
// Put all not null values in returning LinkedHashMap
- for (int i = 0; i < valueList.size(); i++) {
- sortedValue = valueList.get(i);
+ for (Object o : valueList) {
+ sortedValue = o;
// Search this value in temp HashMap and if found remove it
keySet = hmTmpMap.keySet();
@@ -238,7 +238,7 @@ public class ValueSortMap {
}
}
- if (ascendingOrder == null || ascendingOrder.booleanValue()) {
+ if (ascendingOrder == null || ascendingOrder) {
// Add Null Values in the last of the LinkedHasMap
sortedMap.putAll(hmNullValueMap);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/stemmer/PStemmer.java b/opennlp-similarity/src/main/java/opennlp/tools/stemmer/PStemmer.java
index 6d5ac40..464d064 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/stemmer/PStemmer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/stemmer/PStemmer.java
@@ -82,7 +82,7 @@ public class PStemmer {
/* cons(i) is true <=> b[i] is a consonant. */
- private final boolean cons(int i) {
+ private boolean cons(int i) {
switch (b[i]) {
case 'a': case 'e': case 'i': case 'o': case 'u':
return false;
@@ -104,7 +104,7 @@ public class PStemmer {
....
*/
- private final int m() {
+ private int m() {
int n = 0;
int i = k0;
while(true) {
@@ -138,7 +138,7 @@ public class PStemmer {
/* vowelinstem() is true <=> k0,...j contains a vowel */
- private final boolean vowelinstem() {
+ private boolean vowelinstem() {
int i;
for (i = k0; i <= j; i++)
if (! cons(i))
@@ -148,7 +148,7 @@ public class PStemmer {
/* doublec(j) is true <=> j,(j-1) contain a double consonant. */
- private final boolean doublec(int j) {
+ private boolean doublec(int j) {
if (j < k0+1)
return false;
if (b[j] != b[j-1])
@@ -165,7 +165,7 @@ public class PStemmer {
*/
- private final boolean cvc(int i) {
+ private boolean cvc(int i) {
if (i < k0+2 || !cons(i) || cons(i-1) || !cons(i-2))
return false;
else {
@@ -175,7 +175,7 @@ public class PStemmer {
return true;
}
- private final boolean ends(String s) {
+ private boolean ends(String s) {
int l = s.length();
int o = k-l+1;
if (o < k0)
@@ -225,7 +225,7 @@ public class PStemmer {
*/
- private final void step1() {
+ private void step1() {
if (b[k] == 's') {
if (ends("sses")) k -= 2;
else if (ends("ies")) setto("i");
@@ -252,7 +252,7 @@ public class PStemmer {
/* step2() turns terminal y to i when there is another vowel in the stem. */
- private final void step2() {
+ private void step2() {
if (ends("y") && vowelinstem()) {
b[k] = 'i';
dirty = true;
@@ -263,7 +263,7 @@ public class PStemmer {
-ation) maps to -ize etc. note that the string before the suffix must give
m() > 0. */
- private final void step3() {
+ private void step3() {
if (k == k0) return; /* For Bug 1 */
switch (b[k-1]) {
case 'a':
@@ -307,7 +307,7 @@ public class PStemmer {
/* step4() deals with -ic-, -full, -ness etc. similar strategy to step3. */
- private final void step4() {
+ private void step4() {
switch (b[k]) {
case 'e':
if (ends("icate")) { r("ic"); break; }
@@ -329,7 +329,7 @@ public class PStemmer {
/* step5() takes off -ant, -ence etc., in context <c>vcvc<v>. */
- private final void step5() {
+ private void step5() {
if (k == k0) return; /* for Bug 1 */
switch (b[k-1]) {
case 'a':
@@ -384,7 +384,7 @@ public class PStemmer {
/* step6() removes a final -e if m() > 1. */
- private final void step6() {
+ private void step6() {
j = k;
if (b[k] == 'e') {
int a = m();
@@ -493,7 +493,7 @@ public class PStemmer {
s.add(Character.toLowerCase((char) ch));
} else {
s.stem();
- System.out.print(s.toString());
+ System.out.print(s);
s.reset();
if (ch < 0)
break;
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/EpistemicStatesTrainingSet.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/EpistemicStatesTrainingSet.java
index 0ae5e6d..98526d1 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/EpistemicStatesTrainingSet.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/EpistemicStatesTrainingSet.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
public class EpistemicStatesTrainingSet {
- static public HashMap<String, String> class_setOfSentences = new HashMap<String, String>();
+ static public final HashMap<String, String> class_setOfSentences = new HashMap<>();
static {
class_setOfSentences
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunk.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunk.java
index 891a26a..e428d4e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunk.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunk.java
@@ -19,6 +19,7 @@ package opennlp.tools.textsimilarity;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -60,13 +61,13 @@ public class ParseTreeChunk implements Serializable {
this.parseTreeNodes = parseTreeNodes;
}
- public ParseTreeChunk(){};
+ public ParseTreeChunk(){}
// "[<1>NP'Property':NN, <2>NP'has':VBZ, <3>NP'lots':NNS, <4>NP'of':IN, <5>NP'trash':NN, <6>NP'and':CC, <7>NP'debris':NN]";
public ParseTreeChunk(String phrStr){
String[] parts = phrStr.replace("]","").split(", <");
- this.POSs = new ArrayList<String>();
- this.lemmas = new ArrayList<String>();
+ this.POSs = new ArrayList<>();
+ this.lemmas = new ArrayList<>();
this.mainPOS = StringUtils.substringBetween(phrStr, ">", "'");
for(String part: parts){
String lemma = StringUtils.substringBetween(part, "P'", "':");
@@ -96,14 +97,8 @@ public class ParseTreeChunk implements Serializable {
// usage: stand-alone runs
public ParseTreeChunk(String mPOS, String[] lemmas, String[] POSss) {
this.mainPOS = mPOS;
- this.lemmas = new ArrayList<String>();
- for (String l : lemmas) {
- this.lemmas.add(l);
- }
- this.POSs = new ArrayList<String>();
- for (String p : POSss) {
- this.POSs.add(p);
- }
+ this.lemmas = new ArrayList<>(Arrays.asList(lemmas));
+ this.POSs = new ArrayList<>(Arrays.asList(POSss));
}
// constructor which takes lemmas and POS as lists so that phrases can be
@@ -162,8 +157,8 @@ public class ParseTreeChunk implements Serializable {
}
public ParseTreeChunk(List<ParseTreeNode> ps) {
- this.lemmas = new ArrayList<String>();
- this.POSs = new ArrayList<String>();
+ this.lemmas = new ArrayList<>();
+ this.POSs = new ArrayList<>();
for(ParseTreeNode n: ps){
this.lemmas.add(n.getWord());
this.POSs.add(n.getPos());
@@ -176,10 +171,10 @@ public class ParseTreeChunk implements Serializable {
}
public List<ParseTreeChunk> buildChunks(List<LemmaPair> parseResults) {
- List<ParseTreeChunk> chunksResults = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> chunksResults = new ArrayList<>();
for (LemmaPair chunk : parseResults) {
String[] lemmasAr = chunk.getLemma().split(" ");
- List<String> poss = new ArrayList<String>(), lems = new ArrayList<String>();
+ List<String> poss = new ArrayList<>(), lems = new ArrayList<>();
for (String lem : lemmasAr) {
lems.add(lem);
// now looking for POSs for individual word
@@ -227,30 +222,39 @@ public class ParseTreeChunk implements Serializable {
public List<List<ParseTreeChunk>> groupChunksAsParses(
List<ParseTreeChunk> parseResults) {
- List<ParseTreeChunk> np = new ArrayList<ParseTreeChunk>(), vp = new ArrayList<ParseTreeChunk>(), prp = new ArrayList<ParseTreeChunk>(), sbarp = new ArrayList<ParseTreeChunk>(), pp = new ArrayList<ParseTreeChunk>(), adjp = new ArrayList<ParseTreeChunk>(), whadvp = new ArrayList<ParseTreeChunk>(), restOfPhrasesTypes = new ArrayList<ParseTreeChunk>();
- List<List<ParseTreeChunk>> results = new ArrayList<List<ParseTreeChunk>>();
+ List<ParseTreeChunk> np = new ArrayList<>(), vp = new ArrayList<>(), prp = new ArrayList<>(), sbarp = new ArrayList<>(), pp = new ArrayList<>(), adjp = new ArrayList<>(), whadvp = new ArrayList<>(), restOfPhrasesTypes = new ArrayList<>();
+ List<List<ParseTreeChunk>> results = new ArrayList<>();
for (ParseTreeChunk ch : parseResults) {
String mainPos = ch.getMainPOS().toLowerCase();
if (mainPos.equals("s")) {
continue;
}
- if (mainPos.equals("np")) {
- np.add(ch);
- } else if (mainPos.equals("vp")) {
- vp.add(ch);
- } else if (mainPos.equals("prp")) {
- prp.add(ch);
- } else if (mainPos.equals("pp")) {
- pp.add(ch);
- } else if (mainPos.equals("adjp")) {
- adjp.add(ch);
- } else if (mainPos.equals("whadvp")) {
- whadvp.add(ch);
- } else if (mainPos.equals("sbar")) {
- sbarp.add(ch);
- } else {
- restOfPhrasesTypes.add(ch);
+ switch (mainPos) {
+ case "np":
+ np.add(ch);
+ break;
+ case "vp":
+ vp.add(ch);
+ break;
+ case "prp":
+ prp.add(ch);
+ break;
+ case "pp":
+ pp.add(ch);
+ break;
+ case "adjp":
+ adjp.add(ch);
+ break;
+ case "whadvp":
+ whadvp.add(ch);
+ break;
+ case "sbar":
+ sbarp.add(ch);
+ break;
+ default:
+ restOfPhrasesTypes.add(ch);
+ break;
}
}
@@ -271,11 +275,11 @@ public class ParseTreeChunk implements Serializable {
// sub-expressions
public List<List<ParseTreeChunk>> matchTwoSentencesGroupedChunks(
List<List<ParseTreeChunk>> sent1, List<List<ParseTreeChunk>> sent2) {
- List<List<ParseTreeChunk>> results = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> results = new ArrayList<>();
// first irerate through component
for (int comp = 0; comp < 2 && // just np & vp
comp < sent1.size() && comp < sent2.size(); comp++) {
- List<ParseTreeChunk> resultComps = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> resultComps = new ArrayList<>();
// then iterate through each phrase in each component
for (ParseTreeChunk ch1 : sent1.get(comp)) {
for (ParseTreeChunk ch2 : sent2.get(comp)) { // simpler version
@@ -373,13 +377,13 @@ public class ParseTreeChunk implements Serializable {
if (!notSubChunkWithGivenAlignment && !unComparable)
return true;
- List<String> thisPOS = new ArrayList<String> ( this.POSs);
+ List<String> thisPOS = new ArrayList<>(this.POSs);
Collections.reverse(thisPOS);
- List<String> chPOS = new ArrayList<String> ( poss);
+ List<String> chPOS = new ArrayList<>(poss);
Collections.reverse(chPOS);
- List<String> thisLemma = new ArrayList<String> ( this.lemmas);
+ List<String> thisLemma = new ArrayList<>(this.lemmas);
Collections.reverse(thisLemma );
- List<String> chLemma = new ArrayList<String> ( lems);
+ List<String> chLemma = new ArrayList<>(lems);
Collections.reverse(chLemma);
notSubChunkWithGivenAlignment = false; unComparable = false;
@@ -444,8 +448,8 @@ public class ParseTreeChunk implements Serializable {
public String toWordOnlyString(){
String buf = "";
- for (int i = 0; i < lemmas.size() ; i++) {
- buf+=lemmas.get(i)+" ";
+ for (String lemma : lemmas) {
+ buf += lemma + " ";
}
return buf.trim();
}
@@ -459,7 +463,7 @@ public class ParseTreeChunk implements Serializable {
}
public String listToString(List<List<ParseTreeChunk>> chunks) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (chunks.get(0).size() > 0) {
buf.append(" np ").append(chunks.get(0).toString());
}
@@ -492,7 +496,7 @@ public class ParseTreeChunk implements Serializable {
public List<List<ParseTreeChunk>> obtainParseTreeChunkListByParsingList(
String toParse) {
- List<List<ParseTreeChunk>> results = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> results = new ArrayList<>();
// if (toParse.endsWith("]]]")){
// toParse = toParse.replace("[[","").replace("]]","");
// }
@@ -501,10 +505,10 @@ public class ParseTreeChunk implements Serializable {
for (String toParseFragm : phraseTypeFragments) {
toParseFragm = toParseFragm.replace("], [", "#");
- List<ParseTreeChunk> resultsPhraseType = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> resultsPhraseType = new ArrayList<>();
String[] indivChunks = toParseFragm.trim().split("#");
for (String expr : indivChunks) {
- List<String> lems = new ArrayList<String>(), poss = new ArrayList<String>();
+ List<String> lems = new ArrayList<>(), poss = new ArrayList<>();
expr = expr.replace("[", "").replace(" ]", "");
String[] pairs = expr.trim().split(" ");
for (String word : pairs) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunkComparable.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunkComparable.java
index f039c6d..71ffd15 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunkComparable.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeChunkComparable.java
@@ -20,6 +20,8 @@ package opennlp.tools.textsimilarity;
import java.util.Comparator;
public class ParseTreeChunkComparable implements Comparator<ParseTreeChunk> {
+
+ @Override
public int compare(ParseTreeChunk ch1, ParseTreeChunk ch2) {
for (int i = 0; i < ch1.getLemmas().size() && i < ch2.getLemmas().size(); i++) {
if (!(ch1.getLemmas().get(i).equals(ch2.getLemmas().get(i)) && ch1
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeMatcher.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeMatcher.java
index 7d8f2c3..6b81309 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeMatcher.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/ParseTreeMatcher.java
@@ -39,7 +39,7 @@ public class ParseTreeMatcher {
List<String> pos1 = chunk1.getPOSs();
List<String> pos2 = chunk1.getPOSs();
- List<String> commonPOS = new ArrayList<String>(), commonLemmas = new ArrayList<String>();
+ List<String> commonPOS = new ArrayList<>(), commonLemmas = new ArrayList<>();
int k1 = 0, k2 = 0;
Boolean incrFirst = true;
while (k1 < pos1.size() && k2 < pos2.size()) {
@@ -74,7 +74,7 @@ public class ParseTreeMatcher {
// into {A B {X Y} C}
// should only be applied to a noun phrase
public ParseTreeChunk prepositionalNNSTransform(ParseTreeChunk ch) {
- List<String> transfPOS = new ArrayList<String>(), transfLemmas = new ArrayList<String>();
+ List<String> transfPOS = new ArrayList<>(), transfLemmas = new ArrayList<>();
if (!ch.getPOSs().contains("IN"))
return ch;
int indexIN = ch.getPOSs().lastIndexOf("IN");
@@ -115,7 +115,7 @@ public class ParseTreeMatcher {
ParseTreeChunk chRes3 = generalizeTwoGroupedPhrasesRandomSelectHighestScore(
prepositionalNNSTransform(chunk2), chunk1);
- ParseTreeChunk chRes = null;
+ ParseTreeChunk chRes;
if (parseTreeChunkListScorer.getScore(chRes1) > parseTreeChunkListScorer
.getScore(chRes2))
if (parseTreeChunkListScorer.getScore(chRes1) > parseTreeChunkListScorer
@@ -144,9 +144,9 @@ public class ParseTreeMatcher {
ParseTreeChunk result = null;
for (int timesRun = 0; timesRun < timesRepetitiveRun; timesRun++) {
- List<String> commonPOS = new ArrayList<String>(), commonLemmas = new ArrayList<String>();
+ List<String> commonPOS = new ArrayList<>(), commonLemmas = new ArrayList<>();
int k1 = 0, k2 = 0;
- Double score = 0.0;
+ Double score;
while (k1 < pos1.size() && k2 < pos2.size()) {
// first check if the same POS
String sim = posManager.similarPOS(pos1.get(k1), pos2.get(k2));
@@ -189,9 +189,9 @@ public class ParseTreeMatcher {
}
for (int timesRun = 0; timesRun < timesRepetitiveRun; timesRun++) {
- List<String> commonPOS = new ArrayList<String>(), commonLemmas = new ArrayList<String>();
+ List<String> commonPOS = new ArrayList<>(), commonLemmas = new ArrayList<>();
int k1 = pos1.size() - 1, k2 = pos2.size() - 1;
- Double score = 0.0;
+ Double score;
while (k1 >= 0 && k2 >= 0) {
// first check if the same POS
String sim = posManager.similarPOS(pos1.get(k1), pos2.get(k2));
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/SentencePairMatchResult.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/SentencePairMatchResult.java
index 5fe2050..bcf87d7 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/SentencePairMatchResult.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/SentencePairMatchResult.java
@@ -61,9 +61,9 @@ public class SentencePairMatchResult {
private List<LemmaPair> resForMinedSent1;
- public boolean verbExists = false;
+ public boolean verbExists;
- public boolean imperativeVerb = false;
+ public boolean imperativeVerb;
public SentencePairMatchResult(List<List<ParseTreeChunk>> matchResult,
List<LemmaPair> resForMinedSent1) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextProcessor.java
index c490f0e..5dfdf1a 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextProcessor.java
@@ -17,7 +17,7 @@
package opennlp.tools.textsimilarity;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -50,9 +50,7 @@ public class TextProcessor {
ArrayList<Pair<List<String>, Map<String, HashSet<Integer>>>> docs = new ArrayList<>();
// tokenize each segment
- for (int i = 0; i < segments.size(); i++) {
- String s = segments.get(i);
-
+ for (String s : segments) {
Pair<List<String>, Map<String, HashSet<Integer>>> tokPos = buildTokenPositions(s);
docs.add(tokPos);
}
@@ -112,9 +110,8 @@ public class TextProcessor {
int segLength = 1;
StringBuilder segmentStr = new StringBuilder();
- for (int i = 0; i < tokensA.size(); i++) {
- String token = tokensA.get(i);
- HashSet<Integer> positions = null;
+ for (String token : tokensA) {
+ HashSet<Integer> positions;
// if ((positions = tokenPosB.get(token)) != null &&
// !token.equals("<punc>") &&
// !StopList.getInstance().isStopWord(token) && token.length()>1) {
@@ -228,8 +225,8 @@ public class TextProcessor {
cand += " " + text.substring(idx, m.end() - 1).trim();
boolean hasAbbrev = false;
- for (int i = 0; i < abbrevs.length; i++) {
- if (cand.toLowerCase().endsWith(abbrevs[i])) {
+ for (String abbrev : abbrevs) {
+ if (cand.toLowerCase().endsWith(abbrev)) {
hasAbbrev = true;
break;
}
@@ -347,7 +344,7 @@ public class TextProcessor {
String b = tokens.get(i) + " " + tokens.get(i + 1);
b = b.toLowerCase();
// don't add punc tokens
- if (b.indexOf("<punc>") != -1 && !retainPunc)
+ if (b.contains("<punc>") && !retainPunc)
continue;
int freq = 1;
@@ -543,12 +540,8 @@ public class TextProcessor {
} catch (NoSuchAlgorithmException e) {
LOG.severe("NoSuchAlgorithmException " + 2);
}
- try {
- md.update(s.getBytes("UTF-8")); // step 3
- } catch (UnsupportedEncodingException e) {
- LOG.severe("UnsupportedEncodingException " + e);
- }
- byte raw[] = md.digest();
+ md.update(s.getBytes(StandardCharsets.UTF_8)); // step 3
+ byte[] raw = md.digest();
hash = null; // (new BASE64Encoder()).encode(raw);
}
return hash;
@@ -569,13 +562,13 @@ public class TextProcessor {
for (String t : tokens) {
String tokenLower = t.toLowerCase();
- if (tokenLower == "<punc>") {
+ if ("<punc>".equals(tokenLower)) {
continue;
}
- if (tokenLower == "close_a") {
+ if ("close_a".equals(tokenLower)) {
continue;
}
- if (tokenLower == "open_a") {
+ if ("open_a".equals(tokenLower)) {
continue;
}
String stemmedToken = TextProcessor.stemTerm(tokenLower);
@@ -602,20 +595,15 @@ public class TextProcessor {
String hash = "";
if (hashString.length() > 0) {
- MessageDigest md = null;
+ MessageDigest md;
try {
md = MessageDigest.getInstance("SHA"); // step 2
} catch (NoSuchAlgorithmException e) {
LOG.severe("NoSuchAlgorithmException " + e);
throw new Exception(e.getMessage());
}
- try {
- md.update(hashString.getBytes("UTF-8")); // step 3
- } catch (UnsupportedEncodingException e) {
- LOG.severe("UnsupportedEncodingException " + e);
- throw new Exception(e.getMessage());
- }
- byte raw[] = md.digest();
+ md.update(hashString.getBytes(StandardCharsets.UTF_8)); // step 3
+ byte[] raw = md.digest();
hash = null; // (new BASE64Encoder()).encode(raw);
}
return hash;
@@ -648,7 +636,7 @@ public class TextProcessor {
public static String generateSummary(String txt, String title, int numChars,
boolean truncateInSentence) {
- String finalSummary = "";
+ String finalSummary;
try {
@@ -659,7 +647,7 @@ public class TextProcessor {
txt = txt.replace(" |", " ");
ArrayList<String> sentences = TextProcessor.splitToSentences(txt);
// System.out.println("Sentences are:");
- StringBuffer sum = new StringBuffer();
+ StringBuilder sum = new StringBuilder();
int cnt = 0;
int lCnt = 0;
for (String s : sentences) {
@@ -771,7 +759,7 @@ public class TextProcessor {
int retVal = 0;
if (txt.length() > 0) {
for (int i = txt.length() - 1; i >= 0; i--) {
- if (txt.valueOf(txt.charAt(i)).equals(".")) {
+ if (String.valueOf(txt.charAt(i)).equals(".")) {
retVal++;
} else {
break;
@@ -819,19 +807,19 @@ public class TextProcessor {
txt = txt.substring(idx);
// scrub the title
- if (title.trim().length() > 0 && txt.indexOf(title.trim()) != -1) {
+ if (title.trim().length() > 0 && txt.contains(title.trim())) {
txt = txt
.substring(txt.indexOf(title.trim()) + title.trim().length() - 1);
}
// scrub before first -
- if (txt.indexOf(" � ") != -1) {
+ if (txt.contains(" � ")) {
txt = txt.substring(txt.indexOf(" � ") + 3);
}
- if (txt.indexOf(" - ") != -1) {
+ if (txt.contains(" - ")) {
txt = txt.substring(txt.indexOf(" - ") + 3);
}
- if (txt.indexOf("del.icio.us") != -1) {
+ if (txt.contains("del.icio.us")) {
txt = txt.substring(txt.indexOf("del.icio.us") + "del.icio.us".length());
}
@@ -873,7 +861,7 @@ public class TextProcessor {
}
public static List<String> extractUrlsFromText(String txt) {
- List<String> urls = new ArrayList<String>();
+ List<String> urls = new ArrayList<>();
// tokenize and iterate
String[] tokens = txt.split(" ");
for (String t : tokens) {
@@ -888,10 +876,10 @@ public class TextProcessor {
}
public static List<String> findCommonTokens(List<String> segments) {
- List<String> commonTokens = new ArrayList<String>();
+ List<String> commonTokens = new ArrayList<>();
if (segments.size() > 1) {
- List<String> allTokens = new ArrayList<String>();
+ List<String> allTokens = new ArrayList<>();
for (String s : segments) {
String[] tks = s.split(" ");
List<String> tokens = Arrays.asList(tks);
@@ -902,7 +890,7 @@ public class TextProcessor {
.getUniqueTokenIndex(allTokens);
for (String t : uniqueTokens.keySet()) {
Integer freq = uniqueTokens.get(t);
- if (freq.intValue() == segments.size()) {
+ if (freq == segments.size()) {
commonTokens.add(t);
}
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextSimilarityBagOfWords.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextSimilarityBagOfWords.java
index af5869d..b2658cb 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextSimilarityBagOfWords.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TextSimilarityBagOfWords.java
@@ -25,14 +25,14 @@ public class TextSimilarityBagOfWords {
public double assessRelevanceAndGetScore(String para1, String para2) {
List<String> wordsOfPara1 = TextProcessor.fastTokenize(para1, false);
List<String> wordsOfPara2 = TextProcessor.fastTokenize(para2, false);
- List<String> overlap = new ArrayList<String>(wordsOfPara1);
+ List<String> overlap = new ArrayList<>(wordsOfPara1);
overlap.retainAll(wordsOfPara2);
overlap.removeAll(Arrays.asList(stopList));
return overlap.size();
}
- public String[] stopList = new String[] { "a",
+ public final String[] stopList = new String[] { "a",
"about",
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TokenObject.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TokenObject.java
index 1164584..eea50e2 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TokenObject.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/TokenObject.java
@@ -100,24 +100,17 @@ public class TokenObject {
}
public static class sortByDocFreq implements Comparator<TokenObject> {
+ @Override
public int compare(TokenObject a, TokenObject b) {
-
- if (a.docFreq > b.docFreq) {
- return 1;
- } else {
- return -1;
- }
+ return Float.compare(a.docFreq, b.docFreq);
}
}
public static class sortByTFIDF implements Comparator<TokenObject> {
- public int compare(TokenObject a, TokenObject b) {
- if (a.tfidf < b.tfidf) {
- return 1;
- } else {
- return -1;
- }
+ @Override
+ public int compare(TokenObject a, TokenObject b) {
+ return Float.compare(a.tfidf, b.tfidf);
}
}
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserCacheSerializer.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserCacheSerializer.java
index d8c6515..b1eda2a 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserCacheSerializer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserCacheSerializer.java
@@ -55,8 +55,8 @@ public class ParserCacheSerializer {
.getLogger("opennlp.tools.textsimilarity.chunker2matcher.ParserCacheSerializer");
private static final boolean javaObjectSerialization = false;
private static final String RESOURCE_DIR = "src/test/resources/";
- public static String parseCacheFileName = "sentence_parseObject.dat";
- public static String parseCacheFileNameCSV = "sentence_parseObject.csv";
+ public static final String parseCacheFileName = "sentence_parseObject.dat";
+ public static final String parseCacheFileNameCSV = "sentence_parseObject.csv";
public static void writeObject(Object objectToSerialize) {
if (javaObjectSerialization) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserChunker2MatcherProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserChunker2MatcherProcessor.java
index df070b0..3659ad1 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserChunker2MatcherProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserChunker2MatcherProcessor.java
@@ -58,7 +58,8 @@ public class ParserChunker2MatcherProcessor {
private static final String MODEL_DIR_KEY = "nlp.models.dir";
// TODO config
// this is where resources should live
- private static String MODEL_DIR=null, MODEL_DIR_REL = "src/test/resources/models";
+ private static String MODEL_DIR=null;
+ private static final String MODEL_DIR_REL = "src/test/resources/models";
protected static ParserChunker2MatcherProcessor instance;
private SentenceDetector sentenceDetector;
@@ -165,7 +166,7 @@ public class ParserChunker2MatcherProcessor {
if (text == null || text.trim().length() == 0)
return null;
- List<List<Parse>> textParses = new ArrayList<List<Parse>>(1);
+ List<List<Parse>> textParses = new ArrayList<>(1);
// parse paragraph by paragraph
String[] paragraphList = splitParagraph(text);
@@ -191,7 +192,7 @@ public class ParserChunker2MatcherProcessor {
// parse sentence by sentence
String[] sentences = splitSentences(paragraph);
- List<Parse> parseList = new ArrayList<Parse>(sentences.length);
+ List<Parse> parseList = new ArrayList<>(sentences.length);
for (String sentence : sentences) {
sentence = sentence.trim();
if (sentence.length() == 0)
@@ -243,15 +244,15 @@ public class ParserChunker2MatcherProcessor {
public synchronized List<List<ParseTreeChunk>> formGroupedPhrasesFromChunksForPara(
String para) {
- List<List<ParseTreeChunk>> listOfChunksAccum = new ArrayList<List<ParseTreeChunk>>();
+ List<List<ParseTreeChunk>> listOfChunksAccum = new ArrayList<>();
String[] sentences = splitSentences(para);
for (String sent : sentences) {
List<List<ParseTreeChunk>> singleSentChunks = formGroupedPhrasesFromChunksForSentence(sent);
if (singleSentChunks == null)
continue;
if (listOfChunksAccum.size() < 1) {
- listOfChunksAccum = new ArrayList<List<ParseTreeChunk>>(
- singleSentChunks);
+ listOfChunksAccum = new ArrayList<>(
+ singleSentChunks);
} else
for (int i = 0; i < NUMBER_OF_SECTIONS_IN_SENTENCE_CHUNKS; i++) {
// make sure not null
@@ -277,7 +278,7 @@ public class ParserChunker2MatcherProcessor {
String sentence = TextProcessor.removePunctuation(sentenceInp);
String[] toks = tokenizer.tokenize(sentence);
- String[] tags = new String[toks.length]; // posTagger.tag(toks);
+ String[] tags; // posTagger.tag(toks);
SentenceNode node = parseSentenceNode(sentence);
if (node == null) {
LOG.info("Problem parsing sentence '" + sentence);
@@ -358,11 +359,11 @@ public class ParserChunker2MatcherProcessor {
// String[] res = chunker.chunk(toks, tags);
- List<List<ParseTreeChunk>> listOfChunks = new ArrayList<List<ParseTreeChunk>>();
- List<ParseTreeChunk> nounPhr = new ArrayList<ParseTreeChunk>(), prepPhr = new ArrayList<ParseTreeChunk>(), verbPhr = new ArrayList<ParseTreeChunk>(), adjPhr = new ArrayList<ParseTreeChunk>(),
+ List<List<ParseTreeChunk>> listOfChunks = new ArrayList<>();
+ List<ParseTreeChunk> nounPhr = new ArrayList<>(), prepPhr = new ArrayList<>(), verbPhr = new ArrayList<>(), adjPhr = new ArrayList<>(),
// to store the whole sentence
- wholeSentence = new ArrayList<ParseTreeChunk>();
- List<String> pOSsAll = new ArrayList<String>(), lemmasAll = new ArrayList<String>();
+ wholeSentence = new ArrayList<>();
+ List<String> pOSsAll = new ArrayList<>(), lemmasAll = new ArrayList<>();
for (int i = 0; i < toks.length; i++) {
pOSsAll.add(tags[i]);
@@ -370,13 +371,13 @@ public class ParserChunker2MatcherProcessor {
}
wholeSentence.add(new ParseTreeChunk("SENTENCE", lemmasAll, pOSsAll));
- boolean currPhraseClosed = false;
+ boolean currPhraseClosed;
for (int i = 0; i < res.length; i++) {
String bi_POS = res[i];
currPhraseClosed = false;
if (bi_POS.startsWith("B-NP")) {// beginning of a phrase
- List<String> pOSs = new ArrayList<String>(), lemmas = new ArrayList<String>();
+ List<String> pOSs = new ArrayList<>(), lemmas = new ArrayList<>();
pOSs.add(tags[i]);
lemmas.add(toks[i]);
for (int j = i + 1; j < res.length; j++) {
@@ -396,7 +397,7 @@ public class ParserChunker2MatcherProcessor {
}
} else if (bi_POS.startsWith("B-PP")) {// beginning of a phrase
- List<String> pOSs = new ArrayList<String>(), lemmas = new ArrayList<String>();
+ List<String> pOSs = new ArrayList<>(), lemmas = new ArrayList<>();
pOSs.add(tags[i]);
lemmas.add(toks[i]);
@@ -416,7 +417,7 @@ public class ParserChunker2MatcherProcessor {
// LOG.fine(i + " => " + lemmas);
}
} else if (bi_POS.startsWith("B-VP")) {// beginning of a phrase
- List<String> pOSs = new ArrayList<String>(), lemmas = new ArrayList<String>();
+ List<String> pOSs = new ArrayList<>(), lemmas = new ArrayList<>();
pOSs.add(tags[i]);
lemmas.add(toks[i]);
@@ -436,7 +437,7 @@ public class ParserChunker2MatcherProcessor {
// LOG.fine(i + " => " + lemmas);
}
} else if (bi_POS.startsWith("B-ADJP")) {// beginning of a phrase
- List<String> pOSs = new ArrayList<String>(), lemmas = new ArrayList<String>();
+ List<String> pOSs = new ArrayList<>(), lemmas = new ArrayList<>();
pOSs.add(tags[i]);
lemmas.add(toks[i]);
@@ -471,8 +472,8 @@ public class ParserChunker2MatcherProcessor {
if (textParses == null || textParses.size() == 0)
return null;
- List<List<SentenceNode>> textNodes = new ArrayList<List<SentenceNode>>(
- textParses.size());
+ List<List<SentenceNode>> textNodes = new ArrayList<>(
+ textParses.size());
for (List<Parse> paragraphParses : textParses) {
List<SentenceNode> paragraphNodes = paragraphToSentenceNodes(paragraphParses);
@@ -492,10 +493,10 @@ public class ParserChunker2MatcherProcessor {
if (paragraphParses == null || paragraphParses.size() == 0)
return null;
- List<SentenceNode> paragraphNodes = new ArrayList<SentenceNode>(
- paragraphParses.size());
+ List<SentenceNode> paragraphNodes = new ArrayList<>(
+ paragraphParses.size());
for (Parse sentenceParse : paragraphParses) {
- SentenceNode sentenceNode = null;
+ SentenceNode sentenceNode;
try {
sentenceNode = sentenceToSentenceNode(sentenceParse);
} catch (Exception e) {
@@ -691,7 +692,7 @@ public class ParserChunker2MatcherProcessor {
if (children == null || children.length == 0)
return null;
- ArrayList<SyntacticTreeNode> childrenNodeList = new ArrayList<SyntacticTreeNode>();
+ ArrayList<SyntacticTreeNode> childrenNodeList = new ArrayList<>();
for (Parse child : children) {
SyntacticTreeNode childNode = toSyntacticTreeNode(child);
if (childNode != null)
@@ -724,7 +725,7 @@ public class ParserChunker2MatcherProcessor {
protected List<LemmaPair> listListParseTreeChunk2ListLemmaPairs(
List<List<ParseTreeChunk>> sent1GrpLst) {
- List<LemmaPair> results = new ArrayList<LemmaPair>();
+ List<LemmaPair> results = new ArrayList<>();
if (sent1GrpLst == null || sent1GrpLst.size() < 1)
return results;
List<ParseTreeChunk> wholeSentence = sent1GrpLst
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserPure2MatcherProcessor.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserPure2MatcherProcessor.java
index 65abdef..2e21705 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserPure2MatcherProcessor.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/ParserPure2MatcherProcessor.java
@@ -45,7 +45,7 @@ import opennlp.tools.textsimilarity.TextProcessor;
public class ParserPure2MatcherProcessor extends ParserChunker2MatcherProcessor {
protected static ParserPure2MatcherProcessor pinstance;
- private static Logger LOG = Logger
+ private static final Logger LOG = Logger
.getLogger("opennlp.tools.textsimilarity.chunker2matcher.ParserPure2MatcherProcessor");
public synchronized static ParserPure2MatcherProcessor getInstance() {
@@ -77,10 +77,10 @@ public class ParserPure2MatcherProcessor extends ParserChunker2MatcherProcessor
List<String> POSlist = node.getOrderedPOSList();
List<String> TokList = node.getOrderedLemmaList();
- List<List<ParseTreeChunk>> listOfChunks = new ArrayList<List<ParseTreeChunk>>();
- List<ParseTreeChunk> nounPhr = new ArrayList<ParseTreeChunk>(), prepPhr = new ArrayList<ParseTreeChunk>(), verbPhr = new ArrayList<ParseTreeChunk>(), adjPhr = new ArrayList<ParseTreeChunk>(),
+ List<List<ParseTreeChunk>> listOfChunks = new ArrayList<>();
+ List<ParseTreeChunk> nounPhr = new ArrayList<>(), prepPhr = new ArrayList<>(), verbPhr = new ArrayList<>(), adjPhr = new ArrayList<>(),
// to store the whole sentence
- wholeSentence = new ArrayList<ParseTreeChunk>();
+ wholeSentence = new ArrayList<>();
wholeSentence.add(new ParseTreeChunk("SENTENCE", TokList, POSlist));
for (ParseTreeChunk phr : ptcList) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/PhraseNode.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/PhraseNode.java
index 8469441..24f726f 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/PhraseNode.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/PhraseNode.java
@@ -51,7 +51,7 @@ public class PhraseNode extends SyntacticTreeNode {
return;
if (children == null) {
- children = new ArrayList<SyntacticTreeNode>();
+ children = new ArrayList<>();
}
// set the parent of the child node
@@ -77,7 +77,7 @@ public class PhraseNode extends SyntacticTreeNode {
StringBuilder builder = new StringBuilder();
boolean first = true;
for (SyntacticTreeNode child : children) {
- String childText = null;
+ String childText;
if (useLemma)
childText = child.getLemma(removeStopWord);
else
@@ -119,7 +119,7 @@ public class PhraseNode extends SyntacticTreeNode {
@Override
public List<String> getOrderedPOSList() {
- List<String> types = new ArrayList<String>();
+ List<String> types = new ArrayList<>();
if (children != null && children.size() > 0) {
for (SyntacticTreeNode child : children) {
types.addAll(child.getOrderedPOSList());
@@ -131,7 +131,7 @@ public class PhraseNode extends SyntacticTreeNode {
@Override
public List<String> getOrderedLemmaList() {
- List<String> types = new ArrayList<String>();
+ List<String> types = new ArrayList<>();
if (children != null && children.size() > 0) {
for (SyntacticTreeNode child : children) {
types.addAll(child.getOrderedLemmaList());
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SentenceNode.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SentenceNode.java
index 6dd170a..dbbd94a 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SentenceNode.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SentenceNode.java
@@ -62,7 +62,7 @@ public class SentenceNode extends PhraseNode {
@Override
public List<String> getOrderedPOSList() {
- List<String> types = new ArrayList<String>();
+ List<String> types = new ArrayList<>();
if (this.getChildren() != null && this.getChildren().size() > 0) {
for (SyntacticTreeNode child : this.getChildren()) {
types.addAll(child.getOrderedPOSList());
@@ -73,7 +73,7 @@ public class SentenceNode extends PhraseNode {
@Override
public List<String> getOrderedLemmaList() {
- List<String> types = new ArrayList<String>();
+ List<String> types = new ArrayList<>();
if (this.getChildren() != null && this.getChildren().size() > 0) {
for (SyntacticTreeNode child : this.getChildren()) {
types.addAll(child.getOrderedLemmaList());
@@ -83,7 +83,7 @@ public class SentenceNode extends PhraseNode {
}
public List<ParseTreeChunk> getParseTreeChunkList() {
- List<ParseTreeChunk> chunks = new ArrayList<ParseTreeChunk>();
+ List<ParseTreeChunk> chunks = new ArrayList<>();
if (this.getChildren() != null && this.getChildren().size() > 0) {
for (SyntacticTreeNode child : this.getChildren()) {
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SyntacticTreeNode.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SyntacticTreeNode.java
index 2b38d5f..287bb5e 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SyntacticTreeNode.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/SyntacticTreeNode.java
@@ -83,9 +83,7 @@ public abstract class SyntacticTreeNode {
return "";
StringBuilder builder = new StringBuilder();
- for (int i = 0; i < numTabs; i++) {
- builder.append("\t");
- }
+ builder.append("\t".repeat(numTabs));
return builder.toString();
}
@@ -113,7 +111,7 @@ public abstract class SyntacticTreeNode {
SyntacticTreeNode newNode) {
List<SyntacticTreeNode> newNodeList = null;
if (newNode != null) {
- newNodeList = new ArrayList<SyntacticTreeNode>(1);
+ newNodeList = new ArrayList<>(1);
newNodeList.add(newNode);
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/WordNode.java b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/WordNode.java
index 59fd77e..a99d500 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/WordNode.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/textsimilarity/chunker2matcher/WordNode.java
@@ -79,14 +79,14 @@ public class WordNode extends SyntacticTreeNode {
@Override
public List<String> getOrderedPOSList() {
- List<String> types = new ArrayList<String>();
+ List<String> types = new ArrayList<>();
types.add(getType());
return types;
}
@Override
public List<String> getOrderedLemmaList() {
- List<String> types = new ArrayList<String>();
+ List<String> types = new ArrayList<>();
types.add(this.getWord());
return types;
}
diff --git a/opennlp-similarity/src/main/java/opennlp/tools/word2vec/W2VDistanceMeasurer.java b/opennlp-similarity/src/main/java/opennlp/tools/word2vec/W2VDistanceMeasurer.java
index 99e9e4c..a898172 100644
--- a/opennlp-similarity/src/main/java/opennlp/tools/word2vec/W2VDistanceMeasurer.java
+++ b/opennlp-similarity/src/main/java/opennlp/tools/word2vec/W2VDistanceMeasurer.java
@@ -40,7 +40,7 @@ import org.nd4j.common.primitives.Pair;
public class W2VDistanceMeasurer {
static W2VDistanceMeasurer instance;
- public Word2Vec vec = null;
+ public Word2Vec vec;
public synchronized static W2VDistanceMeasurer getInstance() {
if (instance == null)
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/IMSWSDContextGenerator.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/IMSWSDContextGenerator.java
index 9363ce3..a54cf2e 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/IMSWSDContextGenerator.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/IMSWSDContextGenerator.java
@@ -89,7 +89,7 @@ public class IMSWSDContextGenerator implements WSDContextGenerator {
}
}
- String[] res = new String[localCollocations.size()];
+ String[] res;
res = localCollocations.toArray(new String[localCollocations.size()]);
return res;
@@ -114,9 +114,8 @@ public class IMSWSDContextGenerator implements WSDContextGenerator {
String[] posOfSurroundingWords = extractPosOfSurroundingWords(index, tokens,
windowSize);
- HashSet<String> surroundingWords = new HashSet<>();
- surroundingWords.addAll(Arrays
- .asList(extractSurroundingContext(index, tokens, lemmas, windowSize)));
+ HashSet<String> surroundingWords = new HashSet<>(Arrays
+ .asList(extractSurroundingContext(index, tokens, lemmas, windowSize)));
String[] localCollocations = extractLocalCollocations(index, tokens, ngram);
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/Lesk.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/Lesk.java
index 0dba41b..ca3d57f 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/Lesk.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/Lesk.java
@@ -45,7 +45,7 @@ public class Lesk extends WSDisambiguator {
/**
* List of filtered context words
*/
- ArrayList<WordPOS> contextWords = new ArrayList<WordPOS>();
+ final ArrayList<WordPOS> contextWords = new ArrayList<>();
public Lesk() {
this(null);
@@ -102,7 +102,7 @@ public class Lesk extends WSDisambiguator {
WordPOS word = new WordPOS(sample.getTargetWord(), sample.getTargetTag());
ArrayList<Synset> synsets = word.getSynsets();
- ArrayList<SynNode> nodes = new ArrayList<SynNode>();
+ ArrayList<SynNode> nodes = new ArrayList<>();
for (int i = 0; i < sample.getSentence().length; i++) {
if (!WSDHelper.getStopCache().containsKey(sample.getSentence()[i])) {
@@ -147,7 +147,7 @@ public class Lesk extends WSDisambiguator {
WordPOS word = new WordPOS(sample.getTargetWord(), sample.getTargetTag());
ArrayList<Synset> synsets = word.getSynsets();
- ArrayList<SynNode> nodes = new ArrayList<SynNode>();
+ ArrayList<SynNode> nodes = new ArrayList<>();
int index = sample.getTargetPosition();
@@ -954,7 +954,7 @@ public class Lesk extends WSDisambiguator {
}
}
- ArrayList<WordSense> wsenses = null;
+ ArrayList<WordSense> wsenses;
switch (this.params.leskType) {
case LESK_BASIC:
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/LeskParameters.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/LeskParameters.java
index 0e61672..656a744 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/LeskParameters.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/LeskParameters.java
@@ -29,7 +29,7 @@ public class LeskParameters extends WSDParameters {
* Enum of all types of implemented variations of Lesk
*
*/
- public static enum LESK_TYPE {
+ public enum LESK_TYPE {
LESK_BASIC, LESK_BASIC_CTXT, LESK_EXT, LESK_EXT_CTXT, LESK_EXT_EXP, LESK_EXT_EXP_CTXT
}
@@ -57,7 +57,7 @@ public class LeskParameters extends WSDParameters {
* Meronyms 4 : Holonyms 5 : Entailments 6 : Coordinate Terms 7 : Causes 8 :
* Attributes 9 : Pertainyms
*/
- protected boolean features[];
+ protected boolean[] features;
public LESK_TYPE getLeskType() {
return leskType;
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/OSCCWSDContextGenerator.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/OSCCWSDContextGenerator.java
index 2b3cabc..d37162c 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/OSCCWSDContextGenerator.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/OSCCWSDContextGenerator.java
@@ -36,7 +36,7 @@ public class OSCCWSDContextGenerator implements WSDContextGenerator {
String[] tags, String[] lemmas, int windowSize) {
// TODO consider windowSize
- ArrayList<String> contextClusters = new ArrayList<String>();
+ ArrayList<String> contextClusters = new ArrayList<>();
for (int i = 0; i < toks.length; i++) {
if (lemmas != null) {
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/SynNode.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/SynNode.java
index 0c685c0..f9d867b 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/SynNode.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/SynNode.java
@@ -34,21 +34,21 @@ import net.sf.extjwnl.data.list.PointerTargetNodeList;
public class SynNode {
public Synset parent;
- public Synset synset;
+ public final Synset synset;
protected ArrayList<WordPOS> senseRelevantWords;
- public ArrayList<Synset> hypernyms = new ArrayList<Synset>();
- public ArrayList<Synset> hyponyms = new ArrayList<Synset>();
- public ArrayList<Synset> meronyms = new ArrayList<Synset>();
- public ArrayList<Synset> holonyms = new ArrayList<Synset>();
- public ArrayList<Synset> entailments = new ArrayList<Synset>();
- public ArrayList<Synset> coordinateTerms = new ArrayList<Synset>();
- public ArrayList<Synset> causes = new ArrayList<Synset>();
- public ArrayList<Synset> attributes = new ArrayList<Synset>();
- public ArrayList<Synset> pertainyms = new ArrayList<Synset>();
+ public final ArrayList<Synset> hypernyms = new ArrayList<>();
+ public final ArrayList<Synset> hyponyms = new ArrayList<>();
+ public final ArrayList<Synset> meronyms = new ArrayList<>();
+ public final ArrayList<Synset> holonyms = new ArrayList<>();
+ public final ArrayList<Synset> entailments = new ArrayList<>();
+ public final ArrayList<Synset> coordinateTerms = new ArrayList<>();
+ public final ArrayList<Synset> causes = new ArrayList<>();
+ public final ArrayList<Synset> attributes = new ArrayList<>();
+ public final ArrayList<Synset> pertainyms = new ArrayList<>();
- public ArrayList<WordPOS> synonyms = new ArrayList<WordPOS>();
+ public final ArrayList<WordPOS> synonyms = new ArrayList<>();
public SynNode(Synset parent, Synset synSet,
ArrayList<WordPOS> senseRelevantWords) {
@@ -82,8 +82,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < phypernyms.size(); i++) {
- PointerTargetNode ptn = phypernyms.get(i);
+ for (PointerTargetNode ptn : phypernyms) {
this.hypernyms.add(ptn.getSynset());
}
@@ -101,8 +100,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < pmeronyms.size(); i++) {
- PointerTargetNode ptn = pmeronyms.get(i);
+ for (PointerTargetNode ptn : pmeronyms) {
this.meronyms.add(ptn.getSynset());
}
}
@@ -119,8 +117,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < pholonyms.size(); i++) {
- PointerTargetNode ptn = pholonyms.get(i);
+ for (PointerTargetNode ptn : pholonyms) {
this.holonyms.add(ptn.getSynset());
}
@@ -138,8 +135,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < phyponyms.size(); i++) {
- PointerTargetNode ptn = phyponyms.get(i);
+ for (PointerTargetNode ptn : phyponyms) {
this.hyponyms.add(ptn.getSynset());
}
}
@@ -156,8 +152,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < pentailments.size(); i++) {
- PointerTargetNode ptn = pentailments.get(i);
+ for (PointerTargetNode ptn : pentailments) {
this.entailments.add(ptn.getSynset());
}
@@ -175,8 +170,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < pcoordinateTerms.size(); i++) {
- PointerTargetNode ptn = pcoordinateTerms.get(i);
+ for (PointerTargetNode ptn : pcoordinateTerms) {
this.coordinateTerms.add(ptn.getSynset());
}
@@ -194,8 +188,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < pcauses.size(); i++) {
- PointerTargetNode ptn = pcauses.get(i);
+ for (PointerTargetNode ptn : pcauses) {
this.causes.add(ptn.getSynset());
}
@@ -213,8 +206,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < pattributes.size(); i++) {
- PointerTargetNode ptn = pattributes.get(i);
+ for (PointerTargetNode ptn : pattributes) {
this.attributes.add(ptn.getSynset());
}
@@ -232,8 +224,7 @@ public class SynNode {
e.printStackTrace();
}
- for (int i = 0; i < ppertainyms.size(); i++) {
- PointerTargetNode ptn = ppertainyms.get(i);
+ for (PointerTargetNode ptn : ppertainyms) {
this.pertainyms.add(ptn.getSynset());
}
@@ -299,7 +290,7 @@ public class SynNode {
* @return senses from the nodes
*/
public static ArrayList<WordSense> updateSenses(ArrayList<SynNode> nodes) {
- ArrayList<WordSense> scoredSenses = new ArrayList<WordSense>();
+ ArrayList<WordSense> scoredSenses = new ArrayList<>();
for (int i = 0; i < nodes.size(); i++) {
ArrayList<WordPOS> sensesComponents = WSDHelper
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDHelper.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDHelper.java
index 78898c0..da1cd3e 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDHelper.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDHelper.java
@@ -68,7 +68,7 @@ public class WSDHelper {
"VBG", "VBN", "VBP", "VBZ", "WDT", "WP", "WP$", "WRB" };
// List of the PoS tags of which the senses are to be extracted
- public static String[] relevantPOS = { "JJ", "JJR", "JJS", "NN", "NNS", "RB",
+ public static final String[] relevantPOS = { "JJ", "JJR", "JJS", "NN", "NNS", "RB",
"RBR", "RBS", "VB", "VBD", "VBG", "VBN", "VBP", "VBZ" };
// List of Negation Words
@@ -76,7 +76,7 @@ public class WSDHelper {
Arrays.asList("not", "no", "never", "none", "nor", "non"));
// List of Stop Words
- public static List<String> stopWords = new ArrayList<>(
+ public static final List<String> stopWords = new ArrayList<>(
Arrays.asList("a", "able", "about", "above", "according", "accordingly",
"across", "actually", "after", "afterwards", "again", "against",
"ain't", "all", "allow", "allows", "almost", "alone", "along",
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDModel.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDModel.java
index e8e7ffe..a51b656 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDModel.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDModel.java
@@ -104,17 +104,17 @@ public class WSDModel extends BaseModel {
null);
}
- public WSDModel(InputStream in) throws IOException, InvalidFormatException {
+ public WSDModel(InputStream in) throws IOException {
super(COMPONENT_NAME, in);
updateAttributes();
}
- public WSDModel(File modelFile) throws IOException, InvalidFormatException {
+ public WSDModel(File modelFile) throws IOException {
super(COMPONENT_NAME, modelFile);
updateAttributes();
}
- public WSDModel(URL modelURL) throws IOException, InvalidFormatException {
+ public WSDModel(URL modelURL) throws IOException {
super(COMPONENT_NAME, modelURL);
updateAttributes();
}
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDParameters.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDParameters.java
index 05fd420..6278aa5 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDParameters.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDParameters.java
@@ -25,8 +25,8 @@ package opennlp.tools.disambiguator;
*/
public abstract class WSDParameters {
- public static enum SenseSource {
- WORDNET, WSDHELPER, OTHER;
+ public enum SenseSource {
+ WORDNET, WSDHELPER, OTHER
}
protected SenseSource senseSource;
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDSample.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDSample.java
index d7a4cd2..cb9365e 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDSample.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDSample.java
@@ -17,9 +17,7 @@
package opennlp.tools.disambiguator;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import net.sf.extjwnl.JWNLException;
@@ -153,12 +151,12 @@ public class WSDSample {
public static WSDSample parse(String sentenceString)
throws InvalidFormatException {
- String tokenTags[] = WhitespaceTokenizer.INSTANCE.tokenize(sentenceString);
+ String[] tokenTags = WhitespaceTokenizer.INSTANCE.tokenize(sentenceString);
int position = Integer.parseInt(tokenTags[0]);
- String sentence[] = new String[tokenTags.length - 1];
- String tags[] = new String[tokenTags.length - 1];
- String lemmas[] = new String[tokenTags.length - 1];
+ String[] sentence = new String[tokenTags.length - 1];
+ String[] tags = new String[tokenTags.length - 1];
+ String[] lemmas = new String[tokenTags.length - 1];
for (int i = 1; i < tokenTags.length; i++) {
int split = tokenTags[i].lastIndexOf("_");
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguator.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguator.java
index eea72bd..b809326 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguator.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguator.java
@@ -83,7 +83,7 @@ public abstract class WSDisambiguator {
*/
public List<String> disambiguate(String[] tokenizedContext,
String[] tokenTags, String[] lemmas, Span ambiguousTokenIndexSpan) {
- List<String> senses = new ArrayList<String>();
+ List<String> senses = new ArrayList<>();
int start = Math.max(0, ambiguousTokenIndexSpan.getStart());
@@ -128,7 +128,7 @@ public abstract class WSDisambiguator {
public List<String> disambiguate(String[] tokenizedContext,
String[] tokenTags, String[] lemmas) {
- List<String> senses = new ArrayList<String>();
+ List<String> senses = new ArrayList<>();
for (int i = 0; i < tokenizedContext.length; i++) {
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguatorME.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguatorME.java
index 979f4a5..9bf8d7f 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguatorME.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WSDisambiguatorME.java
@@ -36,7 +36,7 @@ public class WSDisambiguatorME extends WSDisambiguator {
protected WSDModel model;
- protected static WSDContextGenerator cg = new IMSWSDContextGenerator();
+ protected static final WSDContextGenerator cg = new IMSWSDContextGenerator();
public WSDisambiguatorME(WSDParameters params) {
this.params = params;
@@ -100,7 +100,7 @@ public class WSDisambiguatorME extends WSDisambiguator {
public static ArrayList<String> buildSurroundingContext(
ObjectStream<WSDSample> samples, int windowSize) throws IOException {
IMSWSDContextGenerator contextGenerator = new IMSWSDContextGenerator();
- ArrayList<String> surroundingWordsModel = new ArrayList<String>();
+ ArrayList<String> surroundingWordsModel = new ArrayList<>();
WSDSample sample;
while ((sample = samples.read()) != null) {
String[] words = contextGenerator
@@ -134,7 +134,7 @@ public class WSDisambiguatorME extends WSDisambiguator {
e.printStackTrace();
}
- String outcome = "";
+ String outcome;
String[] context = cg
.getContext(sample, ((WSDDefaultParameters) this.params).ngram,
@@ -160,7 +160,7 @@ public class WSDisambiguatorME extends WSDisambiguator {
return mfs.disambiguate(wordTag);
}
} else {
- String outcome = "";
+ String outcome;
String[] context = cg
.getContext(sample, ((WSDDefaultParameters) this.params).ngram,
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordPOS.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordPOS.java
index c6b1e91..7ada773 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordPOS.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordPOS.java
@@ -32,9 +32,9 @@ import net.sf.extjwnl.data.Synset;
// TODO extend Word instead
public class WordPOS {
- private String word;
+ private final String word;
private List<String> stems;
- private POS pos;
+ private final POS pos;
private String posTag;
public boolean isTarget = false;
@@ -88,7 +88,7 @@ public class WordPOS {
return null;
}
List<Synset> synsets = indexWord.getSenses();
- return (new ArrayList<Synset>(synsets));
+ return (new ArrayList<>(synsets));
} catch (JWNLException e) {
e.printStackTrace();
}
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordSense.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordSense.java
index d9db0de..948040e 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordSense.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/WordSense.java
@@ -70,7 +70,7 @@ public class WordSense implements Comparable<WordSense> {
@Override
public int compareTo(WordSense o) {
- return (this.score - ((WordSense) o).score) < 0 ? 1 : -1;
+ return Double.compare(this.score, o.score);
}
public String getGloss() {
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Paragraph.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Paragraph.java
index 207d142..d02bab8 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Paragraph.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Paragraph.java
@@ -66,8 +66,8 @@ public class Paragraph {
@Override
public String toString() {
String paragraph = "";
- for (int i = 0; i < this.isentences.size(); i++) {
- paragraph = paragraph + " " + this.isentences.get(i).toString();
+ for (Sentence isentence : this.isentences) {
+ paragraph = paragraph + " " + isentence.toString();
}
return paragraph.substring(1, paragraph.length());
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SemcorReaderExtended.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SemcorReaderExtended.java
index 489ed7b..538506c 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SemcorReaderExtended.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SemcorReaderExtended.java
@@ -67,8 +67,8 @@ public class SemcorReaderExtended {
private static final String ELEMENT_PUNCTUATION = "punc";
private static String semcorDirectory = "src/test/resources/semcor3.0/";
- private static String[] folders = { "brown1", "brown2", "brownv" };
- private static String tagfiles = "/tagfiles/";
+ private static final String[] folders = { "brown1", "brown2", "brownv" };
+ private static final String tagfiles = "/tagfiles/";
public static String getSemcorDirectory() {
@@ -88,7 +88,7 @@ public class SemcorReaderExtended {
*/
private ArrayList<Sentence> readFile(String file) {
- ArrayList<Sentence> result = new ArrayList<Sentence>();
+ ArrayList<Sentence> result = new ArrayList<>();
try {
@@ -316,7 +316,7 @@ public class SemcorReaderExtended {
*/
public ArrayList<WSDSample> getSemcorData(String wordTag) {
- ArrayList<WSDSample> result = new ArrayList<WSDSample>();
+ ArrayList<WSDSample> result = new ArrayList<>();
for (String folder : folders) {
ArrayList<WSDSample> list = getSemcorFolderData(folder, wordTag);
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SensevalReader.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SensevalReader.java
index 730d59f..57463d5 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SensevalReader.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/SensevalReader.java
@@ -209,7 +209,7 @@ public class SensevalReader {
if (nInstance.getNodeType() == Node.ELEMENT_NODE) {
ArrayList<String> senseIDs = new ArrayList<>();
- String rawWord = "";
+ String rawWord;
String[] finalText = null;
int index = 0;
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Sentence.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Sentence.java
index bb12420..0de162a 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Sentence.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Sentence.java
@@ -29,14 +29,14 @@ public class Sentence {
public Sentence() {
super();
- this.iwords = new ArrayList<Word>();
+ this.iwords = new ArrayList<>();
}
public Sentence(int pnum, int snum) {
super();
this.pnum = pnum;
this.snum = snum;
- this.iwords = new ArrayList<Word>();
+ this.iwords = new ArrayList<>();
}
public Sentence(int pnum, int snum, ArrayList<Word> iwords) {
@@ -77,8 +77,8 @@ public class Sentence {
@Override
public String toString() {
String sentence = "";
- for (int i = 0; i < this.iwords.size(); i++) {
- sentence = sentence + " " + this.iwords.get(i).toString();
+ for (Word iword : this.iwords) {
+ sentence = sentence + " " + iword.toString();
}
return sentence.substring(1, sentence.length());
diff --git a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Word.java b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Word.java
index 3210b41..91220cf 100644
--- a/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Word.java
+++ b/opennlp-wsd/src/main/java/opennlp/tools/disambiguator/datareader/Word.java
@@ -24,13 +24,13 @@ import opennlp.tools.disambiguator.WSDHelper;
// TODO extend Word from Wordnet
public class Word {
- public static enum Type {
+ public enum Type {
WORD(1, "word"), PUNCTUATIONMARK(2, "pm");
- public int code;
- public String type;
+ public final int code;
+ public final String type;
- private Type(int code, String type) {
+ Type(int code, String type) {
this.code = code;
this.type = type;
}
diff --git a/summarizer/src/main/java/opennlp/summarization/Sentence.java b/summarizer/src/main/java/opennlp/summarization/Sentence.java
index c4f2c9f..312e6d4 100755
--- a/summarizer/src/main/java/opennlp/summarization/Sentence.java
+++ b/summarizer/src/main/java/opennlp/summarization/Sentence.java
@@ -160,7 +160,7 @@ public class Sentence {
if(sw.isStopWord(word)) continue;
stemmer.stem(word);
- b.append(stemmer.toString());
+ b.append(stemmer);
b.append(SPACE);
}
return b.toString();
diff --git a/summarizer/src/main/java/opennlp/summarization/lexicalchaining/LexicalChain.java b/summarizer/src/main/java/opennlp/summarization/lexicalchaining/LexicalChain.java
index 4606c35..f6f3595 100644
--- a/summarizer/src/main/java/opennlp/summarization/lexicalchaining/LexicalChain.java
+++ b/summarizer/src/main/java/opennlp/summarization/lexicalchaining/LexicalChain.java
@@ -23,8 +23,8 @@ import java.util.List;
import opennlp.summarization.Sentence;
public class LexicalChain implements Comparable<LexicalChain>{
- List<Word> word;
- List<Sentence> sentences;
+ final List<Word> word;
+ final List<Sentence> sentences;
int start, last;
int score;
diff --git a/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordRelation.java b/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordRelation.java
index 175c173..bb285a3 100644
--- a/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordRelation.java
+++ b/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordRelation.java
@@ -20,10 +20,10 @@ package opennlp.summarization.lexicalchaining;
public class WordRelation {
//Match strength constants for lexical chains.
- public static int STRONG_RELATION = 0;
- public static int MED_RELATION = 1;
- public static int WEAK_RELATION = 2;
- public static int NO_RELATION = 3;
+ public static final int STRONG_RELATION = 0;
+ public static final int MED_RELATION = 1;
+ public static final int WEAK_RELATION = 2;
+ public static final int NO_RELATION = 3;
public Word src;
public Word dest;
diff --git a/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordnetWord.java b/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordnetWord.java
index 63491a8..af72cbd 100644
--- a/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordnetWord.java
+++ b/summarizer/src/main/java/opennlp/summarization/lexicalchaining/WordnetWord.java
@@ -32,7 +32,7 @@ public class WordnetWord implements Word{
//Cache..
ISynset synonyms;
- Hashtable<IPointer, List<ISynsetID>> rels;
+ final Hashtable<IPointer, List<ISynsetID>> rels;
public WordnetWord()
{
diff --git a/summarizer/src/main/java/opennlp/summarization/preprocess/DefaultDocProcessor.java b/summarizer/src/main/java/opennlp/summarization/preprocess/DefaultDocProcessor.java
index a56ace5..7825e58 100755
--- a/summarizer/src/main/java/opennlp/summarization/preprocess/DefaultDocProcessor.java
+++ b/summarizer/src/main/java/opennlp/summarization/preprocess/DefaultDocProcessor.java
@@ -18,7 +18,6 @@
package opennlp.summarization.preprocess;
import java.io.BufferedInputStream;
-import java.io.FileInputStream;
import java.io.FileReader;
import java.io.InputStream;
import java.io.LineNumberReader;
diff --git a/summarizer/src/main/java/opennlp/summarization/preprocess/IDFWordWeight.java b/summarizer/src/main/java/opennlp/summarization/preprocess/IDFWordWeight.java
index 188ec07..fbf381f 100755
--- a/summarizer/src/main/java/opennlp/summarization/preprocess/IDFWordWeight.java
+++ b/summarizer/src/main/java/opennlp/summarization/preprocess/IDFWordWeight.java
@@ -18,7 +18,6 @@
package opennlp.summarization.preprocess;
import java.util.Hashtable;
-import java.io.File;
import java.io.FileReader;
import java.io.LineNumberReader;
@@ -28,12 +27,12 @@ import java.io.LineNumberReader;
*/
public class IDFWordWeight implements WordWeight
{
- Hashtable<String, Double> idf;
+ final Hashtable<String, Double> idf;
private static IDFWordWeight instance;
public IDFWordWeight(String fileName)
{
- idf = new Hashtable<String,Double>();
+ idf = new Hashtable<>();
load(fileName);
}
@@ -53,7 +52,7 @@ public class IDFWordWeight implements WordWeight
{
return 1;
}
- return d.doubleValue();
+ return d;
}
/*
diff --git a/summarizer/src/main/java/opennlp/summarization/preprocess/PorterStemmer.java b/summarizer/src/main/java/opennlp/summarization/preprocess/PorterStemmer.java
index 85878cb..3b787f6 100755
--- a/summarizer/src/main/java/opennlp/summarization/preprocess/PorterStemmer.java
+++ b/summarizer/src/main/java/opennlp/summarization/preprocess/PorterStemmer.java
@@ -108,6 +108,7 @@ public class PorterStemmer implements Stemmer {
* or a reference to the internal buffer can be retrieved by getResultBuffer
* and getResultLength (which is generally more efficient.)
*/
+ @Override
public String toString() { return new String(b,0,i_end); }
/**
diff --git a/summarizer/src/main/java/opennlp/summarization/preprocess/StopWords.java b/summarizer/src/main/java/opennlp/summarization/preprocess/StopWords.java
index cd25c2a..c0d7d55 100755
--- a/summarizer/src/main/java/opennlp/summarization/preprocess/StopWords.java
+++ b/summarizer/src/main/java/opennlp/summarization/preprocess/StopWords.java
@@ -219,7 +219,7 @@ public class StopWords {
}
public boolean isStopWord(String s) {
- boolean ret = h.get(s)==null ? false: true;
+ boolean ret = h.get(s) != null;
if(s.length()==1) ret = true;
return ret;
}
diff --git a/summarizer/src/main/java/opennlp/summarization/textrank/TextRank.java b/summarizer/src/main/java/opennlp/summarization/textrank/TextRank.java
index 7e2a6b7..b068637 100755
--- a/summarizer/src/main/java/opennlp/summarization/textrank/TextRank.java
+++ b/summarizer/src/main/java/opennlp/summarization/textrank/TextRank.java
@@ -91,7 +91,7 @@ public class TextRank {
wt = wrdWts.get(currWrd1);
if (wt != null)
- wordsInCommon += wt.doubleValue();
+ wordsInCommon += wt;
else
wordsInCommon++;
}
diff --git a/summarizer/src/main/java/opennlp/summarization/textrank/TextRankSummarizer.java b/summarizer/src/main/java/opennlp/summarization/textrank/TextRankSummarizer.java
index fa5a077..67f609e 100755
--- a/summarizer/src/main/java/opennlp/summarization/textrank/TextRankSummarizer.java
+++ b/summarizer/src/main/java/opennlp/summarization/textrank/TextRankSummarizer.java
@@ -31,7 +31,7 @@ import opennlp.summarization.preprocess.WordWeight;
public class TextRankSummarizer implements Summarizer {
// An optional file to store idf of words. If idf is not available it uses a default equal weight for all words.
- private String idfFile = "resources/idf.csv";
+ private final String idfFile = "resources/idf.csv";
public TextRankSummarizer() {
}
diff --git a/tagging-server/src/main/java/org/apache/opennlp/tagging_server/POSTaggerResource.java b/tagging-server/src/main/java/org/apache/opennlp/tagging_server/POSTaggerResource.java
index cec06f7..bea21a6 100644
--- a/tagging-server/src/main/java/org/apache/opennlp/tagging_server/POSTaggerResource.java
+++ b/tagging-server/src/main/java/org/apache/opennlp/tagging_server/POSTaggerResource.java
@@ -38,7 +38,7 @@ public class POSTaggerResource {
@Path("_tag")
// @QueryParam("lang") String lang,
// @QueryParam("model") String modelName
- public String[][] tag(String document[][]) {
+ public String[][] tag(String[][] document) {
ServiceReference modelService = ModelUtil.getService(POSModel.class);
diff --git a/tagging-server/src/main/java/org/apache/opennlp/tagging_server/TaggingServerBundle.java b/tagging-server/src/main/java/org/apache/opennlp/tagging_server/TaggingServerBundle.java
index d231d7e..2fa0007 100644
--- a/tagging-server/src/main/java/org/apache/opennlp/tagging_server/TaggingServerBundle.java
+++ b/tagging-server/src/main/java/org/apache/opennlp/tagging_server/TaggingServerBundle.java
@@ -50,7 +50,7 @@ public class TaggingServerBundle implements BundleActivator {
public Object addingService(ServiceReference serviceRef) {
httpService = (HttpService)super.addingService(serviceRef);
- Dictionary<String, String> jerseyServletParams = new Hashtable<String, String>();
+ Dictionary<String, String> jerseyServletParams = new Hashtable<>();
jerseyServletParams.put("javax.ws.rs.Application", TaggingServerApplication.class.getName());
jerseyServletParams.put("com.sun.jersey.api.json.POJOMappingFeature", "true");
diff --git a/tagging-server/src/main/java/org/apache/opennlp/tagging_server/namefind/BratNameFinderResource.java b/tagging-server/src/main/java/org/apache/opennlp/tagging_server/namefind/BratNameFinderResource.java
index 059229a..7cf0b11 100644
--- a/tagging-server/src/main/java/org/apache/opennlp/tagging_server/namefind/BratNameFinderResource.java
+++ b/tagging-server/src/main/java/org/apache/opennlp/tagging_server/namefind/BratNameFinderResource.java
@@ -80,7 +80,7 @@ public class BratNameFinderResource {
+ sentenceSpan.getStart();
// create a list of new line indexes
- List<Integer> newLineIndexes = new ArrayList<Integer>();
+ List<Integer> newLineIndexes = new ArrayList<>();
// TODO: Code needs to handle case that there are multiple new lines in a row
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/namecat/NameCategorizer.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namecat/NameCategorizer.java
index 2513c03..de0215a 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/namecat/NameCategorizer.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namecat/NameCategorizer.java
@@ -78,8 +78,8 @@ public class NameCategorizer {
int maxLength = Arrays.stream(names).mapToInt(String::length).max().getAsInt();
- int charIds[][] = new int[names.length][maxLength];
- int nameLengths[] = new int[names.length];
+ int[][] charIds = new int[names.length][maxLength];
+ int[] nameLengths = new int[names.length];
for (int nameIndex = 0; nameIndex < names.length; nameIndex++) {
for (int charIndex = 0; charIndex < names[nameIndex].length(); charIndex++) {
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/FeedDictionary.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/FeedDictionary.java
index e3eaf6a..c7b7234 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/FeedDictionary.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/FeedDictionary.java
@@ -23,7 +23,7 @@ import org.tensorflow.Tensor;
public class FeedDictionary implements AutoCloseable {
- static int PAD_VALUE = 0;
+ static final int PAD_VALUE = 0;
private final Tensor<Float> dropoutTensor;
private final Tensor<Integer> charIdsTensor;
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/WordIndexer.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/WordIndexer.java
index fe7a820..729ecf1 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/WordIndexer.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/WordIndexer.java
@@ -34,7 +34,7 @@ public class WordIndexer {
private final Map<Character, Integer> char2idx;
private final Map<String, Integer> word2idx;
- public static String UNK = "$UNK$";
+ public static final String UNK = "$UNK$";
public static String NUM = "$NUM$";
private final boolean lowerCase = false;