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 2020/10/28 07:48:41 UTC
[incubator-nlpcraft] branch NLPCRAFT-160 updated (8262bf0 ->
5f44e87)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-160
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 8262bf0 WIP.
add 07866ec Fix for NLPCRAFT-162.
add bb1c35a WIP.
add fc62ccf WIP.
add 466522b Update NCDslTerm.java
add fe94e68 Fix for NLPCRAFT-164.
add 882ed10 javadoc fixes.
add 5f91775 javadoc fixes.
add a132404 Update README.md
new 5f44e87 Merge branch 'master' into NLPCRAFT-160
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:
KEYS | 163 -----
README.md | 15 +-
.../nlpcraft/examples/alarm/alarm_model.json | 2 +-
.../examples/lightswitch/lightswitch_model.yaml | 2 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 1 -
.../apache/nlpcraft/examples/sql/SqlModel.scala | 36 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 4 +-
.../nlpcraft/examples/weather/WeatherModel.java | 9 +-
.../scala/org/apache/nlpcraft/model/NCContext.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentMatch.java | 1 +
.../org/apache/nlpcraft/model/NCIntentSkip.java | 1 +
.../scala/org/apache/nlpcraft/model/NCToken.java | 11 +-
.../model/intent/impl/NCIntentDslCompiler.scala | 27 +-
.../model/intent/impl/NCIntentSolverEngine.scala | 11 +-
.../model/intent/impl/antlr4/NCIntentDsl.g4 | 6 +-
.../model/intent/impl/antlr4/NCIntentDsl.interp | 6 +-
.../model/intent/impl/antlr4/NCIntentDsl.tokens | 128 ++--
.../impl/antlr4/NCIntentDslBaseListener.java | 26 +-
.../intent/impl/antlr4/NCIntentDslBaseVisitor.java | 189 -----
.../intent/impl/antlr4/NCIntentDslLexer.interp | 5 +-
.../model/intent/impl/antlr4/NCIntentDslLexer.java | 211 +++---
.../intent/impl/antlr4/NCIntentDslLexer.tokens | 128 ++--
.../intent/impl/antlr4/NCIntentDslListener.java | 22 +-
.../intent/impl/antlr4/NCIntentDslParser.java | 810 +++++++++------------
.../intent/impl/antlr4/NCIntentDslVisitor.java | 163 -----
.../nlpcraft/model/intent/utils/NCDslIntent.scala | 5 +-
.../nlpcraft/model/intent/utils/NCDslTerm.java | 20 +-
.../nlpcraft/model/tools/cmdline/NCCli.scala | 25 +-
.../mgrs/model/NCModelSynonymDslCompiler.scala | 4 +-
.../model/antlr4/NCSynonymDslBaseListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslBaseVisitor.java | 98 ---
.../probe/mgrs/model/antlr4/NCSynonymDslLexer.java | 5 +-
.../mgrs/model/antlr4/NCSynonymDslListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslParser.java | 65 +-
.../mgrs/model/antlr4/NCSynonymDslVisitor.java | 85 ---
.../apache/nlpcraft/model/NCIntentSampleSpec.scala | 4 +-
.../conversation/NCConversationTimeoutSpec.scala | 2 +-
.../nlpcraft/model/intent/dsl/dsl_test_model.yaml | 2 +-
.../nlpcraft/models/stm/NCStmTestModel.scala | 8 +-
39 files changed, 732 insertions(+), 1574 deletions(-)
delete mode 100644 KEYS
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslBaseVisitor.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslVisitor.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseVisitor.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslVisitor.java
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-160
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-160
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 5f44e8729e6442d443683150c4494527f7d9c77d
Merge: 8262bf0 a132404
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Wed Oct 28 10:48:12 2020 +0300
Merge branch 'master' into NLPCRAFT-160
# Conflicts:
# nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml
KEYS | 163 -----
README.md | 15 +-
.../nlpcraft/examples/alarm/alarm_model.json | 2 +-
.../examples/lightswitch/lightswitch_model.yaml | 2 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 1 -
.../apache/nlpcraft/examples/sql/SqlModel.scala | 36 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 4 +-
.../nlpcraft/examples/weather/WeatherModel.java | 9 +-
.../scala/org/apache/nlpcraft/model/NCContext.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentMatch.java | 1 +
.../org/apache/nlpcraft/model/NCIntentSkip.java | 1 +
.../scala/org/apache/nlpcraft/model/NCToken.java | 11 +-
.../model/intent/impl/NCIntentDslCompiler.scala | 27 +-
.../model/intent/impl/NCIntentSolverEngine.scala | 11 +-
.../model/intent/impl/antlr4/NCIntentDsl.g4 | 6 +-
.../model/intent/impl/antlr4/NCIntentDsl.interp | 6 +-
.../model/intent/impl/antlr4/NCIntentDsl.tokens | 128 ++--
.../impl/antlr4/NCIntentDslBaseListener.java | 26 +-
.../intent/impl/antlr4/NCIntentDslBaseVisitor.java | 189 -----
.../intent/impl/antlr4/NCIntentDslLexer.interp | 5 +-
.../model/intent/impl/antlr4/NCIntentDslLexer.java | 211 +++---
.../intent/impl/antlr4/NCIntentDslLexer.tokens | 128 ++--
.../intent/impl/antlr4/NCIntentDslListener.java | 22 +-
.../intent/impl/antlr4/NCIntentDslParser.java | 810 +++++++++------------
.../intent/impl/antlr4/NCIntentDslVisitor.java | 163 -----
.../nlpcraft/model/intent/utils/NCDslIntent.scala | 5 +-
.../nlpcraft/model/intent/utils/NCDslTerm.java | 20 +-
.../nlpcraft/model/tools/cmdline/NCCli.scala | 25 +-
.../mgrs/model/NCModelSynonymDslCompiler.scala | 4 +-
.../model/antlr4/NCSynonymDslBaseListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslBaseVisitor.java | 98 ---
.../probe/mgrs/model/antlr4/NCSynonymDslLexer.java | 5 +-
.../mgrs/model/antlr4/NCSynonymDslListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslParser.java | 65 +-
.../mgrs/model/antlr4/NCSynonymDslVisitor.java | 85 ---
.../apache/nlpcraft/model/NCIntentSampleSpec.scala | 4 +-
.../conversation/NCConversationTimeoutSpec.scala | 2 +-
.../nlpcraft/model/intent/dsl/dsl_test_model.yaml | 2 +-
.../nlpcraft/models/stm/NCStmTestModel.scala | 8 +-
39 files changed, 732 insertions(+), 1574 deletions(-)