You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2019/11/23 15:35:25 UTC
svn commit: r1870246 - in /uima/uv3/ruta-v3/trunk/ruta-core/src:
main/java/org/apache/uima/ruta/RutaStream.java
test/java/org/apache/uima/ruta/engine/NoSeedersTest.java
Author: pkluegl
Date: Sat Nov 23 15:35:25 2019
New Revision: 1870246
URL: http://svn.apache.org/viewvc?rev=1870246&view=rev
Log:
UIMA-6150: fixed tests, added missing emptyIsInvisible check
Modified:
uima/uv3/ruta-v3/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1870246&r1=1870245&r2=1870246&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java Sat Nov 23 15:35:25 2019
@@ -898,6 +898,9 @@ public class RutaStream {
Set<Type> currentHiddenTypes = filter.getCurrentHiddenTypes();
RutaBasic beginAnchor = getBeginAnchor(begin);
if (beginAnchor != null) {
+ if (beginAnchor.isEmpty() && emptyIsInvisible) {
+ return false;
+ }
for (Type type : currentHiddenTypes) {
boolean partOf = beginAnchor.isPartOf(type);
if (partOf) {
@@ -907,6 +910,9 @@ public class RutaStream {
}
RutaBasic endAnchor = getEndAnchor(end);
if (endAnchor != null) {
+ if (endAnchor.isEmpty() && emptyIsInvisible) {
+ return false;
+ }
for (Type type : currentHiddenTypes) {
boolean partOf = endAnchor.isPartOf(type);
if (partOf) {
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java?rev=1870246&r1=1870245&r2=1870246&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/NoSeedersTest.java Sat Nov 23 15:35:25 2019
@@ -30,7 +30,7 @@ public class NoSeedersTest {
public void test() throws Exception {
CAS cas = RutaTestUtils.getCAS("This is a test.");
JCas jcas = cas.getJCas();
-
+
String script = "";
script += "\"This\"-> T1;";
script += "\"is\"-> T2;";
@@ -41,13 +41,12 @@ public class NoSeedersTest {
script += "T1{-> T7};";
script += "T2 T3{-> T8};";
script += "T1 # T4{-> T9};";
-
- AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class,
- RutaEngine.PARAM_RULES, script,
- RutaEngine.PARAM_SEEDERS, new String[0]);
-
+
+ AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class, RutaEngine.PARAM_RULES,
+ script, RutaEngine.PARAM_SEEDERS, new String[0]);
+
ae.process(jcas);
-
+
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This");
RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "is", "is");
RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "a");
@@ -57,7 +56,7 @@ public class NoSeedersTest {
RutaTestUtils.assertAnnotationsEquals(cas, 7, 1, "This");
RutaTestUtils.assertAnnotationsEquals(cas, 8, 1, "a");
RutaTestUtils.assertAnnotationsEquals(cas, 9, 1, "test");
-
+
}
-
+
}