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/09/10 17:55:35 UTC

[incubator-nlpcraft] branch NLPCRAFT-384 updated (d163091 -> 7b0a699)

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

aradzinski pushed a change to branch NLPCRAFT-384
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.


    from d163091  Merge branch 'master' into NLPCRAFT-384
     add e6dfeba  NCElement 'greedy' parameter added. Date model extended.
     add f6fd149  Date model extended.
     add 527493e  WIP.
     add 6a4e2f9  Merge branch 'master' into NLPCRAFT-435
     add 7ae9675  Merge branch 'NLPCRAFT-435'
     new 7b0a699  Merge branch 'master' into NLPCRAFT-384

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/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}        |  27 +++--
 .../anyword/adapters/NCNestedTestModelAny1.scala}  |  38 ++++---
 .../anyword/adapters/NCNestedTestModelAny2.scala}  |  41 +++++---
 .../anyword/adapters/NCNestedTestModelAny3.scala}  |  36 ++++---
 .../anyword/adapters/NCNestedTestModelAny4.scala}  |  42 +++++---
 .../anyword/adapters/NCNestedTestModelAny5.scala}  |  42 +++++---
 .../anyword/adapters/NCNestedTestModelAny6.scala}  |  42 +++++---
 .../anyword/adapters/NCNestedTestModelAny7.scala}  |  42 +++++---
 .../enrichers/numeric/NCEnricherNumericSpec.scala  |  75 ++++++++++++++
 40 files changed, 776 insertions(+), 274 deletions(-)
 rename nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/{NCEnricherNestedModelSpec41.scala => NCEnricherNestedModelSpec4.scala} (95%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/{NCEnricherNestedModelSpec5.scala => NCEnricherNestedModelSpec6.scala} (55%)
 create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/anyword/NCNestedAnySpec.scala
 create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/anyword/NCNestedTestModelsAnyAlphaNum.scala
 create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/anyword/NCNestedTestModelsAnyNotSpace.scala
 create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/anyword/NCNestedTestModelsAnyRegex.scala
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/{deploy/scalatest/NCModelDeploySpecAdapter.scala => nlp/enrichers/model/anyword/adapters/NCNestedModelAnyAdapter.scala} (59%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/{model/abstract/NCAbstractTokensModel.scala => probe/mgrs/nlp/enrichers/model/anyword/adapters/NCNestedTestModelAny1.scala} (53%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/{model/abstract/NCAbstractTokensModel.scala => probe/mgrs/nlp/enrichers/model/anyword/adapters/NCNestedTestModelAny2.scala} (50%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/{model/abstract/NCAbstractTokensModel.scala => probe/mgrs/nlp/enrichers/model/anyword/adapters/NCNestedTestModelAny3.scala} (55%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/{model/abstract/NCAbstractTokensModel.scala => probe/mgrs/nlp/enrichers/model/anyword/adapters/NCNestedTestModelAny4.scala} (51%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/{model/abstract/NCAbstractTokensModel.scala => probe/mgrs/nlp/enrichers/model/anyword/adapters/NCNestedTestModelAny5.scala} (51%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/{model/abstract/NCAbstractTokensModel.scala => probe/mgrs/nlp/enrichers/model/anyword/adapters/NCNestedTestModelAny6.scala} (50%)
 copy nlpcraft/src/test/scala/org/apache/nlpcraft/{model/abstract/NCAbstractTokensModel.scala => probe/mgrs/nlp/enrichers/model/anyword/adapters/NCNestedTestModelAny7.scala} (50%)
 create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/numeric/NCEnricherNumericSpec.scala

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

Posted by ar...@apache.org.
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 <ar...@datalingvo.com>
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(-)