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/05/22 05:35:54 UTC

[incubator-nlpcraft] 01/01: Merge branch 'NLPCRAFT-30'

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

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

commit 30e3fc0907ac29ad92577cec329771eec518d16b
Merge: 6feb86f 4878ca4
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Fri May 22 08:27:08 2020 +0300

    Merge branch 'NLPCRAFT-30'

 bindist/LICENSE                                    |    6 +
 pom.xml                                            |    7 +
 src/main/resources/nlpcraft.conf                   |   19 +-
 .../apache/nlpcraft/common/nlp/NCNlpSentence.scala |  633 +++-
 .../nlpcraft/common/nlp/NCNlpSentenceNote.scala    |   43 +-
 .../scala/org/apache/nlpcraft/examples/README.md   |    4 +-
 .../org/apache/nlpcraft/examples/alarm/README.md   |    8 +-
 .../org/apache/nlpcraft/examples/echo/README.md    |    8 +-
 .../apache/nlpcraft/examples/helloworld/README.md  |    8 +-
 .../examples/lightswitch/LightSwitchTest.java      |    2 +-
 .../apache/nlpcraft/examples/lightswitch/README.md |    8 +-
 .../org/apache/nlpcraft/examples/phone/README.md   |   12 +-
 .../nlpcraft/examples/{time => sql}/README.md      |   22 +-
 .../apache/nlpcraft/examples/sql/SqlModel.scala    |  427 +++
 .../org/apache/nlpcraft/examples/sql/SqlTest.scala |  688 ++++
 .../nlpcraft/examples/sql/db/SqlAccess.scala       |  141 +
 .../apache/nlpcraft/examples/sql/db/SqlBeans.scala |   63 +
 .../nlpcraft/examples/sql/db/SqlBuilder.scala      |  473 +++
 .../nlpcraft/examples/sql/db/SqlServer.scala       |  103 +
 .../nlpcraft/examples/sql/db/SqlValueLoader.scala  |   53 +
 .../org/apache/nlpcraft/examples/sql/db/model.png  |  Bin 0 -> 203011 bytes
 .../apache/nlpcraft/examples/sql/db/northwind.sql  | 3464 ++++++++++++++++++++
 .../apache/nlpcraft/examples/sql/sql_model.yaml    | 1500 +++++++++
 .../nlpcraft/examples/sql/sql_model_init.yaml      | 1409 ++++++++
 .../org/apache/nlpcraft/examples/time/README.md    |    8 +-
 .../org/apache/nlpcraft/examples/weather/README.md |    8 +-
 .../apache/nlpcraft/model/impl/NCTokenLogger.scala |   64 +-
 .../apache/nlpcraft/model/impl/NCValueImpl.java    |   50 -
 .../impl/antlr4/NCIntentDslBaseListener.java       |    2 +-
 .../intent/impl/antlr4/NCIntentDslBaseVisitor.java |    2 +-
 .../model/intent/impl/antlr4/NCIntentDslLexer.java |    2 +-
 .../intent/impl/antlr4/NCIntentDslListener.java    |    2 +-
 .../intent/impl/antlr4/NCIntentDslParser.java      |    2 +-
 .../intent/impl/antlr4/NCIntentDslVisitor.java     |    2 +-
 .../model/tools/sqlgen/NCSqlExtractor.java         |    4 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlLimit.java    |    5 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlSort.java     |    7 +-
 .../model/tools/sqlgen/impl/NCSqlBeans.scala       |   43 +-
 .../tools/sqlgen/impl/NCSqlExtractorImpl.scala     |  201 +-
 .../tools/sqlgen/impl/NCSqlSchemaBuilderImpl.scala |  146 +-
 .../model/tools/test/NCTestClientBuilder.java      |   19 +-
 .../org/apache/nlpcraft/probe/NCProbeBoot.scala    |    3 -
 .../nlpcraft/probe/mgrs/NCModelDecorator.scala     |   71 +-
 .../org/apache/nlpcraft/probe/mgrs/NCSynonym.scala |   40 +-
 .../conversation/NCConversationDescriptor.scala    |    8 +-
 .../model/antlr4/NCSynonymDslBaseListener.java     |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslBaseVisitor.java |    2 +-
 .../probe/mgrs/model/antlr4/NCSynonymDslLexer.java |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslListener.java    |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslParser.java      |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslVisitor.java     |    2 +-
 .../nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala  |   49 +-
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  |   67 +-
 .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala |  134 +-
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala |   17 +-
 .../nlp/enrichers/post/NCPostEnrichProcessor.scala |  805 -----
 .../enrichers/relation/NCRelationEnricher.scala    |   49 +-
 .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala   |  460 ++-
 .../apache/nlpcraft/server/geo/NCGeoManager.scala  |    2 +
 .../nlpcraft/examples/sql/NCSqlModelSpec.scala     |  181 +
 .../mgrs/nlp/enrichers/NCDefaultTestModel.scala    |    2 +
 .../mgrs/nlp/enrichers/NCEnricherBaseSpec.scala    |   54 +-
 .../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala  |  121 +-
 .../nlp/enrichers/sort/NCEnricherSortSpec.scala    |   89 +-
 64 files changed, 10334 insertions(+), 1498 deletions(-)