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 3ccd21380d392395b24a59b9c0b032ad892da22b Author: unknown <[email protected]> AuthorDate: Thu May 27 13:14:57 2021 -0700 WIP. --- .../scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala | 2 +- .../org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala | 1 - .../probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala | 2 +- .../server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala | 1 + .../nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala | 10 +++++----- .../nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala index e30d301..e8e02f0 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala @@ -207,7 +207,7 @@ class NCProbeSynonym( require(toks != null) require(sparse && !hasIdl) - sparseMatch0(toks, isMatch, (t: NCNlpSentenceToken) => t.startCharIndex, shouldBeNeighbors = false) + sparseMatch0(toks.toSeq, isMatch, (t: NCNlpSentenceToken) => t.startCharIndex, shouldBeNeighbors = false) } /** diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala index c893251..7a22d18 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala @@ -24,7 +24,6 @@ import org.apache.nlpcraft.common.nlp._ import org.apache.nlpcraft.common.{NCService, _} import org.apache.nlpcraft.probe.mgrs.NCProbeModel -import scala.collection.Map import scala.language.implicitConversions /** diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala index 1c3e9ea..19aad79 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala @@ -27,7 +27,7 @@ import org.apache.nlpcraft.probe.mgrs.NCProbeModel import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher import scala.collection.mutable -import scala.jdk.CollectionConverters.SeqHasAsJava +import scala.jdk.CollectionConverters.{MapHasAsScala, SeqHasAsJava, SetHasAsScala} /** * Relation enricher. diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala index f86f0a8..44f7d85 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala @@ -129,6 +129,7 @@ object NCOpenNlpNerEnricher extends NCService with NCNlpNerEnricher with NCIgnit synchronized { val res = nerFinders. filter { case (_, tokName) => ebiTokens.contains(tokName)}. + toSeq. flatMap { case (finder, name) => finder.find(words).map(p => Holder(p.getStart, p.getEnd - 1, name, p.getProb)) diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala index d507dcf..e4c7908 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/date/NCDateEnricher.scala @@ -174,7 +174,7 @@ object NCDateEnricher extends NCServerEnricher { * @throws NCE */ @throws[NCE] - override def enrich(ns: Sentence, parent: Span = null) { + override def enrich(ns: Sentence, parent: Span = null): Unit = { require(isStarted) // This stage must not be 1st enrichment stage. @@ -383,7 +383,7 @@ object NCDateEnricher extends NCServerEnricher { fromIncl: Boolean, toIncl: Boolean, tokens: Seq[Token], - base: Long) { + base: Long): Unit = { val note = mkNote( NCDateParser.calculate(body, base, fromIncl, toIncl).mkInclusiveDateRange, tokens.head.index, @@ -396,7 +396,7 @@ object NCDateEnricher extends NCServerEnricher { private def mark(processed: F*): Unit = processed.foreach(_.isProcessed = true) - private def collapse(ns: Sentence) { + private def collapse(ns: Sentence): Unit = { removeDuplicates(ns) collapsePeriods(ns) removeDuplicates(ns) @@ -404,7 +404,7 @@ object NCDateEnricher extends NCServerEnricher { private def isValidRange(n: Note): Boolean = n("from").asInstanceOf[Long] < n("to").asInstanceOf[Long] - private def collapsePeriods(ns: Sentence) { + private def collapsePeriods(ns: Sentence): Unit = { // a) Months and years. // 1. "m", "m"... "y, m" -> fix year for firsts; try to union all. // Example: January, February of 2009. @@ -563,7 +563,7 @@ object NCDateEnricher extends NCServerEnricher { ns: Sentence, seq: Seq[Note], before: Option[Note] = None, - after: Option[Note] = None) { + after: Option[Note] = None): Unit = { if (!compressNotes(ns, seq, before, after)) { def remove(nOpt: Option[Note]): Unit = nOpt match { diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala index e6a9c66..4753a17 100644 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala @@ -38,7 +38,7 @@ import java.util.concurrent._ import java.util.concurrent.atomic.{AtomicInteger, AtomicReference} import scala.collection.mutable import scala.concurrent.{ExecutionContext, Future, Promise} -import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsScala} +import scala.jdk.CollectionConverters.{ListHasAsScala, MapHasAsScala, SeqHasAsJava} import scala.util.{Failure, Success} /**
