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 2021/02/16 18:37:27 UTC
[incubator-nlpcraft] branch NLPCRAFT-238 updated (3e2e9e6 ->
9c3c134)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-238
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 3e2e9e6 WIP.
add a7ea33e Abstract elements support added.
new 63ad4cb Merge branch 'master' into NLPCRAFT-238
new 9c3c134 WIP.
The 2 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:
.../main/scala/org/apache/nlpcraft/model/NCToken.java | 16 ++++++++++++++--
.../model/abstract/NCAbstractTokensEnricherSpec.scala | 2 +-
.../probe/mgrs/nlp/enrichers/NCDefaultTestModel.scala | 7 +++++--
3 files changed, 20 insertions(+), 5 deletions(-)
[incubator-nlpcraft] 02/02: WIP.
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-238
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 9c3c134a3a39c4c1d631ae193130153e392fc4a5
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Tue Feb 16 21:36:35 2021 +0300
WIP.
---
.../apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala | 1 -
1 file changed, 1 deletion(-)
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala
index df6c91b..5bcbb06 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala
@@ -19,7 +19,6 @@ package org.apache.nlpcraft.model.`abstract`
import org.apache.nlpcraft.NCTestEnvironment
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCEnricherBaseSpec, NCEnrichersTestContext, NCTestNlpToken ⇒ nlp, NCTestUserToken ⇒ usr}
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCEnricherBaseSpec, NCEnrichersTestContext, NCTestNlpToken => nlp, NCTestUserToken => usr}
import org.junit.jupiter.api.Test
class NCAbstractTokensModelEnrichers extends NCAbstractTokensModel with NCEnrichersTestContext
[incubator-nlpcraft] 01/02: Merge branch 'master' into NLPCRAFT-238
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-238
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 63ad4cb94cad8584da1d84b8cad527ffc1865196
Merge: 3e2e9e6 a7ea33e
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Tue Feb 16 21:35:12 2021 +0300
Merge branch 'master' into NLPCRAFT-238
# Conflicts:
# nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCToken.java
# nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCTokenImpl.scala
# nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/limit/NCLimitEnricher.scala
# nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIntentDslSpec2.scala
# nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala
# nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
# nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCDefaultTestModel.scala
.../main/scala/org/apache/nlpcraft/model/NCToken.java | 16 ++++++++++++++--
.../model/abstract/NCAbstractTokensEnricherSpec.scala | 1 +
.../probe/mgrs/nlp/enrichers/NCDefaultTestModel.scala | 7 +++++--
3 files changed, 20 insertions(+), 4 deletions(-)
diff --cc nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala
index c085051,5bcbb06..df6c91b
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensEnricherSpec.scala
@@@ -18,7 -18,7 +18,8 @@@
package org.apache.nlpcraft.model.`abstract`
import org.apache.nlpcraft.NCTestEnvironment
+ import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCEnricherBaseSpec, NCEnrichersTestContext, NCTestNlpToken ⇒ nlp, NCTestUserToken ⇒ usr}
+import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.{NCEnricherBaseSpec, NCEnrichersTestContext, NCTestNlpToken => nlp, NCTestUserToken => usr}
import org.junit.jupiter.api.Test
class NCAbstractTokensModelEnrichers extends NCAbstractTokensModel with NCEnrichersTestContext
diff --cc nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCDefaultTestModel.scala
index 79151d5,fe03c64..dd544f0
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCDefaultTestModel.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCDefaultTestModel.scala
@@@ -17,29 -17,30 +17,32 @@@
package org.apache.nlpcraft.probe.mgrs.nlp.enrichers
+import org.apache.nlpcraft.NCTestElement
- import org.apache.nlpcraft.model.{NCElement, NCModelAdapter, NCValue}
- import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.NCDefaultTestModel._
+ import org.apache.nlpcraft.model.{NCElement, NCModelAdapter, NCResult, NCValue}
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.NCDefaultTestModel._
import java.util
import java.util.Collections
import scala.collection.JavaConverters._
import scala.language.implicitConversions
++import NCDefaultTestModel._
++
/**
* Enrichers default test model.
*/
class NCDefaultTestModel extends NCModelAdapter(ID, "Model enrichers test", "1.0") with NCEnrichersTestContext {
+ private implicit def convert(s: String): NCResult = NCResult.text(s)
+
override def getElements: util.Set[NCElement] =
Set(
- mkElement("A", "A"),
- mkElement("B", "B"),
- mkElement("C", "C"),
- mkElement("AB", "A B"),
- mkElement("BC", "B C"),
- mkElement("ABC", "A B C"),
- mkElement("D1", "D"),
- mkElement("D2", "D"),
+ NCTestElement("A", "A"),
+ NCTestElement("B", "B"),
+ NCTestElement("C", "C"),
+ NCTestElement("AB", "A B"),
+ NCTestElement("BC", "B C"),
+ NCTestElement("ABC", "A B C"),
+ NCTestElement("D1", "D"),
+ NCTestElement("D2", "D"),
mkValueElement("V", "V1", "V2")
).asJava