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/06 18:47:36 UTC

[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-41

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

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

commit ccccad69f7beaf03a801e9189f7b1cb53338307b
Merge: ef8a2fa 469552a
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sat Jun 6 21:44:08 2020 +0300

    Merge branch 'master' into NLPCRAFT-41
    
    # Conflicts:
    #	nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/suggestions/NCSuggestionsGenerator.scala

 .github/workflows/build.yml                        |   4 +-
 README.md                                          |   2 +-
 bin/MAVEN-RELEASE.md                               |  11 +-
 bin/prepare.sh                                     |  27 +-
 nlpcraft-stanford/pom.xml                          |  64 ++
 .../nlp/core/stanford/NCStanfordTokenizer.scala    |   0
 .../nlp/core/stanford/NCStanfordAnnotator.scala    |   0
 .../nlp/core/stanford/NCStanfordCoreManager.scala  |   0
 .../nlp/core/stanford/NCStanfordNerEnricher.scala  |   0
 .../nlp/core/stanford/NCStanfordParser.scala       |   0
 .../nlp/core/stanford/NCStanfordTokenizer.scala    |   0
 pom.xml => nlpcraft/pom.xml                        | 394 +---------
 {src => nlpcraft/src}/main/python/spacy_proxy.py   |   0
 .../src}/main/resources/badfilter/swear_words.txt  |   0
 .../src}/main/resources/context/geo_pre_words.txt  |   0
 .../src}/main/resources/date/full.txt.gz           | Bin
 .../src}/main/resources/date/parts.txt.gz          | Bin
 .../src}/main/resources/date/parts_dmy.txt.gz      | Bin
 .../src}/main/resources/date/parts_mdy.txt.gz      | Bin
 .../src}/main/resources/date/parts_ymd.txt.gz      | Bin
 .../src}/main/resources/geo/continents.json        |   0
 .../src}/main/resources/geo/countries/AD.json      |   0
 .../src}/main/resources/geo/countries/AE.json      |   0
 .../src}/main/resources/geo/countries/AF.json      |   0
 .../src}/main/resources/geo/countries/AG.json      |   0
 .../src}/main/resources/geo/countries/AI.json      |   0
 .../src}/main/resources/geo/countries/AL.json      |   0
 .../src}/main/resources/geo/countries/AM.json      |   0
 .../src}/main/resources/geo/countries/AN.json      |   0
 .../src}/main/resources/geo/countries/AO.json      |   0
 .../src}/main/resources/geo/countries/AR.json      |   0
 .../src}/main/resources/geo/countries/AS.json      |   0
 .../src}/main/resources/geo/countries/AT.json      |   0
 .../src}/main/resources/geo/countries/AU.json      |   0
 .../src}/main/resources/geo/countries/AW.json      |   0
 .../src}/main/resources/geo/countries/AX.json      |   0
 .../src}/main/resources/geo/countries/AZ.json      |   0
 .../src}/main/resources/geo/countries/BA.json      |   0
 .../src}/main/resources/geo/countries/BB.json      |   0
 .../src}/main/resources/geo/countries/BD.json      |   0
 .../src}/main/resources/geo/countries/BE.json      |   0
 .../src}/main/resources/geo/countries/BF.json      |   0
 .../src}/main/resources/geo/countries/BG.json      |   0
 .../src}/main/resources/geo/countries/BH.json      |   0
 .../src}/main/resources/geo/countries/BI.json      |   0
 .../src}/main/resources/geo/countries/BJ.json      |   0
 .../src}/main/resources/geo/countries/BL.json      |   0
 .../src}/main/resources/geo/countries/BM.json      |   0
 .../src}/main/resources/geo/countries/BN.json      |   0
 .../src}/main/resources/geo/countries/BO.json      |   0
 .../src}/main/resources/geo/countries/BQ.json      |   0
 .../src}/main/resources/geo/countries/BR.json      |   0
 .../src}/main/resources/geo/countries/BS.json      |   0
 .../src}/main/resources/geo/countries/BT.json      |   0
 .../src}/main/resources/geo/countries/BW.json      |   0
 .../src}/main/resources/geo/countries/BY.json      |   0
 .../src}/main/resources/geo/countries/BZ.json      |   0
 .../src}/main/resources/geo/countries/CA.json      |   0
 .../src}/main/resources/geo/countries/CD.json      |   0
 .../src}/main/resources/geo/countries/CF.json      |   0
 .../src}/main/resources/geo/countries/CG.json      |   0
 .../src}/main/resources/geo/countries/CH.json      |   0
 .../src}/main/resources/geo/countries/CI.json      |   0
 .../src}/main/resources/geo/countries/CK.json      |   0
 .../src}/main/resources/geo/countries/CL.json      |   0
 .../src}/main/resources/geo/countries/CM.json      |   0
 .../src}/main/resources/geo/countries/CN.json      |   0
 .../src}/main/resources/geo/countries/CO.json      |   0
 .../src}/main/resources/geo/countries/CR.json      |   0
 .../src}/main/resources/geo/countries/CU.json      |   0
 .../src}/main/resources/geo/countries/CV.json      |   0
 .../src}/main/resources/geo/countries/CW.json      |   0
 .../src}/main/resources/geo/countries/CY.json      |   0
 .../src}/main/resources/geo/countries/CZ.json      |   0
 .../src}/main/resources/geo/countries/DE.json      |   0
 .../src}/main/resources/geo/countries/DJ.json      |   0
 .../src}/main/resources/geo/countries/DK.json      |   0
 .../src}/main/resources/geo/countries/DM.json      |   0
 .../src}/main/resources/geo/countries/DO.json      |   0
 .../src}/main/resources/geo/countries/DZ.json      |   0
 .../src}/main/resources/geo/countries/EC.json      |   0
 .../src}/main/resources/geo/countries/EE.json      |   0
 .../src}/main/resources/geo/countries/EG.json      |   0
 .../src}/main/resources/geo/countries/EH.json      |   0
 .../src}/main/resources/geo/countries/ER.json      |   0
 .../src}/main/resources/geo/countries/ES.json      |   0
 .../src}/main/resources/geo/countries/ET.json      |   0
 .../src}/main/resources/geo/countries/FI.json      |   0
 .../src}/main/resources/geo/countries/FJ.json      |   0
 .../src}/main/resources/geo/countries/FK.json      |   0
 .../src}/main/resources/geo/countries/FM.json      |   0
 .../src}/main/resources/geo/countries/FO.json      |   0
 .../src}/main/resources/geo/countries/FR.json      |   0
 .../src}/main/resources/geo/countries/GA.json      |   0
 .../src}/main/resources/geo/countries/GB.json      |   0
 .../src}/main/resources/geo/countries/GD.json      |   0
 .../src}/main/resources/geo/countries/GE.json      |   0
 .../src}/main/resources/geo/countries/GF.json      |   0
 .../src}/main/resources/geo/countries/GG.json      |   0
 .../src}/main/resources/geo/countries/GH.json      |   0
 .../src}/main/resources/geo/countries/GI.json      |   0
 .../src}/main/resources/geo/countries/GL.json      |   0
 .../src}/main/resources/geo/countries/GM.json      |   0
 .../src}/main/resources/geo/countries/GN.json      |   0
 .../src}/main/resources/geo/countries/GP.json      |   0
 .../src}/main/resources/geo/countries/GQ.json      |   0
 .../src}/main/resources/geo/countries/GR.json      |   0
 .../src}/main/resources/geo/countries/GT.json      |   0
 .../src}/main/resources/geo/countries/GU.json      |   0
 .../src}/main/resources/geo/countries/GW.json      |   0
 .../src}/main/resources/geo/countries/GY.json      |   0
 .../src}/main/resources/geo/countries/HK.json      |   0
 .../src}/main/resources/geo/countries/HN.json      |   0
 .../src}/main/resources/geo/countries/HR.json      |   0
 .../src}/main/resources/geo/countries/HT.json      |   0
 .../src}/main/resources/geo/countries/HU.json      |   0
 .../src}/main/resources/geo/countries/ID.json      |   0
 .../src}/main/resources/geo/countries/IE.json      |   0
 .../src}/main/resources/geo/countries/IL.json      |   0
 .../src}/main/resources/geo/countries/IM.json      |   0
 .../src}/main/resources/geo/countries/IN.json      |   0
 .../src}/main/resources/geo/countries/IQ.json      |   0
 .../src}/main/resources/geo/countries/IR.json      |   0
 .../src}/main/resources/geo/countries/IS.json      |   0
 .../src}/main/resources/geo/countries/IT.json      |   0
 .../src}/main/resources/geo/countries/JE.json      |   0
 .../src}/main/resources/geo/countries/JM.json      |   0
 .../src}/main/resources/geo/countries/JO.json      |   0
 .../src}/main/resources/geo/countries/JP.json      |   0
 .../src}/main/resources/geo/countries/KE.json      |   0
 .../src}/main/resources/geo/countries/KG.json      |   0
 .../src}/main/resources/geo/countries/KH.json      |   0
 .../src}/main/resources/geo/countries/KI.json      |   0
 .../src}/main/resources/geo/countries/KM.json      |   0
 .../src}/main/resources/geo/countries/KN.json      |   0
 .../src}/main/resources/geo/countries/KP.json      |   0
 .../src}/main/resources/geo/countries/KR.json      |   0
 .../src}/main/resources/geo/countries/KW.json      |   0
 .../src}/main/resources/geo/countries/KY.json      |   0
 .../src}/main/resources/geo/countries/KZ.json      |   0
 .../src}/main/resources/geo/countries/LA.json      |   0
 .../src}/main/resources/geo/countries/LB.json      |   0
 .../src}/main/resources/geo/countries/LC.json      |   0
 .../src}/main/resources/geo/countries/LI.json      |   0
 .../src}/main/resources/geo/countries/LK.json      |   0
 .../src}/main/resources/geo/countries/LR.json      |   0
 .../src}/main/resources/geo/countries/LS.json      |   0
 .../src}/main/resources/geo/countries/LT.json      |   0
 .../src}/main/resources/geo/countries/LU.json      |   0
 .../src}/main/resources/geo/countries/LV.json      |   0
 .../src}/main/resources/geo/countries/LY.json      |   0
 .../src}/main/resources/geo/countries/MA.json      |   0
 .../src}/main/resources/geo/countries/MC.json      |   0
 .../src}/main/resources/geo/countries/MD.json      |   0
 .../src}/main/resources/geo/countries/ME.json      |   0
 .../src}/main/resources/geo/countries/MF.json      |   0
 .../src}/main/resources/geo/countries/MG.json      |   0
 .../src}/main/resources/geo/countries/MH.json      |   0
 .../src}/main/resources/geo/countries/MK.json      |   0
 .../src}/main/resources/geo/countries/ML.json      |   0
 .../src}/main/resources/geo/countries/MM.json      |   0
 .../src}/main/resources/geo/countries/MN.json      |   0
 .../src}/main/resources/geo/countries/MO.json      |   0
 .../src}/main/resources/geo/countries/MP.json      |   0
 .../src}/main/resources/geo/countries/MQ.json      |   0
 .../src}/main/resources/geo/countries/MR.json      |   0
 .../src}/main/resources/geo/countries/MS.json      |   0
 .../src}/main/resources/geo/countries/MT.json      |   0
 .../src}/main/resources/geo/countries/MU.json      |   0
 .../src}/main/resources/geo/countries/MV.json      |   0
 .../src}/main/resources/geo/countries/MW.json      |   0
 .../src}/main/resources/geo/countries/MX.json      |   0
 .../src}/main/resources/geo/countries/MY.json      |   0
 .../src}/main/resources/geo/countries/MZ.json      |   0
 .../src}/main/resources/geo/countries/NA.json      |   0
 .../src}/main/resources/geo/countries/NC.json      |   0
 .../src}/main/resources/geo/countries/NE.json      |   0
 .../src}/main/resources/geo/countries/NF.json      |   0
 .../src}/main/resources/geo/countries/NG.json      |   0
 .../src}/main/resources/geo/countries/NI.json      |   0
 .../src}/main/resources/geo/countries/NL.json      |   0
 .../src}/main/resources/geo/countries/NO.json      |   0
 .../src}/main/resources/geo/countries/NP.json      |   0
 .../src}/main/resources/geo/countries/NR.json      |   0
 .../src}/main/resources/geo/countries/NU.json      |   0
 .../src}/main/resources/geo/countries/NZ.json      |   0
 .../src}/main/resources/geo/countries/OM.json      |   0
 .../src}/main/resources/geo/countries/PA.json      |   0
 .../src}/main/resources/geo/countries/PE.json      |   0
 .../src}/main/resources/geo/countries/PF.json      |   0
 .../src}/main/resources/geo/countries/PG.json      |   0
 .../src}/main/resources/geo/countries/PH.json      |   0
 .../src}/main/resources/geo/countries/PK.json      |   0
 .../src}/main/resources/geo/countries/PL.json      |   0
 .../src}/main/resources/geo/countries/PM.json      |   0
 .../src}/main/resources/geo/countries/PN.json      |   0
 .../src}/main/resources/geo/countries/PR.json      |   0
 .../src}/main/resources/geo/countries/PS.json      |   0
 .../src}/main/resources/geo/countries/PT.json      |   0
 .../src}/main/resources/geo/countries/PW.json      |   0
 .../src}/main/resources/geo/countries/PY.json      |   0
 .../src}/main/resources/geo/countries/QA.json      |   0
 .../src}/main/resources/geo/countries/RE.json      |   0
 .../src}/main/resources/geo/countries/RO.json      |   0
 .../src}/main/resources/geo/countries/RS.json      |   0
 .../src}/main/resources/geo/countries/RU.json      |   0
 .../src}/main/resources/geo/countries/RW.json      |   0
 .../src}/main/resources/geo/countries/SA.json      |   0
 .../src}/main/resources/geo/countries/SB.json      |   0
 .../src}/main/resources/geo/countries/SC.json      |   0
 .../src}/main/resources/geo/countries/SD.json      |   0
 .../src}/main/resources/geo/countries/SE.json      |   0
 .../src}/main/resources/geo/countries/SG.json      |   0
 .../src}/main/resources/geo/countries/SH.json      |   0
 .../src}/main/resources/geo/countries/SI.json      |   0
 .../src}/main/resources/geo/countries/SJ.json      |   0
 .../src}/main/resources/geo/countries/SK.json      |   0
 .../src}/main/resources/geo/countries/SL.json      |   0
 .../src}/main/resources/geo/countries/SM.json      |   0
 .../src}/main/resources/geo/countries/SN.json      |   0
 .../src}/main/resources/geo/countries/SO.json      |   0
 .../src}/main/resources/geo/countries/SR.json      |   0
 .../src}/main/resources/geo/countries/SS.json      |   0
 .../src}/main/resources/geo/countries/ST.json      |   0
 .../src}/main/resources/geo/countries/SV.json      |   0
 .../src}/main/resources/geo/countries/SX.json      |   0
 .../src}/main/resources/geo/countries/SY.json      |   0
 .../src}/main/resources/geo/countries/SZ.json      |   0
 .../src}/main/resources/geo/countries/TC.json      |   0
 .../src}/main/resources/geo/countries/TD.json      |   0
 .../src}/main/resources/geo/countries/TG.json      |   0
 .../src}/main/resources/geo/countries/TH.json      |   0
 .../src}/main/resources/geo/countries/TJ.json      |   0
 .../src}/main/resources/geo/countries/TK.json      |   0
 .../src}/main/resources/geo/countries/TL.json      |   0
 .../src}/main/resources/geo/countries/TM.json      |   0
 .../src}/main/resources/geo/countries/TN.json      |   0
 .../src}/main/resources/geo/countries/TO.json      |   0
 .../src}/main/resources/geo/countries/TR.json      |   0
 .../src}/main/resources/geo/countries/TT.json      |   0
 .../src}/main/resources/geo/countries/TV.json      |   0
 .../src}/main/resources/geo/countries/TW.json      |   0
 .../src}/main/resources/geo/countries/TZ.json      |   0
 .../src}/main/resources/geo/countries/UA.json      |   0
 .../src}/main/resources/geo/countries/UG.json      |   0
 .../src}/main/resources/geo/countries/US.json      |   0
 .../src}/main/resources/geo/countries/UY.json      |   0
 .../src}/main/resources/geo/countries/UZ.json      |   0
 .../src}/main/resources/geo/countries/VA.json      |   0
 .../src}/main/resources/geo/countries/VC.json      |   0
 .../src}/main/resources/geo/countries/VE.json      |   0
 .../src}/main/resources/geo/countries/VG.json      |   0
 .../src}/main/resources/geo/countries/VI.json      |   0
 .../src}/main/resources/geo/countries/VN.json      |   0
 .../src}/main/resources/geo/countries/VU.json      |   0
 .../src}/main/resources/geo/countries/WF.json      |   0
 .../src}/main/resources/geo/countries/WS.json      |   0
 .../src}/main/resources/geo/countries/XK.json      |   0
 .../src}/main/resources/geo/countries/YE.json      |   0
 .../src}/main/resources/geo/countries/YT.json      |   0
 .../src}/main/resources/geo/countries/ZA.json      |   0
 .../src}/main/resources/geo/countries/ZM.json      |   0
 .../src}/main/resources/geo/countries/ZW.json      |   0
 .../src}/main/resources/geo/exceptions/dict.json   |   0
 .../src}/main/resources/geo/exceptions/manual.json |   0
 .../src}/main/resources/geo/metro.json             |   0
 .../geo/synonyms/case_sensitive/manual.json        |   0
 .../src}/main/resources/geo/synonyms/geonames.json |   0
 .../src}/main/resources/geo/synonyms/manual.json   |   0
 .../src}/main/resources/geo/synonyms/metro.json    |   0
 .../src}/main/resources/geo/synonyms/states.json   |   0
 .../main/resources/geo/synonyms/synthetic.json     |   0
 .../src}/main/resources/geo/us_top.json            |   0
 .../src}/main/resources/geo/world_top.json         |   0
 {src => nlpcraft/src}/main/resources/ignite.xml    |   0
 {src => nlpcraft/src}/main/resources/log4j2.xml    |   0
 .../src}/main/resources/moby/10001fr.equ           |   0
 .../src}/main/resources/moby/21986na.mes           |   0
 .../src}/main/resources/moby/354984si.ngl          |   0
 .../src}/main/resources/moby/6213acro.nym          |   0
 .../src}/main/resources/moby/74550com.mon          |   0
 {src => nlpcraft/src}/main/resources/nlpcraft.conf |   0
 .../src}/main/resources/opennlp/en-lemmatizer.dict |   0
 .../src}/main/resources/opennlp/en-ner-date.bin    | Bin
 .../main/resources/opennlp/en-ner-location.bin     | Bin
 .../src}/main/resources/opennlp/en-ner-money.bin   | Bin
 .../main/resources/opennlp/en-ner-organization.bin | Bin
 .../main/resources/opennlp/en-ner-percentage.bin   | Bin
 .../src}/main/resources/opennlp/en-ner-person.bin  | Bin
 .../src}/main/resources/opennlp/en-ner-time.bin    | Bin
 .../src}/main/resources/opennlp/en-pos-maxent.bin  | Bin
 .../src}/main/resources/opennlp/en-token.bin       | Bin
 .../src}/main/resources/opennlp/models.txt         |   0
 .../src}/main/resources/reference.conf             |   0
 .../src}/main/resources/spell/dictionary.json      |   0
 .../src}/main/resources/sql/create_schema.sql      |   0
 .../src}/main/resources/sql/drop_schema.sql        |   0
 .../main/resources/stopwords/first_words.txt.gz    | Bin
 .../main/resources/stopwords/noun_words.txt.gz     | Bin
 .../resources/stopwords/possessive_words.txt.gz    | Bin
 .../src}/main/resources/stopwords/stop_words.txt   |   0
 .../src}/main/resources/synonyms/synonyms.json     |   0
 .../main/scala/org/apache/nlpcraft/NCStart.scala   |   0
 .../org/apache/nlpcraft/common/NCErrorCodes.scala  |   0
 .../org/apache/nlpcraft/common/NCException.scala   |   0
 .../org/apache/nlpcraft/common/NCService.scala     |   0
 .../apache/nlpcraft/common/ascii/NCAsciiLike.scala |   0
 .../nlpcraft/common/ascii/NCAsciiTable.scala       |   0
 .../nlpcraft/common/blowfish/NCBlowfishHasher.java |   0
 .../nlpcraft/common/config/NCConfigurable.scala    |   0
 .../common/config/NCConfigurableJava.scala         |   0
 .../apache/nlpcraft/common/crypto/NCCipher.scala   |   0
 .../apache/nlpcraft/common/debug/NCLogHolder.scala |   0
 .../nlpcraft/common/makro/NCMacroParser.scala      |   0
 .../apache/nlpcraft/common/nlp/NCNlpSentence.scala |   0
 .../nlpcraft/common/nlp/NCNlpSentenceNote.scala    |   0
 .../nlpcraft/common/nlp/NCNlpSentenceToken.scala   |   0
 .../common/nlp/NCNlpSentenceTokenBuffer.scala      |   0
 .../common/nlp/core/NCNlpCoreManager.scala         |   0
 .../nlpcraft/common/nlp/core/NCNlpCoreToken.scala  |   0
 .../common/nlp/core/NCNlpPorterStemmer.scala       |   0
 .../nlpcraft/common/nlp/core/NCNlpTokenizer.scala  |   0
 .../nlp/core/opennlp/NCOpenNlpTokenizer.scala      |   0
 .../common/nlp/dict/NCDictionaryManager.scala      |   0
 .../common/nlp/dict/NCDictionaryType.scala         |   0
 .../common/nlp/numeric/NCNumericGenerator.scala    |   0
 .../common/nlp/numeric/NCNumericManager.scala      |   0
 .../nlpcraft/common/nlp/pos/NCPennTreebank.scala   |   0
 .../common/opencensus/NCOpenCensusTrace.scala      |   0
 .../scala/org/apache/nlpcraft/common/package.scala |   0
 .../apache/nlpcraft/common/socket/NCSocket.scala   |   0
 .../apache/nlpcraft/common/util/NCIdGenerator.java |   0
 .../org/apache/nlpcraft/common/util/NCUtils.scala  |   0
 .../apache/nlpcraft/common/version/NCVersion.scala |   0
 .../scala/org/apache/nlpcraft/examples/README.md   |   0
 .../apache/nlpcraft/examples/alarm/AlarmModel.java |   0
 .../apache/nlpcraft/examples/alarm/AlarmTest.java  |   0
 .../org/apache/nlpcraft/examples/alarm/README.md   |   0
 .../nlpcraft/examples/alarm/alarm_model.json       |   0
 .../apache/nlpcraft/examples/echo/EchoModel.scala  |   0
 .../apache/nlpcraft/examples/echo/EchoTest.java    |   0
 .../org/apache/nlpcraft/examples/echo/README.md    |   0
 .../examples/helloworld/HelloWorldModel.java       |   0
 .../examples/helloworld/HelloWorldTest.java        |   0
 .../apache/nlpcraft/examples/helloworld/README.md  |   0
 .../examples/lightswitch/LightSwitchModel.scala    |   0
 .../examples/lightswitch/LightSwitchTest.java      |   0
 .../apache/nlpcraft/examples/lightswitch/README.md |   0
 .../examples/lightswitch/lightswitch_model.yaml    |   0
 .../examples/misc/darksky/DarkSkyException.java    |   0
 .../examples/misc/darksky/DarkSkyService.java      |   0
 .../misc/geo/cities/CitiesDataProvider.java        |   0
 .../nlpcraft/examples/misc/geo/cities/City.java    |   0
 .../examples/misc/geo/cities/CityData.java         |   0
 .../examples/misc/geo/cities/cities_timezones.txt  |   0
 .../examples/misc/geo/keycdn/GeoManager.java       |   2 +-
 .../misc/geo/keycdn/beans/GeoDataBean.java         |  70 +-
 .../misc/geo/keycdn/beans/ResponseBean.java        |  42 +-
 .../misc/geo/keycdn/beans/ResponseDataBean.java    |  14 +-
 .../apache/nlpcraft/examples/phone/PhoneModel.java |   0
 .../apache/nlpcraft/examples/phone/PhoneTest.java  |   0
 .../org/apache/nlpcraft/examples/phone/README.md   |   0
 .../nlpcraft/examples/phone/phone_model.json       |   0
 .../org/apache/nlpcraft/examples/sql/README.md     |   0
 .../apache/nlpcraft/examples/sql/SqlModel.scala    |   0
 .../org/apache/nlpcraft/examples/sql/SqlTest.scala |   0
 .../nlpcraft/examples/sql/db/SqlAccess.scala       |   0
 .../apache/nlpcraft/examples/sql/db/SqlBeans.scala |   0
 .../nlpcraft/examples/sql/db/SqlBuilder.scala      |   0
 .../nlpcraft/examples/sql/db/SqlServer.scala       |   0
 .../nlpcraft/examples/sql/db/SqlValueLoader.scala  |   0
 .../org/apache/nlpcraft/examples/sql/db/model.png  | Bin
 .../apache/nlpcraft/examples/sql/db/northwind.sql  |   0
 .../apache/nlpcraft/examples/sql/sql_model.yaml    |   0
 .../nlpcraft/examples/sql/sql_model_init.yaml      |   0
 .../org/apache/nlpcraft/examples/time/README.md    |   0
 .../apache/nlpcraft/examples/time/TimeModel.java   |   0
 .../nlpcraft/examples/time/TimeModelApp.java       |   0
 .../apache/nlpcraft/examples/time/TimeTest.java    |   0
 .../apache/nlpcraft/examples/time/time_model.yaml  |   0
 .../org/apache/nlpcraft/examples/weather/README.md |   0
 .../nlpcraft/examples/weather/WeatherModel.java    |  21 +-
 .../examples/weather/WeatherResultWrapper.java     |   1 -
 .../nlpcraft/examples/weather/WeatherTest.java     |   0
 .../nlpcraft/examples/weather/weather_model.json   |   0
 .../scala/org/apache/nlpcraft/model/NCCompany.java |   0
 .../scala/org/apache/nlpcraft/model/NCContext.java |   0
 .../org/apache/nlpcraft/model/NCConversation.java  |   0
 .../org/apache/nlpcraft/model/NCCustomElement.java |   0
 .../org/apache/nlpcraft/model/NCCustomParser.java  |   0
 .../org/apache/nlpcraft/model/NCCustomWord.java    |   0
 .../scala/org/apache/nlpcraft/model/NCElement.java |   0
 .../scala/org/apache/nlpcraft/model/NCIntent.java  |   0
 .../org/apache/nlpcraft/model/NCIntentMatch.java   |   0
 .../org/apache/nlpcraft/model/NCIntentRef.java     |   0
 .../org/apache/nlpcraft/model/NCIntentSkip.java    |   0
 .../org/apache/nlpcraft/model/NCIntentTerm.java    |   0
 .../org/apache/nlpcraft/model/NCLifecycle.java     |   0
 .../org/apache/nlpcraft/model/NCMetadata.java      |   0
 .../scala/org/apache/nlpcraft/model/NCModel.java   |   0
 .../org/apache/nlpcraft/model/NCModelAdapter.java  |   0
 .../org/apache/nlpcraft/model/NCModelFactory.java  |   0
 .../apache/nlpcraft/model/NCModelFileAdapter.java  |   0
 .../org/apache/nlpcraft/model/NCModelView.java     |   0
 .../org/apache/nlpcraft/model/NCRejection.java     |   0
 .../scala/org/apache/nlpcraft/model/NCRequest.java |   0
 .../scala/org/apache/nlpcraft/model/NCResult.java  |   0
 .../scala/org/apache/nlpcraft/model/NCToken.java   |   0
 .../scala/org/apache/nlpcraft/model/NCUser.java    |   0
 .../scala/org/apache/nlpcraft/model/NCValue.java   |   0
 .../org/apache/nlpcraft/model/NCValueLoader.java   |   0
 .../scala/org/apache/nlpcraft/model/NCVariant.java |   0
 .../model/factories/basic/NCBasicModelFactory.java |   0
 .../model/factories/basic/package-info.java        |   0
 .../factories/spring/NCSpringModelFactory.java     |   0
 .../model/factories/spring/package-info.java       |   0
 .../apache/nlpcraft/model/impl/NCCompanyImpl.java  |   0
 .../apache/nlpcraft/model/impl/NCModelImpl.scala   |   0
 .../apache/nlpcraft/model/impl/NCTokenImpl.scala   |   0
 .../apache/nlpcraft/model/impl/NCTokenLogger.scala |   0
 .../apache/nlpcraft/model/impl/NCTokenPimp.scala   |   0
 .../org/apache/nlpcraft/model/impl/NCUserImpl.java |   0
 .../apache/nlpcraft/model/impl/NCVariantImpl.java  |   0
 .../nlpcraft/model/impl/json/NCElementJson.java    |   0
 .../nlpcraft/model/impl/json/NCMacroJson.java      |   0
 .../nlpcraft/model/impl/json/NCModelJson.java      |   0
 .../nlpcraft/model/impl/json/NCValueJson.java      |   0
 .../model/intent/impl/NCIntentDslCompiler.scala    |   0
 .../model/intent/impl/NCIntentScanner.scala        |   0
 .../model/intent/impl/NCIntentSolver.scala         |   0
 .../model/intent/impl/NCIntentSolverEngine.scala   |   0
 .../model/intent/impl/NCIntentSolverInput.scala    |   0
 .../model/intent/impl/NCIntentSolverResult.scala   |   0
 .../model/intent/impl/NCIntentSolverVariant.scala  |   0
 .../model/intent/impl/antlr4/NCIntentDsl.g4        |   0
 .../model/intent/impl/antlr4/NCIntentDsl.interp    |   0
 .../model/intent/impl/antlr4/NCIntentDsl.tokens    |   0
 .../impl/antlr4/NCIntentDslBaseListener.java       |   0
 .../intent/impl/antlr4/NCIntentDslBaseVisitor.java |   0
 .../intent/impl/antlr4/NCIntentDslLexer.interp     |   0
 .../model/intent/impl/antlr4/NCIntentDslLexer.java |   0
 .../intent/impl/antlr4/NCIntentDslLexer.tokens     |   0
 .../intent/impl/antlr4/NCIntentDslListener.java    |   0
 .../intent/impl/antlr4/NCIntentDslParser.java      |   0
 .../intent/impl/antlr4/NCIntentDslVisitor.java     |   0
 .../model/intent/utils/NCDslFlowItem.scala         |   0
 .../nlpcraft/model/intent/utils/NCDslIntent.scala  |   0
 .../nlpcraft/model/intent/utils/NCDslTerm.java     |   0
 .../model/intent/utils/NCDslTokenChecker.scala     |   0
 .../model/intent/utils/NCDslTokenPredicate.java    |   0
 .../model/intent/utils/NCDslTokenQualifier.scala   |   0
 .../model/opencensus/NCBaseTraceExporter.java      |   0
 .../model/opencensus/NCJaegerExporter.java         |   0
 .../model/opencensus/NCPrometheusExporter.java     |   0
 .../opencensus/NCStackdriverStatsExporter.java     |   0
 .../opencensus/NCStackdriverTraceExporter.java     |   0
 .../model/opencensus/NCZipkinExporter.java         |   0
 .../nlpcraft/model/opencensus/package-info.java    |   0
 .../opencensus/stats/NCOpenCensusModelStats.scala  |   0
 .../org/apache/nlpcraft/model/package-info.java    |   0
 .../scala/org/apache/nlpcraft/model/package.scala  |   0
 .../nlpcraft/model/tools/sqlgen/NCSqlColumn.java   |   0
 .../model/tools/sqlgen/NCSqlDateRange.java         |   0
 .../model/tools/sqlgen/NCSqlExtractor.java         |   0
 .../model/tools/sqlgen/NCSqlExtractorBuilder.java  |   0
 .../nlpcraft/model/tools/sqlgen/NCSqlJoin.java     |   0
 .../nlpcraft/model/tools/sqlgen/NCSqlJoinType.java |   0
 .../nlpcraft/model/tools/sqlgen/NCSqlLimit.java    |   0
 .../model/tools/sqlgen/NCSqlModelGenerator.java    |   0
 .../nlpcraft/model/tools/sqlgen/NCSqlSchema.java   |   0
 .../model/tools/sqlgen/NCSqlSchemaBuilder.java     |   0
 .../nlpcraft/model/tools/sqlgen/NCSqlSort.java     |   0
 .../nlpcraft/model/tools/sqlgen/NCSqlTable.java    |   0
 .../model/tools/sqlgen/impl/NCSqlBeans.scala       |   0
 .../tools/sqlgen/impl/NCSqlExtractorImpl.scala     |   0
 .../sqlgen/impl/NCSqlModelGeneratorImpl.scala      |   0
 .../tools/sqlgen/impl/NCSqlSchemaBuilderImpl.scala |   0
 .../nlpcraft/model/tools/sqlgen/package-info.java  |   0
 .../tools/suggestions/NCSuggestionsGenerator.scala |   0
 .../nlpcraft/model/tools/test/NCTestClient.java    |   0
 .../model/tools/test/NCTestClientBuilder.java      |   0
 .../model/tools/test/NCTestClientException.java    |   0
 .../nlpcraft/model/tools/test/NCTestResult.java    |   0
 .../nlpcraft/model/tools/test/package-info.java    |   0
 .../scala/org/apache/nlpcraft/probe/NCProbe.scala  |   0
 .../org/apache/nlpcraft/probe/NCProbeBoot.scala    |   0
 .../nlpcraft/probe/embedded/NCEmbeddedProbe.java   |   0
 .../nlpcraft/probe/embedded/NCEmbeddedResult.java  |   0
 .../nlpcraft/probe/embedded/package-info.java      |   0
 .../nlpcraft/probe/mgrs/NCModelDecorator.scala     |   0
 .../nlpcraft/probe/mgrs/NCProbeMessage.scala       |   0
 .../org/apache/nlpcraft/probe/mgrs/NCSynonym.scala |   0
 .../nlpcraft/probe/mgrs/NCSynonymChunk.scala       |   0
 .../nlpcraft/probe/mgrs/NCSynonymChunkKind.scala   |   0
 .../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala |   0
 .../probe/mgrs/conn/NCConnectionManager.scala      |   0
 .../conversation/NCConversationDescriptor.scala    |   0
 .../mgrs/conversation/NCConversationManager.scala  |   0
 .../probe/mgrs/deploy/NCDeployManager.scala        |   0
 .../mgrs/dialogflow/NCDialogFlowManager.scala      |   0
 .../probe/mgrs/lifecycle/NCLifecycleManager.scala  |   0
 .../nlpcraft/probe/mgrs/model/NCModelManager.scala |   0
 .../probe/mgrs/model/NCModelSynonymDsl.scala       |   0
 .../mgrs/model/NCModelSynonymDslCompiler.scala     |   0
 .../probe/mgrs/model/antlr4/NCSynonymDsl.g4        |   0
 .../probe/mgrs/model/antlr4/NCSynonymDsl.interp    |   0
 .../probe/mgrs/model/antlr4/NCSynonymDsl.tokens    |   0
 .../model/antlr4/NCSynonymDslBaseListener.java     |   0
 .../mgrs/model/antlr4/NCSynonymDslBaseVisitor.java |   0
 .../mgrs/model/antlr4/NCSynonymDslLexer.interp     |   0
 .../probe/mgrs/model/antlr4/NCSynonymDslLexer.java |   0
 .../mgrs/model/antlr4/NCSynonymDslLexer.tokens     |   0
 .../mgrs/model/antlr4/NCSynonymDslListener.java    |   0
 .../mgrs/model/antlr4/NCSynonymDslParser.java      |   0
 .../mgrs/model/antlr4/NCSynonymDslVisitor.java     |   0
 .../nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala  |   0
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  |   0
 .../dictionary/NCDictionaryEnricher.scala          |   0
 .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala |   0
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala |   0
 .../enrichers/relation/NCRelationEnricher.scala    |   0
 .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala   |   0
 .../enrichers/stopword/NCStopWordEnricher.scala    |   0
 .../suspicious/NCSuspiciousNounsEnricher.scala     |   0
 .../probe/mgrs/nlp/impl/NCRequestImpl.scala        |   0
 .../mgrs/nlp/validate/NCValidateException.scala    |   0
 .../mgrs/nlp/validate/NCValidateManager.scala      |   0
 .../org/apache/nlpcraft/server/NCServer.scala      |   0
 .../nlpcraft/server/apicodes/NCApiStatusCode.scala |   0
 .../nlpcraft/server/company/NCCompanyManager.scala |   0
 .../server/feedback/NCFeedbackManager.scala        |   0
 .../apache/nlpcraft/server/geo/NCGeoManager.scala  |   0
 .../apache/nlpcraft/server/geo/NCGeoModel.scala    |   0
 .../server/geo/tools/NCGeoNamesGenerator.scala     |   0
 .../geo/tools/NCGeoStateNamesGenerator.scala       |   0
 .../geo/tools/NCGeoSyntheticNamesGenerator.scala   |   0
 .../geo/tools/metro/NCGeoMetroGenerator.scala      |   0
 .../nlpcraft/server/geo/tools/metro/ga_metro.txt   |   0
 .../server/geo/tools/unstats/NCUnsdStatsGeo.scala  |   0
 .../geo/tools/unstats/NCUnsdStatsService.scala     |   0
 .../nlpcraft/server/geo/tools/unstats/codes.txt    |   0
 .../server/geo/tools/unstats/subcontinents.txt     |   0
 .../server/ignite/NCIgniteCacheStore.scala         |   0
 .../server/ignite/NCIgniteExceptions.scala         |   0
 .../nlpcraft/server/ignite/NCIgniteHelpers.scala   |   0
 .../nlpcraft/server/ignite/NCIgniteInstance.scala  |   0
 .../nlpcraft/server/ignite/NCIgniteRunner.scala    |   0
 .../org/apache/nlpcraft/server/json/NCJson.scala   |   0
 .../nlpcraft/server/json/NCJsonException.scala     |   0
 .../apache/nlpcraft/server/json/NCJsonLike.scala   |   0
 .../server/lifecycle/NCServerLifecycle.scala       |   0
 .../lifecycle/NCServerLifecycleManager.scala       |   0
 .../lifecycle/opencensus/NCBaseTraceExporter.scala |   0
 .../lifecycle/opencensus/NCJaegerExporter.scala    |   0
 .../opencensus/NCPrometheusExporter.scala          |   0
 .../opencensus/NCStackdriverStatsExporter.scala    |   0
 .../opencensus/NCStackdriverTraceExporter.scala    |   0
 .../lifecycle/opencensus/NCZipkinExporter.scala    |   0
 .../apache/nlpcraft/server/mdo/NCCompanyMdo.scala  |   0
 .../apache/nlpcraft/server/mdo/NCFeedbackMdo.scala |   0
 .../apache/nlpcraft/server/mdo/NCProbeMdo.scala    |   0
 .../nlpcraft/server/mdo/NCProbeModelMdo.scala      |   0
 .../nlpcraft/server/mdo/NCQueryStateMdo.scala      |   0
 .../org/apache/nlpcraft/server/mdo/NCUserMdo.scala |   0
 .../nlpcraft/server/mdo/NCUserPropertyMdo.scala    |   0
 .../nlpcraft/server/mdo/impl/NCAnnotatedMdo.scala  |   0
 .../nlpcraft/server/mdo/impl/NCMdoEntity.java      |   0
 .../nlpcraft/server/mdo/impl/NCMdoField.java       |   0
 .../server/nlp/core/NCNlpNerEnricher.scala         |   0
 .../nlpcraft/server/nlp/core/NCNlpParser.scala     |   0
 .../server/nlp/core/NCNlpServerManager.scala       |   0
 .../nlpcraft/server/nlp/core/NCNlpWord.scala       |   0
 .../nlp/core/google/NCGoogleNerEnricher.scala      |   0
 .../nlp/core/opennlp/NCOpenNlpNerEnricher.scala    |   0
 .../server/nlp/core/opennlp/NCOpenNlpParser.scala  |   0
 .../server/nlp/core/spacy/NCSpaCyNerEnricher.scala |   0
 .../server/nlp/enrichers/NCServerEnricher.scala    |   0
 .../nlp/enrichers/NCServerEnrichmentManager.scala  |   0
 .../nlp/enrichers/basenlp/NCBaseNlpEnricher.scala  |   0
 .../coordinate/NCCoordinatesEnricher.scala         |   0
 .../nlp/enrichers/date/NCDateConstants.scala       |   0
 .../server/nlp/enrichers/date/NCDateEnricher.scala |   0
 .../nlp/enrichers/date/NCDateFormatType.scala      |   0
 .../server/nlp/enrichers/date/NCDateParser.scala   |   0
 .../server/nlp/enrichers/date/NCDateRange.scala    |   0
 .../nlp/enrichers/date/tools/NCDateGenerator.scala |   0
 .../server/nlp/enrichers/geo/NCGeoEnricher.scala   |   0
 .../nlp/enrichers/numeric/NCNumericEnricher.scala  |   0
 .../nlp/enrichers/quote/NCQuoteEnricher.scala      |   0
 .../enrichers/stopword/NCStopWordEnricher.scala    |   0
 .../server/nlp/preproc/NCPreProcessManager.scala   |   0
 .../server/nlp/spell/NCSpellCheckManager.scala     |   0
 .../server/nlp/synonym/NCSynonymManager.scala      |   0
 .../server/nlp/synonym/NCSynonymType.scala         |   0
 .../server/nlp/wordnet/NCWordNetManager.scala      |   0
 .../opencensus/NCOpenCensusServerStats.scala       |   0
 .../nlpcraft/server/probe/NCProbeManager.scala     |   0
 .../server/proclog/NCProcessLogManager.scala       |   0
 .../nlpcraft/server/query/NCQueryManager.scala     |   0
 .../nlpcraft/server/rest/NCBasicRestApi.scala      |   0
 .../apache/nlpcraft/server/rest/NCRestApi.scala    |   0
 .../nlpcraft/server/rest/NCRestManager.scala       |   0
 .../org/apache/nlpcraft/server/sql/NCSql.scala     |   0
 .../apache/nlpcraft/server/sql/NCSqlBatch.scala    |   0
 .../apache/nlpcraft/server/sql/NCSqlManager.scala  |   0
 .../server/tx/NCTxCacheStoreSessionListener.scala  |   0
 .../apache/nlpcraft/server/tx/NCTxManager.scala    |   0
 .../nlpcraft/server/user/NCUserManager.scala       |   0
 {src => nlpcraft/src}/test/resources/log4j2.xml    |   0
 .../scala/org/apache/nlpcraft/NCTestProbe.scala    |   0
 .../org/apache/nlpcraft/NCTestStartStop.scala      |   0
 .../nlpcraft/common/ascii/NCAsciiTableSpec.scala   |   0
 .../common/blowfish/NCBlowfishHasherSpec.scala     |   0
 .../nlpcraft/common/crypto/NCCipherSpec.scala      |   0
 .../nlpcraft/common/makro/NCMacroParserSpec.scala  |   0
 .../apache/nlpcraft/common/util/NCUtilsSpec.scala  |   0
 .../nlpcraft/examples/sql/NCSqlModelSpec.scala     |   0
 .../nlpcraft/model/intent/dsl/NCDslTest.scala      |   0
 .../nlpcraft/model/intent/dsl/NCDslTestModel.scala |   0
 .../nlpcraft/model/intent/dsl/dsl_test_model.yaml  |   0
 .../intent/impl/NCIntentSolverEngineSpec.scala     |   0
 .../model/tools/NCSqlModelEngineSpec.scala         |   0
 .../nlpcraft/models/stm/NCStmTestModel.scala       |   0
 .../nlpcraft/models/stm/NCStmTestModelSpec.scala   |   0
 .../mgrs/nlp/enrichers/NCDefaultTestModel.scala    |   0
 .../mgrs/nlp/enrichers/NCEnricherBaseSpec.scala    |   0
 .../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala  |   0
 .../nlp/enrichers/limit/NCEnricherLimitSpec.scala  |   5 +
 .../model/NCEnricherNestedModelSpec.scala          |   0
 .../nlp/enrichers/model/NCNestedTestModel.scala    |   0
 .../relation/NCEnricherRelationSpec.scala          |   0
 .../nlp/enrichers/sort/NCEnricherSortSpec.scala    |  18 +-
 .../enrichers/date/tools/NCDateGeneratorSpec.scala |   0
 pom.xml                                            | 874 ++++++++-------------
 634 files changed, 579 insertions(+), 970 deletions(-)

diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/suggestions/NCSuggestionsGenerator.scala
index 27d28da,0000000..27d28da
mode 100644,000000..100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/suggestions/NCSuggestionsGenerator.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/suggestions/NCSuggestionsGenerator.scala