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
commit 25f6015fb5aabe7af651c355e081f72d846c6a28 Author: Sergey Kamov <[email protected]> AuthorDate: Sat Sep 18 12:05:02 2021 +0300 WIP. --- .../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 27 +--------------------- .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 2 -- .../probe/mgrs/sentence/NCSentenceManager.scala | 7 ++---- .../model/stm/indexes/NCSpecModelAdapter.scala | 4 ++-- 4 files changed, 5 insertions(+), 35 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 f8457e8..058d713 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,11 +196,7 @@ object NCModelEnricher extends NCProbeEnricher { toks.foreach(_.add(note)) // For NLP elements. - toks.foreach(t => { - ns.fixNote(t.getNlpNote, "direct" -> direct) - // TODO: - //ns.fixNote(t.getNlpNote, "stopWord" -> false) - }) + toks.foreach(t => ns.fixNote(t.getNlpNote, "direct" -> direct)) } /** @@ -541,27 +537,6 @@ object NCModelEnricher extends NCProbeEnricher { val combToks = combosTokens(ns.toSeq) lazy val ch = mkComplexes(mdl, ns) -// logger.info("combToks="+combToks.size) -// -// logger.info("ns.flatten.flatten.size="+ns.tokens.flatten.distinct.count(!_.isNlp)) -// -// ns.tokens.flatten.filter(!_.isNlp).distinct.sortBy(p => (p.noteType, -p.tokenIndexes.size)).foreach(n => { -// val parts = -// n.get("parts") match { -// case Some(v) => -// val parts = v.asInstanceOf[java.util.List[NCTokenPartKey]].asScala -// -// parts.map(p => { -// val ref = ns.tokens.find(t => t.startCharIndex == p.from && t.endCharIndex == p.to).get -// -// "part=" + p.id + " (idx=" + ref.index + "), text=" + ref.origText -// }).mkString(" | ") -// case None => "NO" -// } -// logger.info(s"${n.noteType} [${n.wordIndexes.mkString(",")}], parts=$parts") -// }) -// -// logger.info("---") def execute(simpleEnabled: Boolean, idlEnabled: Boolean): Unit = startScopedSpan( diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala index 1e31ab0..6e0780e 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala @@ -407,8 +407,6 @@ object NCSortEnricher extends NCProbeEnricher { case _ => throw new AssertionError(s"Unexpected type: $typ") } } - else - None } case None => // No-op. } diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/sentence/NCSentenceManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/sentence/NCSentenceManager.scala index d85c9d6..415e6ae 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/sentence/NCSentenceManager.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/sentence/NCSentenceManager.scala @@ -677,11 +677,8 @@ object NCSentenceManager extends NCService { map { case (_, seq) => seq.map { case (_, note) => note }.toSet }. toSeq.sortBy(-_.size) - def findCombinations(): Seq[Seq[NCNlpSentenceNote]] = { - val res = NCSentenceHelper.findCombinations(toksByIdx.map(_.asJava).asJava, pool).asScala.map(_.asScala.toSeq) - - res - } + def findCombinations(): Seq[Seq[NCNlpSentenceNote]] = + NCSentenceHelper.findCombinations(toksByIdx.map(_.asJava).asJava, pool).asScala.map(_.asScala.toSeq) val seqSens = combCache. 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 2328e7c..f9911f6 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 @@ -23,8 +23,8 @@ import org.apache.nlpcraft.NCTestElement import org.apache.nlpcraft.model.{NCElement, NCModelAdapter} import java.util -import java.util.{Collections, Optional} -import scala.jdk.CollectionConverters.{SeqHasAsJava, SetHasAsJava} +import java.util.Optional +import scala.jdk.CollectionConverters.SetHasAsJava object NCSpecModelAdapter { val mapper = new ObjectMapper()
