[incubator-nlpcraft] branch NLPCRAFT-491 updated (e4f5cb3e -> 86e48ce2)

[se...@apache.org]

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

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


    from e4f5cb3e Merge branch 'NLPCRAFT-492' into NLPCRAFT-491-1
     add eb3785e5 NCEntityMapper implementation and related tests added.
     new 86e48ce2 Merge branch 'master' into NLPCRAFT-491

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:
 .../scala/org/apache/nlpcraft/NCEntityMapper.java  |  8 ++--
 .../internal/impl/NCModelPipelineManager.scala     |  2 +-
 .../apache/nlpcraft/nlp/NCEntityMapperSpec.scala   | 44 +++++++++++++---------
 3 files changed, 31 insertions(+), 23 deletions(-)

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

[se...@apache.org]

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

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

commit 86e48ce2daa28e4663bd172bc1f4a8261fa78b41
Merge: e4f5cb3e eb3785e5
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Mon Apr 4 13:18:39 2022 +0300

    Merge branch 'master' into NLPCRAFT-491
    
    # Conflicts:
    #       nlpcraft/src/main/scala/org/apache/nlpcraft/NCEntityMapper.java
    #       nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManager.scala
    #       nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityMapperSpec.scala

 .../scala/org/apache/nlpcraft/NCEntityMapper.java  |  8 ++--
 .../internal/impl/NCModelPipelineManager.scala     |  2 +-
 .../apache/nlpcraft/nlp/NCEntityMapperSpec.scala   | 44 +++++++++++++---------
 3 files changed, 31 insertions(+), 23 deletions(-)