This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-384 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 7b0a699eb38e39d371ffcf1eb659425f3ea9d7f4 Merge: d163091 7ae9675 Author: Aaron Radzinski <[email protected]> AuthorDate: Fri Sep 10 10:55:28 2021 -0700 Merge branch 'master' into NLPCRAFT-384 nlpcraft/src/main/resources/date/full.txt.gz | Bin 6985934 -> 24138388 bytes nlpcraft/src/main/resources/date/parts.txt.gz | Bin 8146091 -> 7563491 bytes nlpcraft/src/main/resources/date/parts_dmy.txt.gz | Bin 4986446 -> 4765022 bytes nlpcraft/src/main/resources/date/parts_mdy.txt.gz | Bin 4955873 -> 4744459 bytes nlpcraft/src/main/resources/date/parts_ymd.txt.gz | Bin 5326821 -> 5096584 bytes .../nlpcraft/common/nlp/numeric/NCNumeric.scala | 13 ++- .../common/nlp/numeric/NCNumericManager.scala | 26 +++-- .../org/apache/nlpcraft/common/util/NCUtils.scala | 2 +- .../scala/org/apache/nlpcraft/model/NCElement.java | 5 + .../apache/nlpcraft/model/NCModelFileAdapter.java | 10 ++ .../org/apache/nlpcraft/model/NCModelView.java | 9 ++ .../nlpcraft/model/impl/json/NCElementJson.java | 8 ++ .../nlpcraft/model/impl/json/NCModelJson.java | 7 ++ .../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 6 ++ .../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 42 ++++---- .../probe/mgrs/sentence/NCSentenceManager.scala | 27 +++-- .../server/nlp/enrichers/date/NCDateEnricher.scala | 64 ++++++------ .../nlp/enrichers/date/tools/NCDateGenerator.scala | 22 ++-- .../nlp/enrichers/numeric/NCNumericEnricher.scala | 115 ++++++++++++--------- .../scala/org/apache/nlpcraft/NCTestElement.scala | 17 ++- .../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala | 18 +++- .../nlp/enrichers/date/NCEnricherDateSpec.scala | 3 +- .../model/NCEnricherNestedModelSpec2.scala | 3 +- .../model/NCEnricherNestedModelSpec3.scala | 12 +-- ...ec41.scala => NCEnricherNestedModelSpec4.scala} | 4 +- .../model/NCEnricherNestedModelSpec5.scala | 6 +- ...pec5.scala => NCEnricherNestedModelSpec6.scala} | 39 +++---- .../enrichers/model/anyword/NCNestedAnySpec.scala | 102 ++++++++++++++++++ .../anyword/NCNestedTestModelsAnyAlphaNum.scala | 35 +++++++ .../anyword/NCNestedTestModelsAnyNotSpace.scala | 35 +++++++ .../model/anyword/NCNestedTestModelsAnyRegex.scala | 35 +++++++ .../adapters/NCNestedModelAnyAdapter.scala} | 37 +++---- .../anyword/adapters/NCNestedTestModelAny1.scala | 51 +++++++++ .../anyword/adapters/NCNestedTestModelAny2.scala | 52 ++++++++++ .../anyword/adapters/NCNestedTestModelAny3.scala | 49 +++++++++ .../anyword/adapters/NCNestedTestModelAny4.scala | 55 ++++++++++ .../anyword/adapters/NCNestedTestModelAny5.scala | 55 ++++++++++ .../anyword/adapters/NCNestedTestModelAny6.scala | 55 ++++++++++ .../anyword/adapters/NCNestedTestModelAny7.scala | 55 ++++++++++ .../enrichers/numeric/NCEnricherNumericSpec.scala | 75 ++++++++++++++ 40 files changed, 964 insertions(+), 185 deletions(-)
