[incubator-nlpcraft] branch NLPCRAFT-296 updated: Update NCProbeVariants.scala

[ar...@apache.org]

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


The following commit(s) were added to refs/heads/NLPCRAFT-296 by this push:
     new a8a2c20  Update NCProbeVariants.scala
a8a2c20 is described below

commit a8a2c20aadf56f742f0ccde09dfd41b62364a788
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Thu May 27 22:00:41 2021 -0700

    Update NCProbeVariants.scala
---
 .../org/apache/nlpcraft/probe/mgrs/NCProbeVariants.scala  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeVariants.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeVariants.scala
index b5169b7..f3122b3 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeVariants.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeVariants.scala
@@ -27,6 +27,7 @@ import java.io.{Serializable => JSerializable}
 import java.util
 import java.util.Collections.singletonList
 import scala.collection.mutable
+import scala.jdk.CollectionConverters.{BufferHasAsJava, ListHasAsScala, MapHasAsJava}
 
 /**
   * Sentence to variants converter.
@@ -84,7 +85,7 @@ object NCProbeVariants {
         delNotes: Map[NlpNote, Seq[NlpToken]],
         noteTypePred: String => Boolean
     ): Option[NlpToken] =
-        delNotes.toStream.
+        delNotes.to(LazyList).
             flatMap { case (delNote, delNoteToks) =>
                 if (noteTypePred(delNote.noteType)) {
                     val toks =
@@ -106,11 +107,11 @@ object NCProbeVariants {
 
                                 delNote.noteType match {
                                     case "nlpcraft:relation" | "nlpcraft:limit" => ps += "indexes" -> IDXS
-                                    case "nlpcraft:sort" => ps += "subjindexes" -> IDXS2; ps += "byindexes" ->  IDXS2
+                                    case "nlpcraft:sort" => ps += "subjindexes" -> IDXS2; ps += "byindexes" -> IDXS2
                                     case _ => // No-op.
                                 }
 
-                                artTok.add(delNote.clone(ps :_*))
+                                artTok.add(delNote.clone(ps.toSeq :_*))
                             }
 
                             Some(artTok)
@@ -233,7 +234,7 @@ object NCProbeVariants {
                                                     case Some(nlpNote) =>
                                                         val artTok = NlpToken(IDX)
 
-                                                        artTok.add(nlpNote.clone(mkNlpNoteParams(): _*))
+                                                        artTok.add(nlpNote.clone(mkNlpNoteParams().toSeq: _*))
 
                                                         mkToken(artTok)
                                                     case None =>
@@ -255,7 +256,7 @@ object NCProbeVariants {
                                 }
                             }
 
-                            tok.setParts(parts)
+                            tok.setParts(parts.toSeq)
 
                             require(parts.nonEmpty)
 
@@ -306,7 +307,7 @@ object NCProbeVariants {
 
             if (bestVars.size != vars.size)
                 // Reverts orders.
-                vars = bestVars.sortBy(sortedVars.indexOf)
+                vars = bestVars.sortBy(sortedVars.indexOf).toSeq
         }
 
         for (v <- vars; t <- v.asScala)
@@ -314,7 +315,7 @@ object NCProbeVariants {
                 t.getIndex >= 0,
                 s"Invalid token: $t with index: ${t.getIndex}, " +
                     s"lastPhase: $lastPhase, " +
-                    s"sentence:\n${NCTokenLogger.prepareTable(v.asScala)}" +
+                    s"sentence:\n${NCTokenLogger.prepareTable(v.asScala.toSeq)}" +
                     s""
             )