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 2015/09/11 18:05:00 UTC
svn commit: r1702508 - in /uima/ruta/trunk/ruta-core/src:
main/java/org/apache/uima/ruta/action/TrimAction.java
test/java/org/apache/uima/ruta/action/TrimTest.java
Author: pkluegl
Date: Fri Sep 11 16:04:58 2015
New Revision: 1702508
URL: http://svn.apache.org/r1702508
Log:
UIMA-4601
- added test and fixed impl, but that not the problem
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java?rev=1702508&r1=1702507&r2=1702508&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java Fri Sep 11 16:04:58 2015
@@ -33,6 +33,7 @@ import org.apache.uima.ruta.rule.RuleEle
import org.apache.uima.ruta.rule.RuleMatch;
import org.apache.uima.ruta.type.RutaBasic;
import org.apache.uima.ruta.visitor.InferenceCrowd;
+import org.junit.Ignore;
public class TrimAction extends AbstractRutaAction {
@@ -47,6 +48,7 @@ public class TrimAction extends Abstract
}
@Override
+ @Ignore
public void execute(RuleMatch match, RuleElement element, RutaStream stream, InferenceCrowd crowd) {
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOf(element);
List<Type> typesToTrim = getTypes(element.getParent(), stream);
@@ -88,12 +90,12 @@ public class TrimAction extends Abstract
if (oldBegin != newBegin || newEnd != oldEnd) {
stream.removeAnnotation(annotation);
if (annotation instanceof Annotation) {
- Annotation a = (Annotation) annotation;
- a.setBegin(newBegin);
- a.setEnd(newEnd);
- }
- if (newBegin < newEnd) {
- stream.addAnnotation(annotation, true, match);
+ if (newBegin < newEnd) {
+ Annotation a = (Annotation) annotation;
+ a.setBegin(newBegin);
+ a.setEnd(newEnd);
+ stream.addAnnotation(annotation, true, match);
+ }
}
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java?rev=1702508&r1=1702507&r2=1702508&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java Fri Sep 11 16:04:58 2015
@@ -20,6 +20,7 @@
package org.apache.uima.ruta.action;
import org.apache.uima.cas.CAS;
+import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -36,4 +37,26 @@ public class TrimTest {
cas.release();
}
+
+ @Test
+ public void testOverlappingBoundary() {
+
+ String document = "text (in paren) text.";
+ String script = "";
+ script += "(SPECIAL # SPECIAL){-> T1};";
+ script += "(SPECIAL.ct==\"(\" SW){->T2};";
+ script += "(SW SPECIAL.ct==\")\"){->T2};";
+ script += "T2{->TRIM(T1)};";
+ CAS cas = null;
+ try {
+ cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
+
+ }
+
}