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/09/18 07:27:13 UTC

[incubator-nlpcraft] branch master updated: Fixing 'factor' parameter name.

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

aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/master by this push:
     new 065eba5  Fixing 'factor' parameter name.
065eba5 is described below

commit 065eba5477b9703520ab16874d02e8786f45f8e4
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Fri Sep 18 00:27:01 2020 -0700

    Fixing 'factor' parameter name.
---
 .../nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala       | 10 +++++-----
 .../org/apache/nlpcraft/server/rest/NCRestModelSpec.scala      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

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 a22cd93..13d6c58 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
@@ -106,7 +106,7 @@ object NCSuggestSynonymManager extends NCService {
             s"Unsupported symbols: $word"
         )
     }
-    case class SuggestionResult(synonym: String, factor: Double)
+    case class SuggestionResult(synonym: String, score: Double)
 
     private def split(s: String): Seq[String] = s.split(" ").toSeq.map(_.trim).filter(_.nonEmpty)
     private def toStem(s: String): String = split(s).map(NCNlpPorterStemmer.stem).mkString(" ")
@@ -408,7 +408,7 @@ object NCSuggestSynonymManager extends NCService {
 
                                 val resJ: util.Map[String, util.List[util.HashMap[String, Any]]] =
                                     res.map { case (id, data) ⇒
-                                        val factors = data.map(_.factor)
+                                        val factors = data.map(_.score)
 
                                         val min = factors.min
                                         val max = factors.max
@@ -419,14 +419,14 @@ object NCSuggestSynonymManager extends NCService {
 
                                         def normalize(v: Double): Double = (v - min) / delta
 
-                                        val norm = data.map(s ⇒ SuggestionResult(s.synonym, normalize(s.factor))).
-                                            filter(_.factor >= minScore)
+                                        val norm = data.map(s ⇒ SuggestionResult(s.synonym, normalize(s.score))).
+                                            filter(_.score >= minScore)
 
                                         id → norm.map(d ⇒ {
                                             val m = new util.HashMap[String, Any]()
 
                                             m.put("synonym", d.synonym.toLowerCase)
-                                            m.put("factor", d.factor)
+                                            m.put("score", d.score)
 
                                             m
                                         }).asJava
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala
index 444d38a..bafe71d 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Assertions._
 import org.junit.jupiter.api.{Disabled, Test}
 
 // Enable it and run if context word server started.
-@Disabled
+//@Disabled
 @NCTestEnvironment(model = classOf[AlarmModel], startClient = false)
 class NCRestModelSpec extends NCRestSpec {
     @Test