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 2021/02/25 20:46:11 UTC
[incubator-nlpcraft] branch NLPCRAFT-206 updated (bfa41e2 ->
8ed98be)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-206
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from bfa41e2 Update NCIntentDslCompiler.scala
add 9c00e57 WIP.
add 10d364a Create NCMacroDsl.g4
add d529525 Update NCMacroDsl.g4
add ae0a10b WIP.
add 178497f WIP.
add 81a40d4 Create NCMacroCompiler.scala
add 6be2e30 Minor performance improvements.
add e5846b1 Minor performance improvements.
add 97b7c01 Merge branch 'master' into NLPCRAFT-247
add a39b6ee WIP.
add f63e890 WIP.
add e748138 WIP.
add 8484db5 WIP.
add 1140038 WIP.
add c69ea71 WIP.
add 2dd25ac WIP.
add dcf211e WIP.
add 94ceac6 WIP.
add 13b5c2e WIP.
add 33706ee WIP.
add a31a047 WIP.
add e67355f Direct synonyms priorities issue.
add e1c622b Merge branch 'master' into NLPCRAFT-247
add 25bf596 WIP.
add cb5028b WIP.
add fb1c789 Update NCMacroDsl.g4
add 19f4e34 WIP.
add 099eda3 WIP.
add 61dfa14 WIP.
add 0972a5f Quick fixes.
add 07c2029 Update NCProbeEnrichmentManager.scala
add f56b70e WIP.
add ec2c254 Fixed Javadoc issues for the mixed Scala/Java project.
new 8ed98be Merge branch 'master' into NLPCRAFT-206
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:
.../nlpcraft/common/makro/NCMacroCompiler.scala | 265 ++++++++++
.../nlpcraft/common/makro/NCMacroJavaParser.java | 77 +++
.../common/makro/NCMacroJavaParserTrait.java | 59 +++
.../nlpcraft/common/makro/NCMacroParser.scala | 300 ++----------
.../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 78 +++
.../nlpcraft/common/makro/antlr4/NCMacroDsl.interp | 39 ++
.../nlpcraft/common/makro/antlr4/NCMacroDsl.tokens | 16 +
.../makro/antlr4/NCMacroDslBaseListener.java | 111 +++++
.../common/makro/antlr4/NCMacroDslLexer.interp | 53 ++
.../common/makro/antlr4/NCMacroDslLexer.java | 144 ++++++
.../common/makro/antlr4/NCMacroDslLexer.tokens | 16 +
.../common/makro/antlr4/NCMacroDslListener.java | 70 +++
.../common/makro/antlr4/NCMacroDslParser.java | 545 +++++++++++++++++++++
.../apache/nlpcraft/common/nlp/NCNlpSentence.scala | 170 +++++--
.../nlpcraft/examples/alarm/alarm_model.json | 4 +-
.../examples/lightswitch/lightswitch_model.yaml | 14 +-
.../nlpcraft/examples/phone/phone_model.json | 2 +-
.../apache/nlpcraft/examples/sql/sql_model.yaml | 14 +-
.../nlpcraft/examples/sql/sql_model_init.yaml | 2 +-
.../apache/nlpcraft/examples/time/time_model.yaml | 4 +-
.../nlpcraft/examples/weather/weather_model.json | 4 +-
.../scala/org/apache/nlpcraft/model/NCElement.java | 18 +-
.../apache/nlpcraft/model/NCMacroProcessor.java | 101 ++++
.../org/apache/nlpcraft/model/NCModelView.java | 4 +-
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 2 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 23 +-
.../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala | 10 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 31 +-
.../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 4 +-
.../coordinate/NCCoordinatesEnricher.scala | 4 +-
.../nlp/enrichers/date/NCDateConstants.scala | 24 +-
.../scala/org/apache/nlpcraft/NCTestElement.scala | 1 +
.../common/makro/NCMacroCompilerSpec.scala | 121 +++++
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 259 +++-------
.../nlpcraft/model/jiggle/NCJiggleSpec.scala | 99 ++++
.../model/NCEnricherNestedModelSpec.scala | 6 +-
.../model/NCEnricherNestedModelSpec3.scala | 61 +++
37 files changed, 2192 insertions(+), 563 deletions(-)
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/NCMacroCompiler.scala
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/NCMacroJavaParser.java
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/NCMacroJavaParserTrait.java
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.g4
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.interp
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.tokens
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslBaseListener.java
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.interp
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.java
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.tokens
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslListener.java
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslParser.java
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCMacroProcessor.java
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroCompilerSpec.scala
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/model/jiggle/NCJiggleSpec.scala
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-206
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-206
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 8ed98be1f252d1f716b5817acfdbb42d7eef35e2
Merge: bfa41e2 ec2c254
Author: Aaron Radzinski <ar...@apache.org>
AuthorDate: Thu Feb 25 12:45:54 2021 -0800
Merge branch 'master' into NLPCRAFT-206
.../nlpcraft/common/makro/NCMacroCompiler.scala | 265 ++++++++++
.../nlpcraft/common/makro/NCMacroJavaParser.java | 77 +++
.../common/makro/NCMacroJavaParserTrait.java | 59 +++
.../nlpcraft/common/makro/NCMacroParser.scala | 300 ++----------
.../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 78 +++
.../nlpcraft/common/makro/antlr4/NCMacroDsl.interp | 39 ++
.../nlpcraft/common/makro/antlr4/NCMacroDsl.tokens | 16 +
.../makro/antlr4/NCMacroDslBaseListener.java | 111 +++++
.../common/makro/antlr4/NCMacroDslLexer.interp | 53 ++
.../common/makro/antlr4/NCMacroDslLexer.java | 144 ++++++
.../common/makro/antlr4/NCMacroDslLexer.tokens | 16 +
.../common/makro/antlr4/NCMacroDslListener.java | 70 +++
.../common/makro/antlr4/NCMacroDslParser.java | 545 +++++++++++++++++++++
.../apache/nlpcraft/common/nlp/NCNlpSentence.scala | 170 +++++--
.../nlpcraft/examples/alarm/alarm_model.json | 4 +-
.../examples/lightswitch/lightswitch_model.yaml | 14 +-
.../nlpcraft/examples/phone/phone_model.json | 2 +-
.../apache/nlpcraft/examples/sql/sql_model.yaml | 14 +-
.../nlpcraft/examples/sql/sql_model_init.yaml | 2 +-
.../apache/nlpcraft/examples/time/time_model.yaml | 4 +-
.../nlpcraft/examples/weather/weather_model.json | 4 +-
.../scala/org/apache/nlpcraft/model/NCElement.java | 18 +-
.../apache/nlpcraft/model/NCMacroProcessor.java | 101 ++++
.../org/apache/nlpcraft/model/NCModelView.java | 4 +-
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 2 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 23 +-
.../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala | 10 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 31 +-
.../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 4 +-
.../coordinate/NCCoordinatesEnricher.scala | 4 +-
.../nlp/enrichers/date/NCDateConstants.scala | 24 +-
.../scala/org/apache/nlpcraft/NCTestElement.scala | 1 +
.../common/makro/NCMacroCompilerSpec.scala | 121 +++++
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 259 +++-------
.../nlpcraft/model/jiggle/NCJiggleSpec.scala | 99 ++++
.../model/NCEnricherNestedModelSpec.scala | 6 +-
.../model/NCEnricherNestedModelSpec3.scala | 61 +++
37 files changed, 2192 insertions(+), 563 deletions(-)