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 ebf4ab1 WIP
ebf4ab1 is described below
commit ebf4ab199b8617d35186005f59323b26b4902e74
Author: Aaron Radzinski <[email protected]>
AuthorDate: Mon Dec 27 22:44:17 2021 -0800
WIP
---
nlpcraft/src/main/scala/org/apache/nlpcraft/NCTokenParser.java | 3 ++-
.../internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParser.java | 4 ++--
.../internal/nlp/token/parser/opennlp/impl/NCEnOpenNlpImpl.scala | 7 +------
.../token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java | 2 +-
.../nlp/token/enricher/NCEnBracketsTokenEnricherSpec.scala | 2 +-
.../internal/nlp/token/enricher/NCEnQuotesTokenEnricherSpec.scala | 2 +-
.../nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala | 2 +-
7 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCTokenParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCTokenParser.java
index 867eecf..669df6e 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/NCTokenParser.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/NCTokenParser.java
@@ -26,9 +26,10 @@ public interface NCTokenParser extends NCLifecycle {
/**
*
* @param req
+ * @param cfg
* @return
* @throws
* @throws NCException
*/
- List<NCToken> parse(NCRequest req);
+ List<NCToken> parse(NCRequest req, NCModelConfig cfg);
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParser.java
index b74d171..a5ff4a6 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParser.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParser.java
@@ -119,7 +119,7 @@ public class NCEnOpenNlpTokenParser implements
NCTokenParser {
}
@Override
- public List<NCToken> parse(NCRequest req) {
- return impl.parse(req);
+ public List<NCToken> parse(NCRequest req, NCModelConfig cfg) {
+ return impl.parse(req, cfg);
}
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/impl/NCEnOpenNlpImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/impl/NCEnOpenNlpImpl.scala
index ad508a4..5f6483b 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/impl/NCEnOpenNlpImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/impl/NCEnOpenNlpImpl.scala
@@ -120,12 +120,7 @@ class NCEnOpenNlpImpl(
private def stem(set: JSet[String]): Set[String] =
if set == null then Set.empty else set.asScala.toSet.map(stemmer.stem)
- /**
- *
- * @param req
- * @return
- */
- override def parse(req: NCRequest): JList[NCToken] =
+ override def parse(req: NCRequest, cfg: NCModelConfig): JList[NCToken] =
// OpenNLP classes are not thread-safe.
this.synchronized {
val sen = req.getNormalizedText
diff --git
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
index 6777557..59e01ee 100644
---
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
+++
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/benchmark/token/parser/opennlp/NCEnOpenNlpTokenParserBenchmark.java
@@ -44,7 +44,7 @@ public class NCEnOpenNlpTokenParserBenchmark extends
NCBenchmarkAdapter {
@Benchmark
public void testParse(Blackhole bh, NCBenchmarkAdapterState state) {
- bh.consume(parser.parse(state.request));
+ bh.consume(parser.parse(state.request, null));
}
/**
diff --git
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnBracketsTokenEnricherSpec.scala
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnBracketsTokenEnricherSpec.scala
index 8fdbdaf..bcfbed5 100644
---
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnBracketsTokenEnricherSpec.scala
+++
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnBracketsTokenEnricherSpec.scala
@@ -48,7 +48,7 @@ class NCEnBracketsTokenEnricherSpec:
* @param brackets
*/
private def check(txt: String, brackets: Set[Integer]): Unit =
- val toks = parser.parse(NCTestRequest(txt))
+ val toks = parser.parse(NCTestRequest(txt), null)
enricher.enrich(NCTestRequest(txt), null, toks)
val seq = toks.asScala.toSeq
NCTestUtils.printTokens(seq, "brackets:en")
diff --git
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnQuotesTokenEnricherSpec.scala
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnQuotesTokenEnricherSpec.scala
index a7048ea..df65c29 100644
---
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnQuotesTokenEnricherSpec.scala
+++
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/enricher/NCEnQuotesTokenEnricherSpec.scala
@@ -48,7 +48,7 @@ class NCEnQuotesTokenEnricherSpec:
* @param quotes
*/
private def check(txt: String, quotes: Set[Integer]): Unit =
- val toks = parser.parse(NCTestRequest(txt))
+ val toks = parser.parse(NCTestRequest(txt), null)
val toksSeq = toks.asScala.toSeq
enricher.enrich(NCTestRequest(txt), null, toks)
NCTestUtils.printTokens(toksSeq, "quoted:en")
diff --git
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala
index 90ab8e6..bb52615 100644
---
a/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala
+++
b/nlpcraft/src/test/java/org/apache/nlpcraft/internal/nlp/token/parser/opennlp/NCEnOpenNlpTokenParserSpec.scala
@@ -43,7 +43,7 @@ class NCEnOpenNlpTokenParserSpec:
)
private def test(txt: String, validate: Seq[NCToken] => _): Unit =
- val toks = parser.parse(nlp.util.NCTestRequest(txt)).asScala.toSeq
+ val toks = parser.parse(nlp.util.NCTestRequest(txt),
null).asScala.toSeq
assert(toks.nonEmpty)
NCTestUtils.printTokens(toks)
validate(toks)
