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 b991ebb WIP.
b991ebb is described below
commit b991ebbf421bd9c8fbf480821b09db6a09330f36
Author: Aaron Radzinzski <[email protected]>
AuthorDate: Mon May 31 01:31:50 2021 -0700
WIP.
---
.../src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala | 4 ++--
.../main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala | 2 +-
.../org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala | 6 +++---
.../apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala | 2 +-
.../nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala | 2 +-
.../org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala | 1 +
.../org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala | 6 +++---
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index 94b2470..b7e910f 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@ -177,7 +177,7 @@ object NCUtils extends LazyLogging {
* @return
*/
def splitTrimFilter(s: String, sep: String): Seq[String] =
- trimFilter(s.split(sep))
+ trimFilter(s.split(sep).toIndexedSeq)
/**
* Recursively removes quotes from given string.
@@ -1814,7 +1814,7 @@ object NCUtils extends LazyLogging {
*
* @param s String for tokenization.
*/
- def tokenizeSpace(s: String): Seq[String] = s.split(" ")
+ def tokenizeSpace(s: String): Seq[String] = s.split(" ").toIndexedSeq
/**
* Makes SHA256 hash.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index d92c189..0fb2556 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -88,7 +88,7 @@ object NCCli extends NCCliBase {
IOUtils.copy(zis, buf, StandardCharsets.UTF_8)
- m += entry.getName -> buf.toString.split("\n")
+ m += entry.getName -> buf.toString.split("\n").toIndexedSeq
entry = zis.getNextEntry
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index 77c898d..2e84a24 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -1107,7 +1107,7 @@ object NCDeployManager extends NCService {
data
val allAnns = mtd.getParameterAnnotations
- val tokParamAnns = getTokensSeq(allAnns).filter(_ != null)
+ val tokParamAnns = getTokensSeq(allAnns.toIndexedSeq).filter(_ != null)
val tokParamTypes = getTokensSeq(allParamTypes)
// Checks tokens parameters annotations count.
@@ -1171,7 +1171,7 @@ object NCDeployManager extends NCService {
s"]")
}
- val paramGenTypes = getTokensSeq(mtd.getGenericParameterTypes)
+ val paramGenTypes =
getTokensSeq(mtd.getGenericParameterTypes.toIndexedSeq)
require(tokParamTypes.length == paramGenTypes.length)
@@ -1660,7 +1660,7 @@ object NCDeployManager extends NCService {
foreach {
case (s, sNorm) =>
if (processed.add(Case(mdlId, s))) {
- val seq: Seq[String] = sNorm.split("
").map(NCNlpPorterStemmer.stem)
+ val seq: Seq[String] = sNorm.split("
").toIndexedSeq.map(NCNlpPorterStemmer.stem)
if (!allSyns.exists(_.intersect(seq).nonEmpty))
logger.warn(s"@NCIntentSample sample doesn't
contain any direct synonyms [" +
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
index 14781ff..cc214b6 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
@@ -143,7 +143,7 @@ object NCOpenNlpParser extends NCService with NCNlpParser
with NCIgniteInstance
cache += normTxt -> words
- toks.zip(poses).zip(lemmas).map { case ((tok, pos), lemma) =>
+ toks.zip(poses).zip(lemmas).toIndexedSeq.map { case ((tok, pos),
lemma) =>
val normalWord = tok.token.toLowerCase
NCNlpWord(
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala
index e65b263..a4e396f 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/stopword/NCStopWordEnricher.scala
@@ -359,7 +359,7 @@ object NCStopWordEnricher extends NCServerEnricher {
val incl = toImmutable(m((isExc, form)).includes)
val excl = toImmutable(m((isExc, form)).excludes)
- mkInstance(any ++ excl.values.flatMap(x => x), incl, excl)
+ mkInstance(any ++ excl.values.flatten, incl, excl)
}
def mkHash(form: WordForm): HashHolder = mkHolder(mHash, form,
HashHolder)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
index 50ff718..48cdb8f 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/wordnet/NCWordNetManager.scala
@@ -153,6 +153,7 @@ object NCWordNetManager extends NCService {
synsOffs.
map(dic.getSynsetAt(wnPos, _)).
filter(_.getPOS == wnPos).
+ toIndexedSeq.
map(
_.getWords.asScala.
map(_.getLemma.toLowerCase).
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 47f8171..02366ba 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
@@ -232,7 +232,7 @@ object NCSuggestSynonymManager extends NCService {
val reqs =
exs.flatMap { case (exWords,
exampleStems) =>
- val exIdxs =
synsStems.flatMap(synStems => getAllSlices(exampleStems, synStems))
+ val exIdxs =
synsStems.flatMap(synStems => getAllSlices(exampleStems.toIndexedSeq, synStems))
def mkRequestData(idx: Int,
synStems: Seq[String], synStemsIdx: Int): RequestData = {
val fromIncl = idx
@@ -323,7 +323,7 @@ object NCSuggestSynonymManager extends NCService {
allSgsts.
computeIfAbsent(elemId, (_:
String) => new CopyOnWriteArrayList[Suggestion]()).
- addAll(resps.flatMap(x =>
x).asJava)
+ addAll(resps.flatten.asJava)
if (i == allReqsCnt)
cdl.countDown()
@@ -342,7 +342,7 @@ object NCSuggestSynonymManager extends NCService {
if (err.get() != null)
throw new NCE("Error while working with
'ctxword' server.", err.get())
- val allSynsStems =
elemSyns.flatMap(_._2).toSeq.flatMap(x => x).map(_.stem).toSet
+ val allSynsStems =
elemSyns.flatMap(_._2).toSeq.flatten.map(_.stem).toSet
val nonEmptySgsts = allSgsts.asScala.map(p =>
p._1 -> p._2.asScala).filter(_._2.nonEmpty)
