This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-468
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-468 by this push:
new 1bdae3a WIP.
1bdae3a is described below
commit 1bdae3af3b7ddfc9e7d88fd62eb16d3f45f90706
Author: Sergey Kamov <[email protected]>
AuthorDate: Tue Oct 12 21:19:29 2021 +0300
WIP.
---
.../src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java | 8 ++++----
.../org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java | 8 ++++----
.../model/components/detectors/NCDefaultStopWordsDetector.java | 4 ++--
.../model/components/detectors/NCDefaultSwearWordsDetector.java | 4 ++--
.../model/components/detectors/NCSimpleWordsDetector.java | 4 ++--
.../model/nlp/{NCNlpWordsDetector.java => NCNlpDetector.java} | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
index 2e66e17..d8d8856 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelConfig.java
@@ -23,7 +23,7 @@ import
org.apache.nlpcraft.model.components.ner.synonyms.NCSynonymsNerElement;
import org.apache.nlpcraft.model.components.tokenizer.NCOpenNlpTokenizer;
import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
import org.apache.nlpcraft.model.nlp.NCNlpTokenizer;
-import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
+import org.apache.nlpcraft.model.nlp.NCNlpDetector;
import java.time.Duration;
import java.util.Collections;
@@ -701,15 +701,15 @@ public interface NCModelConfig {
// TODO: dropped. getSuspiciousWords,
// TODO: dropped - getAdditionalStopWords, getExcludedStopWords - just
override if necessary getStopWordsDetector.
- default NCNlpWordsDetector getStopWordsDetector() {
+ default NCNlpDetector getStopWordsDetector() {
return new NCDefaultStopWordsDetector();
}
- default NCNlpWordsDetector getSwearWordsDetector() {
+ default NCNlpDetector getSwearWordsDetector() {
return new NCDefaultSwearWordsDetector();
}
- default NCNlpWordsDetector getSuspiciousWordsDetector() {
+ default NCNlpDetector getSuspiciousWordsDetector() {
return null;
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
index 82cfd26..e31ea51 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelConfigBuilder.java
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.model.builders;
import org.apache.nlpcraft.model.NCModelConfig;
-import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
+import org.apache.nlpcraft.model.nlp.NCNlpDetector;
import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
import org.apache.nlpcraft.model.nlp.NCNlpTokenizer;
@@ -78,13 +78,13 @@ public class NCModelConfigBuilder {
}
// 2. 3 custom words detector. Free implementation supported.
- public NCModelConfigBuilder withStopWordsDetector(NCNlpWordsDetector
detector) {
+ public NCModelConfigBuilder withStopWordsDetector(NCNlpDetector detector) {
return this;
}
- public NCModelConfigBuilder withSwearWordsDetector(NCNlpWordsDetector
detectorr) {
+ public NCModelConfigBuilder withSwearWordsDetector(NCNlpDetector
detectorr) {
return this;
}
- public NCModelConfigBuilder withSuspiciousWordsDetector(NCNlpWordsDetector
detector) {
+ public NCModelConfigBuilder withSuspiciousWordsDetector(NCNlpDetector
detector) {
return this;
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultStopWordsDetector.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultStopWordsDetector.java
index 6fe2ca3..b736117 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultStopWordsDetector.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultStopWordsDetector.java
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.model.components.detectors;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
-import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
+import org.apache.nlpcraft.model.nlp.NCNlpDetector;
import java.util.Collections;
import java.util.List;
@@ -26,7 +26,7 @@ import java.util.List;
/**
* Stopwords detector default implementation.
*/
-public class NCDefaultStopWordsDetector implements NCNlpWordsDetector {
+public class NCDefaultStopWordsDetector implements NCNlpDetector {
@Override
public List<NCNlpWord> detect(List<NCNlpWord> sen) {
return Collections.emptyList();
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultSwearWordsDetector.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultSwearWordsDetector.java
index 4603e20..69026a6 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultSwearWordsDetector.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCDefaultSwearWordsDetector.java
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.model.components.detectors;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
-import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
+import org.apache.nlpcraft.model.nlp.NCNlpDetector;
import java.util.Collections;
import java.util.List;
@@ -26,7 +26,7 @@ import java.util.List;
/**
* Swearwords detector default implementation.
*/
-public class NCDefaultSwearWordsDetector implements NCNlpWordsDetector {
+public class NCDefaultSwearWordsDetector implements NCNlpDetector {
@Override
public List<NCNlpWord> detect(List<NCNlpWord> sen) {
return Collections.emptyList();
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCSimpleWordsDetector.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCSimpleWordsDetector.java
index 61efcda..0c471af 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCSimpleWordsDetector.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/components/detectors/NCSimpleWordsDetector.java
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.model.components.detectors;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
-import org.apache.nlpcraft.model.nlp.NCNlpWordsDetector;
+import org.apache.nlpcraft.model.nlp.NCNlpDetector;
import java.util.Collections;
import java.util.List;
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
/**
*
*/
-public class NCSimpleWordsDetector implements NCNlpWordsDetector {
+public class NCSimpleWordsDetector implements NCNlpDetector {
private final Set<String> words;
public NCSimpleWordsDetector(Set<String> words) {
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpWordsDetector.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpDetector.java
similarity index 96%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpWordsDetector.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpDetector.java
index 794821c..0e2fa27 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpWordsDetector.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpDetector.java
@@ -21,7 +21,7 @@ import org.apache.nlpcraft.model.nlp.NCNlpWord;
import java.util.List;
-public interface NCNlpWordsDetector {
+public interface NCNlpDetector {
/**
* Finds words by some criteria in given words list.
*
