This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-443-1
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-443-1 by this push:
new 4376e97 WIP.
4376e97 is described below
commit 4376e97d001223f7867d783108de8a857e441df9
Author: Sergey Kamov <[email protected]>
AuthorDate: Thu Sep 23 10:49:41 2021 +0300
WIP.
---
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 38 +++++++++++-----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git
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
index c5ca532..0cd8a92 100644
---
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
@@ -362,15 +362,9 @@ object NCModelEnricher extends NCProbeEnricher {
private def toParts(mdl: NCProbeModel, stvReqId: String, seq:
Seq[NCIdlContent], s: Synonym): Seq[TokType] =
seq.zip(s.map(_.kind)).flatMap {
case (complex, kind) =>
- if (complex.isLeft)
- Some(complex.swap.toOption.get -> kind)
- else {
- val clone = complex.toOption.get.clone()
+ val t = if (complex.isLeft) complex.swap.toOption.get else
mkNlpToken(mdl, stvReqId, complex.toOption.get)
- clone.filter(!_.isNlp).foreach(clone.remove)
-
- Some(NCTokenImpl(mdl, stvReqId, clone) -> kind)
- }
+ Some(t -> kind)
}
/**
@@ -444,6 +438,20 @@ object NCModelEnricher extends NCProbeEnricher {
/**
*
+ * @param mdl
+ * @param srvReqId
+ * @param t
+ */
+ private def mkNlpToken(mdl: NCProbeModel, srvReqId: String, t: NlpToken):
NCToken = {
+ val notes = mutable.HashSet.empty[NlpNote]
+
+ notes += t.getNlpNote
+
+ NCTokenImpl(mdl, srvReqId, NlpToken(t.index, notes, t.stopsReasons))
+ }
+
+ /**
+ *
* @param h
* @param toks
*/
@@ -531,17 +539,9 @@ object NCModelEnricher extends NCProbeEnricher {
val combToks = combosTokens(ns.toSeq)
lazy val ch = mkComplexes(mdl, ns)
lazy val variantsToks =
- ch.complexes.map(p => p.tokensComplexes.map(p =>
- if (p.isToken)
- p.token
- else {
- // TODO: everywhere
- val notes = mutable.HashSet.empty[NlpNote]
-
- notes += p.word.getNlpNote
-
- NCTokenImpl(mdl, ns.srvReqId, NlpToken(p.word.index,
notes, p.word.stopsReasons))
- }))
+ ch.complexes.map(
+ p => p.tokensComplexes.map(p => if (p.isToken) p.token
else mkNlpToken(mdl, ns.srvReqId, p.word))
+ )
def execute(simpleEnabled: Boolean, idlEnabled: Boolean): Unit =
startScopedSpan(
