This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-472
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-472 by this push:
new 14a3a93 WIP.
14a3a93 is described below
commit 14a3a93fac34d8879b484e155c56f5815eb88ac4
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Thu Jan 6 14:37:38 2022 +0300
WIP.
---
.../nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala | 2 +-
.../main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala | 6 +++---
.../entity/parser/semantic/impl/NCSemanticEntityParserImpl.scala | 6 +++---
.../entity/parser/semantic/impl/NCSemanticSynonymsProcessor.scala | 2 +-
.../apache/nlpcraft/nlp/token/enricher/en/impl/NCQuotesImpl.scala | 2 +-
.../nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImpl.scala | 8 ++++----
.../nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala
index a7e442d..078bef4 100644
---
a/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala
+++
b/nlpcraft-stanford/src/main/java/org/apache/nlpcraft/nlp/token/parser/stanford/impl/NCStanfordNlpImpl.scala
@@ -57,7 +57,7 @@ class NCStanfordNlpImpl(stanford: StanfordCoreNLP) extends
NCTokenParser:
value.asScala
}).
- zipWithIndex.map { case (t, idx) =>
+ zipWithIndex.map { (t, idx) =>
new NCPropertyMapAdapter with NCToken :
override def getText: String = t.originalText()
override def getLemma: String = t.lemma()
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
index ed37cb6..9e0fead 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/util/NCUtils.scala
@@ -350,7 +350,7 @@ object NCUtils extends LazyLogging:
@tailrec
def trimQuotes(s: String): String =
val z = s.strip
- if (z.startsWith("'") && z.endsWith("'")) || (z.startsWith("\"") &&
z.endsWith("\"")) then
+ if z.startsWith("'") && z.endsWith("'") || z.startsWith("\"") &&
z.endsWith("\"") then
trimQuotes(z.substring(1, z.length - 1))
else
z
@@ -385,7 +385,7 @@ object NCUtils extends LazyLogging:
if s.nonEmpty then
if s.head == '\'' && s.last == '\'' then
escapesQuotes(s.substring(1, s.length - 1).replace("\'", "'"))
- else if (s.head == '"' && s.last == '"')
+ else if s.head == '"' && s.last == '"' then
escapesQuotes(s.substring(1, s.length - 1).replace("\\\"",
"\""))
else
s
@@ -626,7 +626,7 @@ object NCUtils extends LazyLogging:
@tailrec
def containsDups[T](list: List[T], seen: Set[T] = Set.empty[T]): Boolean =
list match
- case x :: xs => if (seen.contains(x)) true else containsDups(xs,
seen + x)
+ case x :: xs => if seen.contains(x) then true else
containsDups(xs, seen + x)
case _ => false
/**
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticEntityParserImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticEntityParserImpl.scala
index 0bc59ea..a55979d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticEntityParserImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticEntityParserImpl.scala
@@ -32,7 +32,7 @@ import scala.collection.mutable
import scala.jdk.CollectionConverters.*
/**
- *
+ *
*/
object NCSemanticEntityParserImpl:
def apply(macros: Jmap[String, String], elems: JList[NCSemanticElement]):
NCSemanticEntityParserImpl =
@@ -166,8 +166,8 @@ class NCSemanticEntityParserImpl(
for (s <- syns if !found)
found =
s.chunks.zip(variant).
- sortBy { case (chunk, _) => if
chunk.isText then 0 else 1 }.
- forall { case (chunk, tok) =>
+ sortBy { (chunk, _) => if chunk.isText
then 0 else 1 }.
+ forall { (chunk, tok) =>
def match0(txt: String) =
chunk.regex.matcher(txt).matches()
if chunk.isText then chunk.stem ==
tok.getStem
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticSynonymsProcessor.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticSynonymsProcessor.scala
index 0a30495..ea9c15d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticSynonymsProcessor.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/semantic/impl/NCSemanticSynonymsProcessor.scala
@@ -210,6 +210,6 @@ private[impl] object NCSemanticSynonymsProcessor extends
LazyLogging:
val txtSyns = txtBuf.groupBy(_.synonym.stem).map { (stem, hs) => stem
-> hs.map(_.elementId).toSet }
val mixedSyns = buf.groupBy(_.synonym.size).
- map { case (size, hs) => size -> hs.groupBy(_.elementId).map {
(id, hs) => id -> hs.map(_.synonym).toSeq } }
+ map { (size, hs) => size -> hs.groupBy(_.elementId).map { (id, hs)
=> id -> hs.map(_.synonym).toSeq } }
NCSemanticSynonymsHolder(txtSyns, mixedSyns)
\ No newline at end of file
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCQuotesImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCQuotesImpl.scala
index 44d5615..0e4f4a8 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCQuotesImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCQuotesImpl.scala
@@ -50,7 +50,7 @@ class NCQuotesImpl extends NCTokenEnricher with LazyLogging:
Option.when(idx % 2 != 0)(m(t) -> m(quotes(idx - 1)))
}
toksSeq.zipWithIndex.foreach { (tok, idx) =>
- tok.put("quoted", pairs.exists { case (from, to) => from > idx
&& to < idx })
+ tok.put("quoted", pairs.exists { (from, to) => from > idx &&
to < idx })
}
else
logger.warn(s"Invalid quotes: ${req.getText}")
\ No newline at end of file
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImpl.scala
index 737a086..56cc357 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/nlp/token/enricher/en/impl/NCStopWordsImpl.scala
@@ -121,7 +121,7 @@ object NCStopWordsImpl:
private val exclPoses = filterPoses(excludes)
private def filterPoses(m: Map[String, Set[Wildcard]]): Set[String] =
- m.filter { case(_, pair) => pair.exists { (begin, end) =>
begin.isEmpty && end.isEmpty } }.keySet
+ m.filter { (_, pair) => pair.exists { (begin, end) =>
begin.isEmpty && end.isEmpty } }.keySet
private def matches(s: String, set: Set[Wildcard]): Boolean =
set.exists { (b, e) => (b.isEmpty || s.startsWith(b)) &&
(e.isEmpty || s.endsWith(e)) }
@@ -316,7 +316,7 @@ class NCStopWordsImpl(addStemsSet: util.Set[String],
exclStemsSet: util.Set[Stri
any += cond
else
def add(m: mutable.HashMap[String, mutable.HashSet[T]],
incl: Boolean): Unit =
- poses.filter { case (_, isIncl) => isIncl == incl
}.keys.foreach(pos =>
+ poses.filter { (_, isIncl) => isIncl == incl
}.keys.foreach(pos =>
m.get(pos) match
case Some(set) => set.add(cond)
case _ =>
@@ -403,7 +403,7 @@ class NCStopWordsImpl(addStemsSet: util.Set[String],
exclStemsSet: util.Set[Stri
val e = s.drop(idxWild + 1)
if b.isEmpty && e.isEmpty && !hasPoses then throwError("Too
general wildcard definition.")
- mScan((isExc, if (isCase) ORIG else LEM)).addCondition((b, e),
poses)
+ mScan((isExc, if isCase then ORIG else LEM)).addCondition((b,
e), poses)
// 3. Converts data to service format.
def toImmutable[T](m: mutable.HashMap[String, mutable.HashSet[T]]):
Map[String, Set[T]] = m.map(p => p._1 -> p._2.toSet).toMap
@@ -626,7 +626,7 @@ class NCStopWordsImpl(addStemsSet: util.Set[String],
exclStemsSet: util.Set[Stri
var ok = true
def check(expected: String): Unit = if stack.empty() || stack.pop() !=
expected then ok = false
- def mark(t: NCToken): Unit = if (!stack.isEmpty) set += t
+ def mark(t: NCToken): Unit = if !stack.isEmpty then set += t
for (t <- toks if ok)
t.getText match
diff --git
a/nlpcraft/src/test/java/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
b/nlpcraft/src/test/java/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
index 7ddeff7..13d531a 100644
---
a/nlpcraft/src/test/java/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
+++
b/nlpcraft/src/test/java/org/apache/nlpcraft/nlp/entity/parser/semantic/NCSemanticEntityParserSpec.scala
@@ -38,7 +38,7 @@ case class Element(
) extends NCSemanticElement {
override def getId: String = id
override def getGroups: JList[String] = groups.asJava
- override def getValues: JMap[String, JList[String]] = values.map { case
(k, v) => k -> v.asJava}.asJava
+ override def getValues: JMap[String, JList[String]] = values.map { (k, v)
=> k -> v.asJava}.asJava
override def getSynonyms: JList[String] = synonyms.asJava
}
/**
