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 2016/01/04 13:02:01 UTC

svn commit: r1722852 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/seed/DefaultSeeder.java test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java

Author: pkluegl
Date: Mon Jan  4 12:02:01 2016
New Revision: 1722852

URL: http://svn.apache.org/viewvc?rev=1722852&view=rev
Log:
UIMA-4723
- do not use subiterator

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java
    uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java?rev=1722852&r1=1722851&r2=1722852&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/DefaultSeeder.java Mon Jan  4 12:02:01 2016
@@ -23,6 +23,7 @@ import java.io.BufferedReader;
 import java.io.StringReader;
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,6 +32,7 @@ import org.apache.uima.cas.CASException;
 import org.apache.uima.cas.FSIterator;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.fit.util.CasUtil;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.ruta.type.MARKUP;
 import org.apache.uima.ruta.type.TokenSeed;
@@ -82,12 +84,8 @@ public class DefaultSeeder implements Ru
       int end = matcher.end();
       MARKUP markup = new MARKUP(jCas, begin, end);
       markup.addToIndexes();
-      FSIterator<AnnotationFS> subiterator = cas.getAnnotationIndex(result).subiterator(markup);
-      while (subiterator.isValid()) {
-        AnnotationFS fs = subiterator.get();
-        toRemove.add(fs);
-        subiterator.moveToNext();
-      }
+      List<AnnotationFS> selectCovered = CasUtil.selectCovered(result, markup);
+      toRemove.addAll(selectCovered);
     }
     for (AnnotationFS each : toRemove) {
       cas.removeFsFromIndexes(each);

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java?rev=1722852&r1=1722851&r2=1722852&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java Mon Jan  4 12:02:01 2016
@@ -23,6 +23,8 @@ import static org.junit.Assert.assertEqu
 
 import java.net.URL;
 
+import junit.framework.Assert;
+
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.cas.CAS;
@@ -38,6 +40,9 @@ import org.apache.uima.util.XMLInputSour
 import org.junit.Test;
 
 public class DefaultSeederTest {
+
+  
+
   @Test
   public void test() throws Exception {
     URL url = RutaEngine.class.getClassLoader().getResource("BasicEngine.xml");
@@ -111,7 +116,7 @@ public class DefaultSeederTest {
             + "<sec sec-type=\"methods\">" + "<sec sectype=\"methods\">"
             + "<sec sec-type=\"methods\">" + "<sec sectype=\"methods\">"
             + "<sec sectype='methods'>" + "<tag-with-dash value=\"1\">"
-						+ "<-not-a-real-tag value=\"1\">" + "<a_real_tag value=\"1\">";
+            + "<-not-a-real-tag value=\"1\">" + "<a_real_tag value=\"1\">";
     String script = "RETAINTYPE(MARKUP);MARKUP{-> T1};";
     CAS cas = null;
     try {
@@ -128,5 +133,38 @@ public class DefaultSeederTest {
 
     cas.release();
   }
+  
+  @Test
+  public void testStackedMarkup() throws Exception {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < 1000; i++) {
+      sb.append("<b>");
+    }
+    sb.append("content");
+    for (int i = 0; i < 1000; i++) {
+      sb.append("</b>");
+    }
+
+    // long start = System.currentTimeMillis();
+
+    String document = sb.toString();
+    String script = "RETAINTYPE(MARKUP);MARKUP{-> T1};";
+    CAS cas = null;
+    try {
+      cas = RutaTestUtils.getCAS(document);
+      Ruta.apply(cas, script);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    // long end = System.currentTimeMillis();
+
+    // System.out.println("took: " + (end-start)/1000 + "s");
+    Type t1 = RutaTestUtils.getTestType(cas, 1);
+    AnnotationIndex<AnnotationFS> ai = cas.getAnnotationIndex(t1);
+    Assert.assertEquals(2000, ai.size());
+
+    cas.release();
+
+  }
 
 }