You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2021/12/28 07:27:19 UTC

[incubator-nlpcraft] branch NLPCRAFT-471 updated (a9f8e4f -> c71f48f)

This is an automated email from the ASF dual-hosted git repository.

sergeykamov pushed a change to branch NLPCRAFT-471
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.


    from a9f8e4f  WIP.
     add 63321a3  WIP.
     add ebf4ab1  WIP
     new c71f48f  Merge branch 'master' into NLPCRAFT-471

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/scala/org/apache/nlpcraft/NCEntity.java  |  2 +-
 .../main/scala/org/apache/nlpcraft/NCModelConfig.java |  2 +-
 .../org/apache/nlpcraft/NCModelConfigAdapter.java     |  2 +-
 .../{NCParameterized.java => NCPropertyMap.java}      |  2 +-
 ...eterizedAdapter.java => NCPropertyMapAdapter.java} |  2 +-
 .../src/main/scala/org/apache/nlpcraft/NCToken.java   |  2 +-
 .../main/scala/org/apache/nlpcraft/NCTokenParser.java |  3 ++-
 .../token/enricher/impl/NCEnLanguageWordsImpl.scala   |  1 +
 .../token/parser/opennlp/NCEnOpenNlpTokenParser.java  | 19 +++++++------------
 .../token/parser/opennlp/impl/NCEnOpenNlpImpl.scala   | 13 ++++---------
 .../parser/opennlp/impl/NCEnStopWordsFinder.scala     |  2 +-
 .../org/apache/nlpcraft/internal/util/NCUtils.scala   | 17 +++++------------
 .../apache/nlpcraft/internal/version/NCVersion.scala  |  3 +++
 .../opennlp/NCEnOpenNlpTokenParserBenchmark.java      |  2 +-
 .../enricher/NCEnBracketsTokenEnricherSpec.scala      |  2 +-
 .../token/enricher/NCEnQuotesTokenEnricherSpec.scala  |  2 +-
 .../parser/opennlp/NCEnOpenNlpTokenParserSpec.scala   |  2 +-
 .../nlpcraft/internal/nlp/util/NCTestToken.scala      |  2 +-
 18 files changed, 34 insertions(+), 46 deletions(-)
 rename nlpcraft/src/main/scala/org/apache/nlpcraft/{NCParameterized.java => NCPropertyMap.java} (97%)
 rename nlpcraft/src/main/scala/org/apache/nlpcraft/{NCParameterizedAdapter.java => NCPropertyMapAdapter.java} (96%)

[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-471

Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sergeykamov pushed a commit to branch NLPCRAFT-471
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git

commit c71f48f14176338b60bcecac5c70bb9bfe791a8d
Merge: a9f8e4f ebf4ab1
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Tue Dec 28 10:26:59 2021 +0300

    Merge branch 'master' into NLPCRAFT-471

 .../src/main/scala/org/apache/nlpcraft/NCEntity.java  |  2 +-
 .../main/scala/org/apache/nlpcraft/NCModelConfig.java |  2 +-
 .../org/apache/nlpcraft/NCModelConfigAdapter.java     |  2 +-
 .../{NCParameterized.java => NCPropertyMap.java}      |  2 +-
 ...eterizedAdapter.java => NCPropertyMapAdapter.java} |  2 +-
 .../src/main/scala/org/apache/nlpcraft/NCToken.java   |  2 +-
 .../main/scala/org/apache/nlpcraft/NCTokenParser.java |  3 ++-
 .../token/enricher/impl/NCEnLanguageWordsImpl.scala   |  1 +
 .../token/parser/opennlp/NCEnOpenNlpTokenParser.java  | 19 +++++++------------
 .../token/parser/opennlp/impl/NCEnOpenNlpImpl.scala   | 13 ++++---------
 .../parser/opennlp/impl/NCEnStopWordsFinder.scala     |  2 +-
 .../org/apache/nlpcraft/internal/util/NCUtils.scala   | 17 +++++------------
 .../apache/nlpcraft/internal/version/NCVersion.scala  |  3 +++
 .../opennlp/NCEnOpenNlpTokenParserBenchmark.java      |  2 +-
 .../enricher/NCEnBracketsTokenEnricherSpec.scala      |  2 +-
 .../token/enricher/NCEnQuotesTokenEnricherSpec.scala  |  2 +-
 .../parser/opennlp/NCEnOpenNlpTokenParserSpec.scala   |  2 +-
 .../nlpcraft/internal/nlp/util/NCTestToken.scala      |  2 +-
 18 files changed, 34 insertions(+), 46 deletions(-)

diff --cc nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala
index ef25ed8,bb52615..2727191
--- a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala
+++ b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala
@@@ -33,10 -33,17 +33,10 @@@ class NCEnOpenNlpTokenParserSpec
      private var parser: NCEnOpenNlpTokenParser = _
  
      @BeforeEach
 -    def start(): Unit =
 -        parser = NCTestUtils.makeAndStart(
 -            new NCEnOpenNlpTokenParser(
 -                "opennlp/en-token.bin",
 -                "opennlp/en-pos-maxent.bin",
 -                "opennlp/en-lemmatizer.dict"
 -            )
 -        )
 +    def start(): Unit = parser = NCTestUtils.makeAndStart(NCTestUtils.mkEnParser)
  
      private def test(txt: String, validate: Seq[NCToken] => _): Unit =
-         val toks = parser.parse(nlp.util.NCTestRequest(txt)).asScala.toSeq
+         val toks = parser.parse(nlp.util.NCTestRequest(txt), null).asScala.toSeq
          assert(toks.nonEmpty)
          NCTestUtils.printTokens(toks)
          validate(toks)