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 2013/06/01 15:58:23 UTC
svn commit: r1488529 - in /uima/sandbox/ruta/trunk:
ruta-core/src/main/java/org/apache/uima/ruta/
ruta-core/src/main/java/org/apache/uima/ruta/rule/
ruta-core/src/test/java/org/apache/uima/ruta/ ruta-docbook/src/docbook/
Author: pkluegl
Date: Sat Jun 1 13:58:22 2013
New Revision: 1488529
URL: http://svn.apache.org/r1488529
Log:
UIMA-2946
- auto trim wildcard match
- adapted tests
- adapted documentation
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest2.java
uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1488529&r1=1488528&r2=1488529&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java Sat Jun 1 13:58:22 2013
@@ -536,7 +536,7 @@ public class RutaStream extends FSIterat
RutaBasic nextBasic = (RutaBasic) get();
// TODO HOTFIX for annotation of length 0
while (isValid() && nextBasic.getEnd() > annotation.getBegin()) {
- moveToNext();
+ moveToPrevious();
if (isValid()) {
nextBasic = (RutaBasic) get();
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java?rev=1488529&r1=1488528&r2=1488529&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java Sat Jun 1 13:58:22 2013
@@ -235,7 +235,6 @@ public class WildCardRuleElement extends
RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
AnnotationFS coveredByWildCard = getCoveredByWildCard(after, annotation, nextOne, stream);
-
doMatch(coveredByWildCard, extendedMatch, extendedContainerMatch, annotation == null, stream,
crowd);
if (extendedMatch.matched()) {
@@ -429,6 +428,17 @@ public class WildCardRuleElement extends
end = later.getBegin();
}
+ RutaBasic beginAnchor = stream.getBeginAnchor(begin);
+ RutaBasic endAnchor = stream.getEndAnchor(end);
+ if(beginAnchor != null && !stream.isVisible(beginAnchor)) {
+ beginAnchor = stream.getBasicNextTo(false, beginAnchor);
+ begin = beginAnchor.getBegin();
+ }
+ if(endAnchor != null && !stream.isVisible(endAnchor)) {
+ endAnchor = stream.getBasicNextTo(true, endAnchor);
+ end = endAnchor.getEnd();
+ }
+
AnnotationFS afs = cas.createAnnotation(type, begin, end);
return afs;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java?rev=1488529&r1=1488528&r2=1488529&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java Sat Jun 1 13:58:22 2013
@@ -42,7 +42,8 @@ import org.junit.runners.Suite.SuiteClas
CurrentCountTest.class, PartOfTest.class, PositionTest.class, DefaultSeederTest.class,
ConditionVerbalizerTest.class, ActionVerbalizerTest.class, ExpressionVerbalizerTest.class,
HtmlAnnotatorTest.class, HtmlConverterTest.class, EmptyDocumentTest.class,
- RutaModifierTest.class, RegExpRuleTest.class, WildCardTest.class, EqualShortNameTest.class })
+ RutaModifierTest.class, RegExpRuleTest.class, WildCardTest.class, WildCardTest2.class,
+ WildCardTest3.class, EqualShortNameTest.class })
public class AllTests {
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest2.java?rev=1488529&r1=1488528&r2=1488529&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest2.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest2.java Sat Jun 1 13:58:22 2013
@@ -58,8 +58,8 @@ public class WildCardTest2 {
ai = cas.getAnnotationIndex(t);
assertEquals(2, ai.size());
iterator = ai.iterator();
- assertEquals(" ClearTK: A UIMA Toolkit for Statistical Natural Language Processing.", iterator.next().getCoveredText());
- assertEquals(" Learning Information Extraction Rules for Semi-Structured and Free Text.", iterator.next().getCoveredText());
+ assertEquals("ClearTK: A UIMA Toolkit for Statistical Natural Language Processing.", iterator.next().getCoveredText());
+ assertEquals("Learning Information Extraction Rules for Semi-Structured and Free Text.", iterator.next().getCoveredText());
t = RutaTestUtils.getTestType(cas, 3);
ai = cas.getAnnotationIndex(t);
Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml?rev=1488529&r1=1488528&r2=1488529&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml Sat Jun 1 13:58:22 2013
@@ -255,7 +255,7 @@ PERIOD #{-> MARK(Sentence)} PERIOD;]]></
<para>
This rule annotates everything between two <quote>PERIOD</quote> annotations with the type <quote>Sentence</quote>. Please note that the resulting
- annotations are probably invisible, if they start or end with an filtered type.
+ annotations is automatically trimmed using the current filtering settings.
</para>
<para>