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/06/13 20:56:50 UTC
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-67
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-67
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 354b98296738641f47273b5a056b86370f9324f9
Merge: 51faecf 07da3df
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sat Jun 13 23:56:29 2020 +0300
Merge branch 'master' into NLPCRAFT-67
nlpcraft/pom.xml | 10 +++-------
.../org/apache/nlpcraft/examples/alarm/README.md | 2 +-
.../org/apache/nlpcraft/examples/echo/README.md | 2 +-
.../apache/nlpcraft/examples/helloworld/README.md | 2 +-
.../apache/nlpcraft/examples/lightswitch/README.md | 2 +-
.../org/apache/nlpcraft/examples/phone/README.md | 2 +-
.../org/apache/nlpcraft/examples/sql/README.md | 2 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 16 +++++++++++----
.../org/apache/nlpcraft/examples/time/README.md | 2 +-
.../org/apache/nlpcraft/examples/weather/README.md | 2 +-
.../scala/org/apache/nlpcraft/model/NCElement.java | 4 ++--
.../scala/org/apache/nlpcraft/model/NCIntent.java | 3 ++-
.../{NCIntentTerm.java => NCIntentExample.java} | 23 ++++++++++++----------
.../org/apache/nlpcraft/model/NCIntentMatch.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentRef.java | 3 ++-
.../org/apache/nlpcraft/model/NCIntentSkip.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentTerm.java | 3 ++-
.../org/apache/nlpcraft/model/NCMetadata.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCModel.java | 2 +-
.../org/apache/nlpcraft/model/NCModelAdapter.java | 2 +-
.../org/apache/nlpcraft/model/NCModelFactory.java | 2 +-
.../apache/nlpcraft/model/NCModelFileAdapter.java | 2 +-
.../org/apache/nlpcraft/model/NCModelView.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCToken.java | 2 +-
.../model/factories/basic/NCBasicModelFactory.java | 2 +-
.../factories/spring/NCSpringModelFactory.java | 2 +-
.../model/intent/impl/NCIntentScanner.scala | 18 ++++++++---------
27 files changed, 64 insertions(+), 54 deletions(-)