This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-287 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit ac555ef138c430e897d4fda09a03e31fcf2f70df Author: Sergey Kamov <[email protected]> AuthorDate: Mon Apr 5 21:24:05 2021 +0300 WIP. --- .../scala/org/apache/nlpcraft/common/util/NCUtils.scala | 13 ++++++------- .../org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala | 7 +------ .../probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala | 3 +-- .../nlp/enrichers/model/NCEnricherNestedModelSpec2.scala | 4 ++-- 4 files changed, 10 insertions(+), 17 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 23ca22b..141e813 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 @@ -1424,13 +1424,12 @@ object NCUtils extends LazyLogging { * @param e */ def prettyError(logger: Logger, title: String, e: Throwable): Unit = { - e.printStackTrace() -// // Keep the full trace in the 'trace' log level. -// logger.trace(title, e) -// -// prettyErrorImpl(new PrettyErrorLogger { -// override def log(s: String): Unit = logger.error(s) -// }, title, e) + // Keep the full trace in the 'trace' log level. + logger.trace(title, e) + + prettyErrorImpl(new PrettyErrorLogger { + override def log(s: String): Unit = logger.error(s) + }, title, e) } /** 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 6960fec..fffd476 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 @@ -113,11 +113,7 @@ class NCProbeSynonym( case None ⇒ state = -1 } - - if (state != -1 - && -// buf.contains(toks.head) && -// buf.contains(toks.last) && + if (state != -1 && { val remained = toks.filter(t ⇒ !buf.contains(t)) @@ -127,7 +123,6 @@ class NCProbeSynonym( Some(buf) else None - } /** 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 102d48c..fec01e5 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 @@ -19,9 +19,8 @@ package org.apache.nlpcraft.probe.mgrs.nlp.enrichers.model import io.opencensus.trace.Span import org.apache.nlpcraft.common._ -import org.apache.nlpcraft.common.nlp.{NCNlpSentenceToken => NlpToken, _} +import org.apache.nlpcraft.common.nlp.{NCNlpSentenceToken ⇒ NlpToken, _} import org.apache.nlpcraft.model._ -import org.apache.nlpcraft.model.impl.NCTokenLogger import org.apache.nlpcraft.probe.mgrs.NCProbeSynonym.NCDslContent import org.apache.nlpcraft.probe.mgrs.NCProbeSynonymChunkKind.{NCSynonymChunkKind, TEXT} import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala index 82b6686..ede9153 100644 --- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala +++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala @@ -47,9 +47,9 @@ class NCNestedTestModel21 extends NCModelAdapter("nlpcraft.nested2.test.mdl", "N class NCEnricherNestedModelSpec21 extends NCTestContext { @Test def test(): Unit = { - //checkIntent("word", "onE1") + checkIntent("word", "onE1") checkIntent("10 word", "onE1") - //checkIntent("11 12 word", "onNumAndE1") + checkIntent("11 12 word", "onNumAndE1") } }
