[incubator-nlpcraft] branch NLPCRAFT-296 updated: WIP.

[sergeykamov]

This is an automated email from the ASF dual-hosted git repository.

sergeykamov 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 c9827f7  WIP.
c9827f7 is described below

commit c9827f7c94e3a414708b140ce0c732a0ea46441f
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Mon May 31 11:11:18 2021 +0300

    WIP.
---
 .../main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala  | 4 ++--
 .../nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala   | 6 +++---
 .../scala/org/apache/nlpcraft/server/mdo/impl/NCAnnotatedMdo.scala  | 2 +-
 .../scala/org/apache/nlpcraft/server/query/NCQueryManager.scala     | 4 ++--
 4 files changed, 8 insertions(+), 8 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 e8e02f0..504db2f 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
@@ -150,7 +150,7 @@ class NCProbeSynonym(
       */
     private def isMatch(tow: NCIdlContent, chunk: NCProbeSynonymChunk, req: 
NCRequest): Boolean = {
         def get0[T](fromToken: NCToken => T, fromWord: NCNlpSentenceToken => 
T): T =
-            if (tow.isLeft) fromToken(tow.left.get) else 
fromWord(tow.right.get)
+            if (tow.isLeft) fromToken(tow.swap.toOption.get) else 
fromWord(tow.toOption.get)
 
         chunk.kind match {
             case TEXT => chunk.wordStem == get0(_.stem, _.stem)
@@ -223,7 +223,7 @@ class NCProbeSynonym(
         sparseMatch0(
             tows,
             (t: NCIdlContent, chunk: NCProbeSynonymChunk) => isMatch(t, chunk, 
req),
-            (t: NCIdlContent) => if (t.isLeft) t.left.get.getStartCharIndex 
else t.right.get.startCharIndex,
+            (t: NCIdlContent) => if (t.isLeft) 
t.swap.toOption.get.getStartCharIndex else t.toOption.get.startCharIndex,
             shouldBeNeighbors = !sparse
         )
     }
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 1b10224..1061ff8 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
@@ -324,7 +324,7 @@ object NCModelEnricher extends NCProbeEnricher {
       */
     private def toParts(seq: Seq[NCIdlContent], s: Synonym): Seq[TokType] =
         seq.zip(s.map(_.kind)).flatMap {
-            case (complex, kind) => if (complex.isLeft) Some(complex.left.get 
-> kind) else None
+            case (complex, kind) => if (complex.isLeft) 
Some(complex.swap.toOption.get -> kind) else None
         }
 
     /**
@@ -334,8 +334,8 @@ object NCModelEnricher extends NCProbeEnricher {
       */
     private def toTokens(tows: Seq[NCIdlContent], ns: Sentence): Seq[NlpToken] 
=
         (
-            tows.filter(_.isRight).map(_.right.get) ++
-                tows.filter(_.isLeft).map(_.left.get).
+            tows.filter(_.isRight).map(_.toOption.get) ++
+                tows.filter(_.isLeft).map(_.swap.toOption.get).
                     flatMap(w => ns.filter(t => 
t.wordIndexes.intersect(w.wordIndexes).nonEmpty))
         ).sortBy(_.startCharIndex)
 
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/mdo/impl/NCAnnotatedMdo.scala
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/mdo/impl/NCAnnotatedMdo.scala
index ce2424f..8bbebdf 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/mdo/impl/NCAnnotatedMdo.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/mdo/impl/NCAnnotatedMdo.scala
@@ -132,7 +132,7 @@ object NCAnnotatedMdo {
                         else if(zeroArgMtd.isLeft && oneArgMtd.isLeft)
                             throw NCMdoJsonConverterException("No converter 
found", cls, mtdName)
 
-                        Some(zeroArgMtd.right.getOrElse(oneArgMtd.right.get))
+                        
Some(zeroArgMtd.toOption.getOrElse(oneArgMtd.toOption.get))
                 }
 
                 MdoParameter(fldAnn, jsonConverter, getter.getName)
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
index 698d2a1..f4d2afe 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
@@ -456,9 +456,9 @@ object NCQueryManager extends NCService with 
NCIgniteInstance with NCOpenCensusS
             NCTxManager.startTx {
                 val srvReqIds =
                     if (arg.isLeft)
-                        cache.values.filter(_.userId == 
arg.left.get).map(_.srvReqId).toSet
+                        cache.values.filter(_.userId == 
arg.swap.toOption.get).map(_.srvReqId).toSet
                     else
-                        arg.right.get
+                        arg.toOption.get
 
                 cache --= srvReqIds.toSeq