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 2012/11/28 11:06:44 UTC
svn commit: r1414627 - in
/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src:
main/java/org/apache/uima/textmarker/condition/
main/java/org/apache/uima/textmarker/verbalize/
test/java/org/apache/uima/textmarker/condition/
Author: pkluegl
Date: Wed Nov 28 10:06:43 2012
New Revision: 1414627
URL: http://svn.apache.org/viewvc?rev=1414627&view=rev
Log:
UIMA-2507
- fixed junit test of COUNT condition
- fixed verbalization (wrong getter method)
- fixed COUNT condition (assignment of result to variable)
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CountCondition.java
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CountTest.java
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CountCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CountCondition.java?rev=1414627&r1=1414626&r2=1414627&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CountCondition.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/condition/CountCondition.java Wed Nov 28 10:06:43 2012
@@ -117,6 +117,9 @@ public class CountCondition extends Type
count++;
}
}
+ if (var != null) {
+ element.getParent().getEnvironment().setVariableValue(var, count);
+ }
boolean value = count >= min.getIntegerValue(element.getParent())
&& count <= max.getIntegerValue(element.getParent());
return new EvaluatedCondition(this, value);
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java?rev=1414627&r1=1414626&r2=1414627&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java Wed Nov 28 10:06:43 2012
@@ -194,7 +194,7 @@ public class ConditionVerbalizer {
return name + type + min + max + var + ")";
} else {
String name = "COUNT(";
- String list = verbalizer.verbalize(c.getList());
+ String list = verbalizer.verbalize(c.getArgList());
String arg = verbalizer.verbalize(c.getArg());
NumberExpression minE = c.getMin();
String min = verbalizeMin(minE, Integer.MIN_VALUE);
Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CountTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CountTest.java?rev=1414627&r1=1414626&r2=1414627&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CountTest.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/CountTest.java Wed Nov 28 10:06:43 2012
@@ -64,10 +64,8 @@ public class CountTest {
t = TextMarkerTestUtils.getTestType(cas, 3);
ai = cas.getAnnotationIndex(t);
- assertEquals(3, ai.size());
+ assertEquals(1, ai.size());
iterator = ai.iterator();
- assertEquals("A single sentence", iterator.next().getCoveredText());
- assertEquals("And here is another one", iterator.next().getCoveredText());
assertEquals("Testing the COUNT condition of TextMarker", iterator.next().getCoveredText());
}