This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NC-473 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit c3d2767beee9d3533c5bf0c0ca6b3cf4ede92dd8 Merge: 925a6ff a30893d Author: Sergey Kamov <skhdlem...@gmail.com> AuthorDate: Thu Jan 20 16:02:14 2022 +0300 Merge branch 'master' into NC-473 # Conflicts: # nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImplSpec.scala # nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala ...yParser.java => NCStanfordNLPEntityParser.java} | 18 +++++------- ...l.scala => NCStanfordNLPEntityParserImpl.scala} | 4 +-- ...enParser.java => NCStanfordNLPTokenParser.java} | 14 ++++------ ...pl.scala => NCStanfordNLPTokenParserImpl.scala} | 4 +-- ...c.scala => NCStanfordNLPEntityParserSpec.scala} | 6 ++-- ...ec.scala => NCStanfordNLPTokenParserSpec.scala} | 2 +- .../nlpcraft/nlp/util/stanford/NCTestConfig.scala | 6 ++-- ...NlpEntityParser.java => NCNLPEntityParser.java} | 6 ++-- ...NCNlpImpl.scala => NCNLPEntityParserImpl.scala} | 6 ++-- ...ntityParser.java => NCOpenNLPEntityParser.java} | 15 +++++----- ...pImpl.scala => NCOpenNLPEntityParserImpl.scala} | 2 +- .../entity/parser/semantic/NCSemanticElement.java | 1 + .../semantic/impl/NCSemanticEntityParserImpl.scala | 32 ++++++++-------------- .../parser/semantic/impl/NCSemanticSynonym.scala | 5 ++++ ...Stemmer.java => NCEnSemanticPorterStemmer.java} | 2 +- .../token/enricher/en/NCBracketsTokenEnricher.java | 4 +-- .../enricher/en/NCDictionaryTokenEnricher.java | 4 +-- .../token/enricher/en/NCQuotesTokenEnricher.java | 4 +-- .../enricher/en/NCStopWordsTokenEnricher.java | 8 +++--- .../en/N\320\241SwearWordsTokenEnricher.java" | 6 ++-- ...mpl.scala => NCBracketsTokenEnricherImpl.scala} | 2 +- ...l.scala => NCDictionaryTokenEnricherImpl.scala} | 2 +- ...sImpl.scala => NCQuotesTokenEnricherImpl.scala} | 2 +- ...pl.scala => NCStopWordsTokenEnricherImpl.scala} | 6 ++-- ...l.scala => NCSwearWordsTokenEnricherImpl.scala} | 2 +- ...pTokenParser.java => NCOpenNLPTokenParser.java} | 10 +++---- ...lpImpl.scala => NCOpenNLPTokenParserImpl.scala} | 2 +- .../internal/NCModelPipelineProcessorSpec.scala | 6 ++-- .../opennlp/NCEnOpenNlpTokenParserBenchmark.java | 6 ++-- ...arserSpec.scala => NCNLPEntityParserSpec.scala} | 6 ++-- ...rSpec.scala => NCOpenNLPEntityParserSpec.scala} | 5 ++-- .../semantic/NCSemanticEntityParserJsonSpec.scala | 8 +++--- .../semantic/NCSemanticEntityParserSpec.scala | 6 ++-- .../semantic/NCSemanticEntityParserYamlSpec.scala | 6 ++-- .../enricher/en/impl/NCStopWordsImplSpec.scala | 6 ++-- ...erSpec.scala => NCOpenNLPTokenParserSpec.scala} | 2 +- .../apache/nlpcraft/nlp/util/NCTestPipeline.scala | 2 +- .../nlpcraft/nlp/util/opennlp/NCTestConfig.scala | 6 +++- 38 files changed, 113 insertions(+), 121 deletions(-) diff --cc nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala index 2228a3e,db50e89..7ae1fc6 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/util/opennlp/NCTestConfig.scala @@@ -25,4 -29,10 +29,4 @@@ final val CFG = NCTestConfigJava.CF /** * */ - final val EN_PIPELINE = NCTestConfigJava.EN_PIPELINE -final val EN_PIPELINE = NCTestPipeline( - new NCOpenNLPTokenParser( - "opennlp/en-token.bin", - "opennlp/en-pos-maxent.bin", - "opennlp/en-lemmatizer.dict" - ) -) ++final val EN_PIPELINE = NCTestConfigJava.EN_PIPELINE