[incubator-nlpcraft] branch master updated: Fix for NLPCRAFT-370.

[aradzinski]

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 22a83b2  Fix for NLPCRAFT-370.
22a83b2 is described below

commit 22a83b2ba5ed4628110b43a1b9c7aa7799dcd9bf
Author: Aaron Radzinski <aradzin...@datalingvo.com>
AuthorDate: Tue Jul 20 21:25:34 2021 -0700

    Fix for NLPCRAFT-370.
---
 .../scala/org/apache/nlpcraft/model/NCVariant.java | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java
index 05fe606..5be2799 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCVariant.java
@@ -33,14 +33,14 @@ public interface NCVariant extends List<NCToken>, 
NCMetadata {
     /**
      * Utility method that returns all non-freeword tokens. It's equivalent to:
      * <pre class="brush: java">
-     *     return stream().filter(tok -&gt; 
!tok.isFreeWord()).collect(Collectors.toList());
+     *     return stream().filter(tok -&gt; !tok.isFreeWord() && 
!tok.isStopWord()).collect(Collectors.toList());
      * </pre>
      *
      * @return All non-freeword tokens.
      * @see NCToken#isFreeWord()
      */
     default List<NCToken> getMatchedTokens() {
-        return stream().filter(tok -> 
!tok.isFreeWord()).collect(Collectors.toList());
+        return stream().filter(tok -> !tok.isFreeWord() && 
!tok.isStopWord()).collect(Collectors.toList());
     }
 
     /**
@@ -57,13 +57,39 @@ public interface NCVariant extends List<NCToken>, 
NCMetadata {
     }
 
     /**
+     * Utility method that returns all abstract tokens. It's equivalent to:
+     * <pre class="brush: java">
+     *     return 
stream().filter(NCToken::isAbstract).collect(Collectors.toList());
+     * </pre>
+     *
+     * @return All abstract tokens.
+     * @see NCToken#isAbstract() ()
+     */
+    default List<NCToken> getAbstractTokens() {
+        return 
stream().filter(NCToken::isAbstract).collect(Collectors.toList());
+    }
+
+    /**
+     * Utility method that returns all stop word tokens. It's equivalent to:
+     * <pre class="brush: java">
+     *     return 
stream().filter(NCToken::isStopWord).collect(Collectors.toList());
+     * </pre>
+     *
+     * @return All stop word tokens.
+     * @see NCToken#isAbstract() ()
+     */
+    default List<NCToken> getStopWordTokens() {
+        return 
stream().filter(NCToken::isStopWord).collect(Collectors.toList());
+    }
+
+    /**
      * Utility method that returns all user-defined tokens. It's equivalent to:
      * <pre class="brush: java">
      *     return 
stream().filter(NCToken::isUserDefined).collect(Collectors.toList());
      * </pre>
      *
      * @return All user-defined tokens.
-     * @see NCToken#isFreeWord()
+     * @see NCToken#isUserDefined() ()
      */
     default List<NCToken> getUserDefinedTokens() {
         return 
stream().filter(NCToken::isUserDefined).collect(Collectors.toList());