You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/05/01 12:22:29 UTC
[incubator-nlpcraft] branch NLPCRAFT-30 updated (6ba61ab -> 79985c5)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-30
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 6ba61ab WIP.
new b244b57 WIP.
new 79985c5 WIP.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +-
src/main/scala/org/apache/nlpcraft/probe/mgrs/NCSynonym.scala | 8 ++------
.../nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 1 -
.../probe/mgrs/nlp/enrichers/limit/NCLimitEnricher.scala | 2 +-
.../probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala | 3 +--
.../mgrs/nlp/enrichers/relation/NCRelationEnricher.scala | 2 +-
.../probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 2 +-
.../nlp/{enrichers/utils => impl}/NCEnricherProcessor.scala | 11 +++++------
.../scala/org/apache/nlpcraft/server/geo/NCGeoManager.scala | 2 ++
9 files changed, 14 insertions(+), 19 deletions(-)
rename src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/{enrichers/utils => impl}/NCEnricherProcessor.scala (99%)
[incubator-nlpcraft] 01/02: WIP.
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-30
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit b244b57552817d54183e89ba15d5272d598775b0
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Fri May 1 12:46:36 2020 +0300
WIP.
---
src/main/scala/org/apache/nlpcraft/probe/mgrs/NCSynonym.scala | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCSynonym.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCSynonym.scala
index 12cef01..0ccb701 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCSynonym.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCSynonym.scala
@@ -85,9 +85,7 @@ class NCSynonym(
}
// Should be called only for valid tokens count (validation optimized for performance reasons)
- require(!ok || toks.length == length)
-
- ok
+ ok && toks.length == length
}
/**
@@ -121,9 +119,7 @@ class NCSynonym(
}
}
// Should be called only for valid tokens count (validation optimized for performance reasons)
- require(!ok || tows.length == length)
-
- ok
+ ok && tows.length == length
}
override def toString(): String = mkString(" ")
[incubator-nlpcraft] 02/02: WIP.
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-30
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 79985c52496e1ffc20f988761a896835b85ee25b
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Fri May 1 15:21:52 2020 +0300
WIP.
---
src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +-
.../nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 1 -
.../probe/mgrs/nlp/enrichers/limit/NCLimitEnricher.scala | 2 +-
.../probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala | 3 +--
.../mgrs/nlp/enrichers/relation/NCRelationEnricher.scala | 2 +-
.../probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 2 +-
.../nlp/{enrichers/utils => impl}/NCEnricherProcessor.scala | 11 +++++------
.../scala/org/apache/nlpcraft/server/geo/NCGeoManager.scala | 2 ++
8 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala b/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
index 77ee49a..9bfb88e 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -41,11 +41,11 @@ import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnrichmentManager
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.dictionary.NCDictionaryEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.limit.NCLimitEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.model.NCModelEnricher
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.utils.NCEnricherProcessor
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.relation.NCRelationEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.sort.NCSortEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.stopword.NCStopWordEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.suspicious.NCSuspiciousNounsEnricher
+import org.apache.nlpcraft.probe.mgrs.nlp.impl.NCEnricherProcessor
import org.apache.nlpcraft.probe.mgrs.nlp.validate.NCValidateManager
import scala.collection.JavaConverters._
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
index 53a54ac..a2d192e 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
@@ -46,7 +46,6 @@ import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.relation.NCRelationEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.sort.NCSortEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.stopword.NCStopWordEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.suspicious.NCSuspiciousNounsEnricher
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.utils._
import org.apache.nlpcraft.probe.mgrs.nlp.impl._
import org.apache.nlpcraft.probe.mgrs.nlp.validate._
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/limit/NCLimitEnricher.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/limit/NCLimitEnricher.scala
index bf798df..70ff977 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/limit/NCLimitEnricher.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/limit/NCLimitEnricher.scala
@@ -27,7 +27,7 @@ import org.apache.nlpcraft.common.nlp.{NCNlpSentence, NCNlpSentenceNote, NCNlpSe
import org.apache.nlpcraft.common.{NCE, NCService}
import org.apache.nlpcraft.probe.mgrs.NCModelDecorator
import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.utils.NCEnricherProcessor
+import org.apache.nlpcraft.probe.mgrs.nlp.impl.NCEnricherProcessor
import scala.collection.JavaConverters._
import scala.collection.{Map, Seq, mutable}
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
index b396439..72ffc78 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
@@ -25,8 +25,7 @@ import org.apache.nlpcraft.common._
import org.apache.nlpcraft.common.nlp.{NCNlpSentenceToken, _}
import org.apache.nlpcraft.model._
import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.utils.NCEnricherProcessor
-import org.apache.nlpcraft.probe.mgrs.nlp.impl.NCRequestImpl
+import org.apache.nlpcraft.probe.mgrs.nlp.impl.{NCEnricherProcessor, NCRequestImpl}
import org.apache.nlpcraft.probe.mgrs.{NCModelDecorator, NCSynonym}
import scala.collection.JavaConverters._
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala
index 4404647..eba50eb 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/relation/NCRelationEnricher.scala
@@ -26,7 +26,7 @@ import org.apache.nlpcraft.common.nlp.{NCNlpSentence, NCNlpSentenceNote, NCNlpSe
import org.apache.nlpcraft.common.{NCE, NCService}
import org.apache.nlpcraft.probe.mgrs.NCModelDecorator
import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.utils.NCEnricherProcessor
+import org.apache.nlpcraft.probe.mgrs.nlp.impl.NCEnricherProcessor
import scala.collection.JavaConverters._
import scala.collection.{Map, Seq, mutable}
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
index e46d821..9b21322 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
@@ -26,7 +26,7 @@ import org.apache.nlpcraft.common.nlp.core.NCNlpCoreManager
import org.apache.nlpcraft.common.nlp.{NCNlpSentence, NCNlpSentenceNote, NCNlpSentenceToken}
import org.apache.nlpcraft.probe.mgrs.NCModelDecorator
import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
-import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.utils.NCEnricherProcessor
+import org.apache.nlpcraft.probe.mgrs.nlp.impl.NCEnricherProcessor
import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/utils/NCEnricherProcessor.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/impl/NCEnricherProcessor.scala
similarity index 99%
rename from src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/utils/NCEnricherProcessor.scala
rename to src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/impl/NCEnricherProcessor.scala
index 28eba8b..da9054d 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/utils/NCEnricherProcessor.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/impl/NCEnricherProcessor.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.probe.mgrs.nlp.enrichers.utils
+package org.apache.nlpcraft.probe.mgrs.nlp.impl
import java.io.Serializable
import java.util
@@ -23,16 +23,15 @@ import java.util.Collections
import com.typesafe.scalalogging.LazyLogging
import io.opencensus.trace.Span
-import org.apache.nlpcraft.common.nlp.pos._
-import org.apache.nlpcraft.common.nlp.{NCNlpSentence, NCNlpSentenceNote, _}
-import org.apache.nlpcraft.common.{NCService, _}
+import org.apache.nlpcraft.common.nlp.pos.NCPennTreebank
+import org.apache.nlpcraft.common.nlp.{NCNlpSentence, NCNlpSentenceNote, NCNlpSentenceToken}
+import org.apache.nlpcraft.common.{NCE, NCService, TOK_META_ALIASES_KEY}
import org.apache.nlpcraft.model.NCToken
import org.apache.nlpcraft.model.impl.NCTokenImpl
import org.apache.nlpcraft.probe.mgrs.NCModelDecorator
-
import scala.collection.JavaConverters._
-import scala.collection._
+import scala.collection.{Map, Seq, Set, mutable}
/**
*
diff --git a/src/main/scala/org/apache/nlpcraft/server/geo/NCGeoManager.scala b/src/main/scala/org/apache/nlpcraft/server/geo/NCGeoManager.scala
index 1116ec2..c4c3fa4 100644
--- a/src/main/scala/org/apache/nlpcraft/server/geo/NCGeoManager.scala
+++ b/src/main/scala/org/apache/nlpcraft/server/geo/NCGeoManager.scala
@@ -338,6 +338,8 @@ object NCGeoManager extends NCService {
// City (short representation).
case NCGeoSynonym(Some(city), Some(reg), Some(cntr), None, None, None, syns) ⇒
add(syns, citiesMap(CityKey(city, reg, cntr)))
+
+ case _ ⇒ throw new AssertionError(s"Unexpected synonym: $s")
}
for (file ← readJss(SYNONYMS_DIR_PATH); synonym ← extract(file, ignoreCase = true))