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

[sergeykamov]

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

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


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

commit 26dc9071fdedfef2ee14fdb8365fe26ecf52b512
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Wed Sep 15 16:21:49 2021 +0300

    WIP.
---
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala |  3 ++-
 .../scala/org/apache/nlpcraft/NCTestElement.scala  |  2 ++
 .../model/stm/indexes/NCSpecModelAdapter.scala     | 23 +++++++++++-----------
 3 files changed, 15 insertions(+), 13 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 4823a68..ca388ed 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
@@ -196,7 +196,8 @@ object NCModelEnricher extends NCProbeEnricher {
         // For NLP elements.
         toks.foreach(t => {
             ns.fixNote(t.getNlpNote, "direct" -> direct)
-            ns.fixNote(t.getNlpNote, "stopWord" -> false)
+            // TODO:
+            //ns.fixNote(t.getNlpNote, "stopWord" -> false)
         })
     }
 
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
index daf1ab0..9d4c746 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/NCTestElement.scala
@@ -36,10 +36,12 @@ case class NCTestElement(id: String, syns: String*) extends 
NCElement {
     var permutateSynonyms: Optional[lang.Boolean] = super.isPermutateSynonyms
     var sparse: Optional[lang.Boolean] = super.isSparse
     var greedy: Optional[lang.Boolean] = super.isGreedy
+    var groups: Seq[String] = Seq(id)
 
     override def getId: String = id
     override def getSynonyms: util.List[String] = (syns :+ id).asJava
     override def getValues: util.List[NCValue] = values
+    override def getGroups: util.List[String] = groups.asJava
 
     override def getMetadata: util.Map[String, AnyRef] = metadata
     override def getDescription: String = description
diff --git 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/stm/indexes/NCSpecModelAdapter.scala
 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/stm/indexes/NCSpecModelAdapter.scala
index c0a8ac4..2328e7c 100644
--- 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/stm/indexes/NCSpecModelAdapter.scala
+++ 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/stm/indexes/NCSpecModelAdapter.scala
@@ -19,10 +19,11 @@ package org.apache.nlpcraft.model.stm.indexes
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
+import org.apache.nlpcraft.NCTestElement
 import org.apache.nlpcraft.model.{NCElement, NCModelAdapter}
 
 import java.util
-import java.util.Collections
+import java.util.{Collections, Optional}
 import scala.jdk.CollectionConverters.{SeqHasAsJava, SetHasAsJava}
 
 object NCSpecModelAdapter {
@@ -34,8 +35,8 @@ object NCSpecModelAdapter {
 class NCSpecModelAdapter extends NCModelAdapter("nlpcraft.stm.idxs.test", "STM 
Indexes Test Model", "1.0") {
     override def getElements: util.Set[NCElement] =
         Set(
-            mkElement("A2", "G1", "a a"),
-            mkElement("B2", "G1", "b b"),
+            mkElement("A2", "G1", "a a", greedy = false),
+            mkElement("B2", "G1", "b b", greedy = false),
 
             mkElement("X", "G2", "x"),
             mkElement("Y", "G2", "y"),
@@ -43,14 +44,12 @@ class NCSpecModelAdapter extends 
NCModelAdapter("nlpcraft.stm.idxs.test", "STM I
             mkElement("Z", "G3", "z")
         ).asJava
 
-    private def mkElement(id: String, group: String, syns: String*): NCElement 
=
-        new NCElement {
-            override def getId: String = id
-            override def getSynonyms: util.List[String] = {
-                val seq: Seq[String] = syns
+    private def mkElement(id: String, group: String, syns: String, greedy: 
Boolean = true): NCElement = {
+        val e = NCTestElement(id, syns)
 
-                seq.asJava
-            }
-            override def getGroups: util.List[String] = 
Collections.singletonList(group)
-        }
+        e.greedy = Optional.of(greedy)
+        e.groups = Seq(group)
+
+        e
+    }
 }