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/03/12 08:03:06 UTC
[incubator-nlpcraft] branch NLPCRAFT-206 updated (1ce0cb5 ->
052f3c7)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-206
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 1ce0cb5 Update NCModelManager.scala
add 3146084 DSL synonyms processing refactoring.
new e70c31a Merge branch 'master' into NLPCRAFT-206
add db066f4 Minor refactoring.
new 052f3c7 Merge branch 'master' into 206_tmp
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:
.../nlpcraft/common/nlp/NCNlpSentenceToken.scala | 2 +-
.../nlpcraft/examples/sql/db/SqlAccess.scala | 2 +-
.../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 17 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 271 +++++++++++++--------
.../scala/org/apache/nlpcraft/NCTestContext.scala | 2 +-
.../org/apache/nlpcraft/NCTestEnvironment.java | 6 +
.../nlpcraft/examples/sql/NCSqlExampleSpec.scala | 2 +-
.../nlpcraft/examples/sql/NCSqlModelSpec.scala | 2 +-
.../model/NCEnricherNestedModelSpec4.scala | 2 +-
9 files changed, 192 insertions(+), 114 deletions(-)
[incubator-nlpcraft] 01/02: Merge branch 'master' into NLPCRAFT-206
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-206
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit e70c31a44cedda48bac8ab4e51d2dd0050ccea9a
Merge: 1ce0cb5 3146084
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Fri Mar 12 10:23:07 2021 +0300
Merge branch 'master' into NLPCRAFT-206
# Conflicts:
# nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
# nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
.../nlpcraft/common/nlp/NCNlpSentenceToken.scala | 9 +-
.../nlpcraft/examples/sql/db/SqlAccess.scala | 2 +-
.../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 17 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 271 +++++++++++++--------
.../scala/org/apache/nlpcraft/NCTestContext.scala | 2 +-
.../org/apache/nlpcraft/NCTestEnvironment.java | 6 +
.../nlpcraft/examples/sql/NCSqlExampleSpec.scala | 2 +-
.../nlpcraft/examples/sql/NCSqlModelSpec.scala | 2 +-
.../model/NCEnricherNestedModelSpec4.scala | 2 +-
9 files changed, 199 insertions(+), 114 deletions(-)
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
index 16bd6a4,6f7e35a..cd05a1a
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
@@@ -19,7 -19,7 +19,8 @@@ package org.apache.nlpcraft.probe.mgr
import org.apache.nlpcraft.common.nlp.{NCNlpSentenceToken, NCNlpSentenceTokenBuffer}
import org.apache.nlpcraft.model._
+ import org.apache.nlpcraft.probe.mgrs.NCProbeSynonym.NCDslContent
+import org.apache.nlpcraft.model.intent.NCDslContext
import org.apache.nlpcraft.probe.mgrs.NCProbeSynonymChunkKind._
import scala.collection.mutable.ArrayBuffer
@@@ -91,15 -94,11 +95,12 @@@ class NCProbeSynonym
/**
*
* @param tows
++ * @param req
* @return
*/
- def isMatch(tows: Seq[Either[NCToken, NCNlpSentenceToken]], req: NCRequest): Boolean = {
- def isMatch(tows: Seq[NCDslContent]): Boolean = {
++ def isMatch(tows: Seq[NCDslContent], req: NCRequest): Boolean = {
require(tows != null)
- type Token = NCToken
- type Word = NCNlpSentenceToken
- type TokenOrWord = Either[Token, Word]
-
if (tows.length == length && tows.count(_.isLeft) >= dslChunks)
tows.zip(this).sortBy(p ⇒ getSort(p._2.kind)).forall {
case (tow, chunk) ⇒
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
index f898793,26821ca..20b5746
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
@@@ -435,11 -504,11 +504,11 @@@ object NCModelEnricher extends NCProbeE
for (
(len, seq) ← dslCombs;
- syn ← fastAccess(mdl.synonymsDsl, elm.getId, len).getOrElse(Seq.empty);
- comb ← seq if !found;
- data = comb.map(_.data)
+ syn ← fastAccess(mdl.synonymsDsl, elm.getId, len).getOrElse(Seq.empty);
+ comb ← seq if !found;
+ data = comb.map(_.data)
)
- if (syn.isMatch(data)) {
+ if (syn.isMatch(data, NCRequestImpl(senMeta, ns.srvReqId))) {
val parts = comb.zip(syn.map(_.kind)).flatMap {
case (complex, kind) ⇒ if (complex.isToken) Some(complex.token → kind) else None
}
[incubator-nlpcraft] 02/02: Merge branch 'master' into 206_tmp
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-206
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 052f3c7298e77f0da138df4f965f070c98dae2cd
Merge: e70c31a db066f4
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Fri Mar 12 10:59:25 2021 +0300
Merge branch 'master' into 206_tmp
.../org/apache/nlpcraft/common/nlp/NCNlpSentenceToken.scala | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)