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
The following commit(s) were added to refs/heads/NLPCRAFT-206 by this push:
new 268ad3b WIP.
268ad3b is described below
commit 268ad3bb8c3c4708bc301b4f91b986c3c1e641ed
Author: Aaron Radzinski <[email protected]>
AuthorDate: Fri Mar 12 20:36:19 2021 -0800
WIP.
---
.../org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala | 6 +++---
.../scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala | 2 +-
.../probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala | 6 +++---
.../probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala | 2 +-
.../probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala | 2 +-
.../probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
index c37c5fe..86a6dd4 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
@@ -29,10 +29,10 @@ class NCAbstractTokensModel extends NCModelAdapter(
override def getElements: util.Set[NCElement] =
Set(
NCTestElement("anyWord", "//[a-zA-Z0-9]+//"),
- NCTestElement("wrapAnyWord", "the ^^[internal](id() ==
'anyWord')^^"),
+ NCTestElement("wrapAnyWord", "the ^^[internal]{id() ==
'anyWord'}^^"),
NCTestElement("wrapNum", "w1 ^^id == 'nlpcraft:num'^^ w2"),
- NCTestElement("wrapLimit", "before limit ^^[limitAlias](id() ==
'nlpcraft:limit')^^"),
- NCTestElement("wrapWrapLimit", "wrap ^^[wrapLimitAlias](id() ==
'wrapLimit')^^")
+ NCTestElement("wrapLimit", "before limit ^^[limitAlias]{id() ==
'nlpcraft:limit'}^^"),
+ NCTestElement("wrapWrapLimit", "wrap ^^[wrapLimitAlias]{id() ==
'wrapLimit'}^^")
)
override def getAbstractTokens: util.Set[String] = Set("nlpcraft:num",
"anyWord").asJava
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala
index bf4cc29..1c98735 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala
@@ -39,7 +39,7 @@ class NCSynonymsSpecModel extends
NCModelAdapter("nlpcraft.syns.test.mdl", "Syno
NCTestElement("e3", "{//AA//}[3, 3]"),
// Nested - 3 words.
- NCTestElement("e4", "{^^(id() == 'e1')^^}[3, 3]")
+ NCTestElement("e4", "{^^{id() == 'e1'}^^}[3, 3]")
)
@NCIntent("intent=onE1 term(t)={id() == 'e1'}")
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala
index 9290d56..404a05e 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala
@@ -30,9 +30,9 @@ import java.util
class NCNestedTestModel extends NCDefaultTestModel {
override def getElements: util.Set[NCElement] =
Set(
- NCTestElement("x1", "{test|_} ^^id == 'nlpcraft:date'^^"),
- NCTestElement("x2", "{test1|_} ^^id == 'x1'^^"),
- NCTestElement("x3", "{test2|_} ^^id == 'x2'^^"),
+ NCTestElement("x1", "{test|_} ^^{id() == 'nlpcraft:date'}^^"),
+ NCTestElement("x2", "{test1|_} ^^{id() == 'x1'}^^"),
+ NCTestElement("x3", "{test2|_} ^^{id() == 'x2'}^^"),
NCTestElement("y1", "y"),
NCTestElement("y2", "^^id == 'y1'^^"),
NCTestElement("y3", "^^id == 'y2'^^ ^^id == 'y2'^^")
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala
index 8d8a06d..bf9bc8c 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala
@@ -28,7 +28,7 @@ import java.util
*/
class NCNestedTestModel21 extends NCModelAdapter("nlpcraft.nested2.test.mdl",
"Nested Test Model", "1.0") {
override def getElements: util.Set[NCElement] =
- Set(NCTestElement("e1", "{^^(id() == 'nlpcraft:num')^^|_} word"))
+ Set(NCTestElement("e1", "{^^{id() == 'nlpcraft:num'}^^|_} word"))
@NCIntent("intent=onE1 term(t1)={id() == 'e1'}")
def onAB(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
index 1eb1115..3f07c13 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
@@ -33,7 +33,7 @@ class NCNestedTestModel3 extends NCModelAdapter(
override def getElements: util.Set[NCElement] =
Set(
NCTestElement("e1", "//[a-zA-Z0-9]+//"),
- NCTestElement("e2", "^^(id() == 'e1')^^"),
+ NCTestElement("e2", "^^{id() == 'e1'}^^"),
)
override def getAbstractTokens: util.Set[String] = Set("e1").asJava
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala
index 75bcff2..9bbe7a6 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala
@@ -33,7 +33,7 @@ class NCNestedTestModel4 extends NCModelAdapter(
override def getElements: util.Set[NCElement] =
Set(
NCTestElement("e1", "//[a-zA-Z0-9]+//"),
- NCTestElement("e2", "the ^^(id() == 'e1')^^")
+ NCTestElement("e2", "the ^^{id() == 'e1'}^^")
)
override def getAbstractTokens: util.Set[String] = Set("e1").asJava