This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-296 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit c10417b6dd83e0966cb8432bd6c05b2356681b11 Author: unknown <[email protected]> AuthorDate: Thu May 27 13:22:13 2021 -0700 WIP. --- .../model/intent/solver/NCIntentSolverEngine.scala | 2 +- .../nlp/enrichers/dictionary/NCDictionaryEnricher.scala | 1 - .../nlp/enrichers/stopword/NCStopWordEnricher.scala | 1 - .../suspicious/NCSuspiciousNounsEnricher.scala | 2 -- .../probe/mgrs/sentence/NCSentenceManager.scala | 17 +++++++++-------- .../apache/nlpcraft/server/nlp/core/NCNlpParser.scala | 2 -- .../nlpcraft/server/nlp/core/NCNlpServerManager.scala | 1 - 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala index 2451f65..9946afd 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala @@ -24,7 +24,7 @@ import org.apache.nlpcraft.common.debug.{NCLogGroupToken, NCLogHolder} import org.apache.nlpcraft.common.opencensus.NCOpenCensusTrace import org.apache.nlpcraft.model.impl.NCTokenLogger import org.apache.nlpcraft.model.impl.NCTokenPimp._ -import org.apache.nlpcraft.model.intent.{NCIdlContext, NCIdlFunction, NCIdlIntent, NCIdlTerm, NCIdlStackItem ⇒ Z} +import org.apache.nlpcraft.model.intent.{NCIdlContext, NCIdlFunction, NCIdlIntent, NCIdlTerm, NCIdlStackItem => Z} import org.apache.nlpcraft.model.{NCContext, NCDialogFlowItem, NCIntentMatch, NCResult, NCToken} import org.apache.nlpcraft.probe.mgrs.dialogflow.NCDialogFlowManager diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/dictionary/NCDictionaryEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/dictionary/NCDictionaryEnricher.scala index 8c58a83..5c28d9e 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/dictionary/NCDictionaryEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/dictionary/NCDictionaryEnricher.scala @@ -28,7 +28,6 @@ import org.apache.nlpcraft.probe.mgrs.NCProbeModel import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher import java.io.Serializable -import scala.collection.Map /** * Dictionary enricher. diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/stopword/NCStopWordEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/stopword/NCStopWordEnricher.scala index b70dd49..fc904d2 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/stopword/NCStopWordEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/stopword/NCStopWordEnricher.scala @@ -27,7 +27,6 @@ import org.apache.nlpcraft.probe.mgrs.NCProbeModel import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher import scala.annotation.tailrec -import scala.collection.{Map, Seq} /** * Stop words enricher. diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/suspicious/NCSuspiciousNounsEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/suspicious/NCSuspiciousNounsEnricher.scala index 2d08c10..384f1e3 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/suspicious/NCSuspiciousNounsEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/suspicious/NCSuspiciousNounsEnricher.scala @@ -25,8 +25,6 @@ import org.apache.nlpcraft.common.nlp._ import org.apache.nlpcraft.probe.mgrs.NCProbeModel import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher -import scala.collection.Map - /** * Suspicious words enricher. */ 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 1ff8df0..f922eaa 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 @@ -24,11 +24,11 @@ import org.apache.nlpcraft.common.nlp.{NCNlpSentence, NCNlpSentenceNote, NCNlpSe import org.apache.nlpcraft.common.{NCE, NCService, U} import org.apache.nlpcraft.model.NCModel -import java.io.{Serializable => JSerializable} +import java.io.{Serializable ⇒ JSerializable} import java.util -import java.util.{List => JList} +import java.util.{List ⇒ JList} import scala.collection.mutable -import scala.jdk.CollectionConverters.CollectionHasAsScala +import scala.jdk.CollectionConverters.{ListHasAsScala, SeqHasAsJava} import scala.language.implicitConversions /** @@ -77,9 +77,10 @@ object NCSentenceManager extends NCService { require(names.size() == idxsSeq.size()) noteLinks ++= - (for ((name, idxs) <- names.asScala.zip(idxsSeq.asScala.map(_.asScala))) - yield NoteLink(name, idxs.sorted) - ) + ( + for ((name, idxs) <- names.asScala.zip(idxsSeq.asScala.map(_.asScala))) + yield NoteLink(name, idxs.sorted.toSeq) + ) } if (n.contains("subjnotes")) add("subjnotes", "subjindexes") @@ -164,7 +165,7 @@ object NCSentenceManager extends NCService { ns.filter(_.isTypeOf(noteType)).foreach(tok => tok.getNoteOpt(noteType, idxsField) match { case Some(n) => - val idxs: Seq[Int] = n.data[JList[Int]](idxsField).asScala + val idxs: Seq[Int] = n.data[JList[Int]](idxsField).asScala.toSeq var fixed = idxs history.foreach { case (idxOld, idxNew) => fixed = fixed.map(i => if (i == idxOld) idxNew else i) } @@ -178,7 +179,7 @@ object NCSentenceManager extends NCService { ) ns.flatMap(_.getNotes(noteType)).forall( - n => checkRelation(ns, n.data[JList[Int]]("indexes").asScala, n.data[String](noteField), n) + n => checkRelation(ns, n.data[JList[Int]]("indexes").asScala.toSeq, n.data[String](noteField), n) ) } diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpParser.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpParser.scala index 4ec9b3e..21d059c 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpParser.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpParser.scala @@ -20,8 +20,6 @@ package org.apache.nlpcraft.server.nlp.core import io.opencensus.trace.Span import org.apache.nlpcraft.common.NCService -import scala.collection.Seq - /** * NLP parser. */ diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpServerManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpServerManager.scala index ba71930..a3e5a25 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpServerManager.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/NCNlpServerManager.scala @@ -23,7 +23,6 @@ import org.apache.nlpcraft.common.nlp.core.NCNlpCoreManager import org.apache.nlpcraft.common.pool.NCThreadPoolManager import org.apache.nlpcraft.common.{NCService, _} -import scala.collection.Seq import scala.concurrent.ExecutionContext /**
