You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/04/26 04:19:00 UTC
[incubator-nlpcraft] branch NLPCRAFT-39 updated: CR.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-39
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-39 by this push:
new 910105a CR.
910105a is described below
commit 910105a19863fbc80e1cb69d7ead173c3a684588
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Sat Apr 25 21:18:55 2020 -0700
CR.
---
.../model/intent/impl/NCIntentSolverEngine.scala | 2 +-
.../mgrs/model/NCModelSynonymDslCompiler.scala | 30 ++++++++++------------
.../org/apache/nlpcraft/server/json/NCJson.scala | 2 +-
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala b/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
index 2086873..5820fb7 100644
--- a/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
+++ b/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
@@ -434,7 +434,7 @@ object NCIntentSolverEngine extends LazyLogging with NCOpenCensusTrace {
NCTokenLogger.prepareTable(senToks.filter(tok ⇒ !tok.used && tok.token.isUserDefined).map(_.token)).
info(
logger,
- Some(s"Unused user tokens for intent '$intentId' ${varStr}:")
+ Some(s"Unused user tokens for intent '$intentId' $varStr:")
)
None
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
index c2d6b0f..6ee4c20 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
@@ -36,25 +36,23 @@ import scala.collection.mutable.ArrayBuffer
object NCModelSynonymDslCompiler extends LazyLogging {
private type Predicate = java.util.function.Function[NCToken, java.lang.Boolean]
- def toJavaFunc(alias: String, func: NCToken ⇒ Boolean): Predicate = new Predicate() {
- override def apply(tok: NCToken): java.lang.Boolean = {
- val res = func(tok)
+ def toJavaFunc(alias: String, func: NCToken ⇒ Boolean): Predicate = (tok: NCToken) => {
+ val res = func(tok)
+
+ // Store predicate's alias, if any, in token metadata if this token satisfies this predicate.
+ // NOTE: token can have multiple aliases associated with it.
+ if (res && alias != null) {
+ val meta = tok.getMetadata
- // Store predicate's alias, if any, in token metadata if this token satisfies this predicate.
- // NOTE: token can have multiple aliases associated with it.
- if (res && alias != null) {
- val meta = tok.getMetadata
-
- if (!meta.containsKey(TOK_META_ALIASES_KEY))
- meta.put(TOK_META_ALIASES_KEY, new java.util.HashSet[String]())
-
- val aliases = meta.get(TOK_META_ALIASES_KEY).asInstanceOf[java.util.Set[String]]
-
- aliases.add(alias)
- }
+ if (!meta.containsKey(TOK_META_ALIASES_KEY))
+ meta.put(TOK_META_ALIASES_KEY, new java.util.HashSet[String]())
- res
+ val aliases = meta.get(TOK_META_ALIASES_KEY).asInstanceOf[java.util.Set[String]]
+
+ aliases.add(alias)
}
+
+ res
}
/**
diff --git a/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala b/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala
index 919b982..99c5fe6 100644
--- a/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/json/NCJson.scala
@@ -269,7 +269,7 @@ object NCJson {
*
* @param json JSON text.
*/
- private def removeComments(json: String): String = json.replaceAll("""\/\*(\*(?!\/)|[^*])*\*\/""", "")
+ private def removeComments(json: String): String = json.replaceAll("""/\*(\*(?!/)|[^*])*\*/""", "")
/**
* Extracts type `T` from given JSON `file`.