You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/12/28 08:01:26 UTC
[incubator-nlpcraft] 02/02: Merge branch 'NLPCRAFT-178' into NLPCRAFT-203

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

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

commit ab87f50d4d8715655fdbc6678f7d88797dce6bbe
Merge: 5c7d10f 7dbe239
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Mon Dec 28 00:01:09 2020 -0800

    Merge branch 'NLPCRAFT-178' into NLPCRAFT-203

 .../nlpcraft/examples/sql/db/SqlBuilder.scala      |   4 +-
 .../model/intent/impl/NCIntentDslCompiler.scala    |  58 +-
 .../model/intent/impl/NCIntentSolver.scala         |  17 +-
 .../model/intent/impl/NCIntentSolverEngine.scala   |  68 +-
 .../model/intent/impl/antlr4/NCIntentDsl.g4        |  18 +-
 .../model/intent/impl/antlr4/NCIntentDsl.interp    |  10 +-
 .../model/intent/impl/antlr4/NCIntentDsl.tokens    |  16 +-
 .../impl/antlr4/NCIntentDslBaseListener.java       |  50 +-
 .../intent/impl/antlr4/NCIntentDslLexer.interp     |   8 +-
 .../model/intent/impl/antlr4/NCIntentDslLexer.java | 193 ++---
 .../intent/impl/antlr4/NCIntentDslLexer.tokens     |  16 +-
 .../intent/impl/antlr4/NCIntentDslListener.java    |  42 +-
 .../intent/impl/antlr4/NCIntentDslParser.java      | 819 +++++++--------------
 .../model/intent/utils/NCDslFlowItem.scala         |  43 --
 .../nlpcraft/model/intent/utils/NCDslIntent.scala  |  32 +-
 .../nlpcraft/model/tools/test/NCTestClient.java    |   8 +
 .../model/tools/test/NCTestClientBuilder.java      |  26 +
 .../mgrs/model/NCModelSynonymDslCompiler.scala     |   4 +-
 .../model/antlr4/NCSynonymDslBaseListener.java     |   2 +-
 .../probe/mgrs/model/antlr4/NCSynonymDslLexer.java |   4 +-
 .../mgrs/model/antlr4/NCSynonymDslListener.java    |   2 +-
 .../mgrs/model/antlr4/NCSynonymDslParser.java      |   4 +-
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  |   2 +-
 .../nlpcraft/server/ignite/NCIgniteHelpers.scala   |   2 +-
 .../nlpcraft/server/query/NCQueryManager.scala     |   2 +-
 .../nlpcraft/server/user/NCUserManager.scala       |   2 +-
 .../model/conversation/NCConversationSpec.scala    |   1 +
 .../nlpcraft/model/dialog/NCDialogSpec.scala       | 124 ++++
 .../intent/impl/NCIntentSolverEngineSpec.scala     |  60 +-
 pom.xml                                            |   2 +-
 30 files changed, 618 insertions(+), 1021 deletions(-)