This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-520 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit fe59a7f026f5102a0489a3cd7dc964da6e26ac9f Merge: 7a0ae4d1 77fde15d Author: Aaron Radzinski <aradzin...@datalingvo.com> AuthorDate: Sat Dec 24 12:33:11 2022 -0800 Merge branch 'NLPCRAFT-521' into NLPCRAFT-520 .../examples/lightswitch/LightSwitchFrModel.scala | 2 +- .../examples/lightswitch/LightSwitchRuModel.scala | 2 +- .../examples/lightswitch/LightSwitchModel.scala | 2 +- .../pizzeria/components/PizzeriaOrderMapper.scala | 18 +- .../components/PizzeriaOrderValidator.scala | 2 +- .../stanford/NCStanfordNLPEntityParser.scala | 2 +- .../main/scala/org/apache/nlpcraft/NCEntity.scala | 11 +- .../internal/conversation/NCConversationData.scala | 4 +- .../internal/impl/NCModelPipelineManager.scala | 4 +- .../intent/compiler/NCIDLCodeGenerator.scala | 10 +- .../internal/intent/compiler/NCIDLCompiler.scala | 2 +- .../internal/intent/compiler/antlr4/NCIDL.g4 | 10 +- .../intent/compiler/antlr4/NCIDLBaseListener.java | 3 +- .../intent/compiler/antlr4/NCIDLLexer.interp | 2 +- .../intent/compiler/antlr4/NCIDLLexer.java | 1286 ++++++++++---------- .../intent/compiler/antlr4/NCIDLListener.java | 2 +- .../intent/compiler/antlr4/NCIDLParser.java | 63 +- .../intent/matcher/NCIntentSolverManager.scala | 4 +- .../nlpcraft/nlp/parsers/NCNLPEntityParser.scala | 16 +- .../nlp/parsers/NCOpenNLPEntityParser.scala | 6 +- .../nlpcraft/nlp/parsers/NCSemanticElement.scala | 18 +- .../nlp/parsers/NCSemanticEntityParser.scala | 26 +- .../nlp/parsers/impl/NCSemanticSourceReader.scala | 2 +- .../parsers/impl/NCSemanticSynonymsProcessor.scala | 66 +- .../conversation/NCConversationManagerSpec.scala | 4 +- .../nlpcraft/internal/impl/NCModelClientSpec.scala | 2 +- .../intent/compiler/functions/NCIDLFunctions.scala | 10 +- .../functions/NCIDLFunctionsEntitiesUsed.scala | 4 +- .../compiler/functions/NCIDLFunctionsEntity.scala | 44 +- .../nlpcraft/internal/intent/compiler/test_ok.idl | 2 +- .../apache/nlpcraft/nlp/NCEntityMapperSpec.scala | 12 +- .../apache/nlpcraft/nlp/NCEntityParserSpec.scala | 2 +- .../parsers/NCSemanticEntityParserJsonSpec.scala | 10 +- .../parsers/NCSemanticEntityParserLemmaSpec.scala | 4 +- .../nlp/parsers/NCSemanticEntityParserSpec.scala | 18 +- .../parsers/NCSemanticEntityParserYamlSpec.scala | 8 +- .../nlp/parsers/NCSemanticTestElement.scala | 8 +- .../apache/nlpcraft/nlp/util/NCTestEntity.scala | 12 +- .../org/apache/nlpcraft/nlp/util/NCTestUtils.scala | 8 +- 39 files changed, 882 insertions(+), 829 deletions(-) diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/parsers/NCNLPEntityParser.scala index 24e75cef,18f525b7..9d10682a --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/parsers/NCNLPEntityParser.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/parsers/NCNLPEntityParser.scala @@@ -31,9 -31,9 +31,9 @@@ private object NCNLPEntityParser import NCNLPEntityParser.* /** - * NLP data [[NCEntityParser entity parser]]. + * NLP data [[NCEntityParser entity parser]]. * - * This parser converts list of input [[NCToken]] instances one-to-one to list of [[NCEntity]] instances with ID **nlp:entity**. + * This parser converts list of input [[NCToken]] instances one-to-one to list of [[NCEntity]] instances with type **nlp:entity**. * All [[NCEntity]] instances contain following mandatory [[NCPropertyMap metadata]] properties: * - nlp:entity:text * - nlp:entity:index