[incubator-nlpcraft] branch NLPCRAFT-30 updated: WIP.

[sergeykamov]

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

sergeykamov pushed a commit to branch NLPCRAFT-30
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-30 by this push:
     new 8dd7d21  WIP.
8dd7d21 is described below

commit 8dd7d217abaac3a2fed2179f24a2e487edd247b2
Author: Sergey Kamov <sergeyka...@apache.org>
AuthorDate: Tue Apr 28 15:32:27 2020 +0300

    WIP.
---
 .../org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala  | 3 ++-
 .../nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala      | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
 
b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
index a54898d..4f470b9 100644
--- 
a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
+++ 
b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
@@ -392,7 +392,8 @@ object NCProbeEnrichmentManager extends NCService with 
NCOpenCensusModelStats {
                     h.enricher → (notes1 == notes2)
                 }).toMap
 
-                continue = res.exists { case (_, same) ⇒ !same }
+                // Loop has sense if model is complex (has user defined 
parsers or DSL based synonyms)
+                continue = NCModelEnricher.isComplex(mdlDec) && res.exists { 
case (_, same) ⇒ !same }
 
                 if (DEEP_DEBUG)
                     if (continue)
diff --git 
a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
 
b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
index a3c08ce..42f743b 100644
--- 
a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
+++ 
b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
@@ -298,6 +298,9 @@ object NCModelEnricher extends NCProbeEnricher with 
DecorateAsScala {
       */
     private def alreadyMarked(toks: Seq[NCNlpSentenceToken], elemId: String): 
Boolean = toks.forall(_.isTypeOf(elemId))
 
+    def isComplex(mdl: NCModelDecorator): Boolean =
+        mdl.synonymsDsl.nonEmpty || (mdl.model.getParsers != null && 
!mdl.model.getParsers.isEmpty)
+
     @throws[NCE]
     override def enrich(mdl: NCModelDecorator, ns: NCNlpSentence, senMeta: 
Map[String, Serializable], parent: Span = null): Unit =
         startScopedSpan("enrich", parent,