You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/03/14 07:00:45 UTC
[incubator-nlpcraft] 13/13: WIP.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 3be1ac306173c3b0eb08d1fdd17920cc53983073
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sat Mar 14 09:58:36 2020 +0300
WIP.
---
.../probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala b/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
index 973fb9c..efe4161 100644
--- a/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
+++ b/src/main/scala/org/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
@@ -111,7 +111,7 @@ object NCSortEnricher extends NCProbeEnricher {
*/
private def validate() {
// Not duplicated.
- require(SORT.size + BY.size + ORDER.size == (SORT ++ BY ++ ORDER.unzip._1).distinct.size)
+ require(SORT.size + BY.size + ORDER.size == (SORT ++ BY ++ ORDER.map(_._1)).distinct.size)
// Single words.
require(!SORT.exists(_.contains(" ")))
@@ -119,10 +119,10 @@ object NCSortEnricher extends NCProbeEnricher {
// Different words.
require(SORT.intersect(BY).isEmpty)
- require(SORT.intersect(ORDER.unzip._1).isEmpty)
- require(BY.intersect(ORDER.unzip._1).isEmpty)
+ require(SORT.intersect(ORDER.map(_._1)).isEmpty)
+ require(BY.intersect(ORDER.map(_._1)).isEmpty)
- val ordersSeq: Seq[Seq[String]] = ORDER.unzip._1.map(_.split(" ").toSeq)
+ val ordersSeq: Seq[Seq[String]] = ORDER.map(_._1).map(_.split(" ").toSeq)
// ORDER doens't contains words fron BY (It can contains words from SORT)
require(!BY.exists(p ⇒ ordersSeq.contains(p)))
@@ -240,7 +240,7 @@ object NCSortEnricher extends NCProbeEnricher {
val hOpt: Option[KeyWordsHolder] =
get0(SORT, toks) match {
case Some(sort) ⇒
- val orderOpt = get0(ORDER.unzip._1, toks)
+ val orderOpt = get0(ORDER.map(_._1), toks)
def mkHolder(sort: KeyWord): Option[KeyWordsHolder] = Some(KeyWordsHolder(sort, get0(BY, toks), orderOpt))