Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TotalCountCondition.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TotalCountCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TotalCountCondition.java (original) +++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TotalCountCondition.java Mon Apr 29 13:40:26 2013 @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.uima.textmarker.condition; +package org.apache.uima.ruta.condition; import java.util.Iterator; import org.apache.uima.cas.text.AnnotationFS; -import org.apache.uima.textmarker.TextMarkerStream; -import org.apache.uima.textmarker.expression.number.NumberExpression; -import org.apache.uima.textmarker.expression.number.SimpleNumberExpression; -import org.apache.uima.textmarker.expression.type.TypeExpression; -import org.apache.uima.textmarker.rule.EvaluatedCondition; -import org.apache.uima.textmarker.rule.RuleElement; -import org.apache.uima.textmarker.visitor.InferenceCrowd; +import org.apache.uima.ruta.RutaStream; +import org.apache.uima.ruta.expression.number.NumberExpression; +import org.apache.uima.ruta.expression.number.SimpleNumberExpression; +import org.apache.uima.ruta.expression.type.TypeExpression; +import org.apache.uima.ruta.rule.EvaluatedCondition; +import org.apache.uima.ruta.rule.RuleElement; +import org.apache.uima.ruta.visitor.InferenceCrowd; public class TotalCountCondition extends TypeSentiveCondition { private final NumberExpression min; @@ -47,7 +47,7 @@ public class TotalCountCondition extends @Override public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element, - TextMarkerStream stream, InferenceCrowd crowd) { + RutaStream stream, InferenceCrowd crowd) { int count = 0; Iterator<?> it = stream.getJCas().getAnnotationIndex(type.getType(element.getParent())) .iterator();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TypeSentiveCondition.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TypeSentiveCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TypeSentiveCondition.java (original) +++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TypeSentiveCondition.java Mon Apr 29 13:40:26 2013 @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.uima.textmarker.condition; +package org.apache.uima.ruta.condition; -import org.apache.uima.textmarker.expression.list.TypeListExpression; -import org.apache.uima.textmarker.expression.type.TypeExpression; +import org.apache.uima.ruta.expression.list.TypeListExpression; +import org.apache.uima.ruta.expression.type.TypeExpression; -public abstract class TypeSentiveCondition extends TerminalTextMarkerCondition { +public abstract class TypeSentiveCondition extends TerminalRutaCondition { protected final TypeExpression type; Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VariableCondition.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VariableCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VariableCondition.java (original) +++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VariableCondition.java Mon Apr 29 13:40:26 2013 @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.uima.textmarker.condition; +package org.apache.uima.ruta.condition; import org.apache.uima.cas.text.AnnotationFS; -import org.apache.uima.textmarker.TextMarkerStream; -import org.apache.uima.textmarker.rule.EvaluatedCondition; -import org.apache.uima.textmarker.rule.RuleElement; -import org.apache.uima.textmarker.visitor.InferenceCrowd; +import org.apache.uima.ruta.RutaStream; +import org.apache.uima.ruta.rule.EvaluatedCondition; +import org.apache.uima.ruta.rule.RuleElement; +import org.apache.uima.ruta.visitor.InferenceCrowd; -public class VariableCondition extends AbstractTextMarkerCondition { +public class VariableCondition extends AbstractRutaCondition { private final String var; @@ -36,7 +36,7 @@ public class VariableCondition extends A @Override public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element, - TextMarkerStream stream, InferenceCrowd crowd) { + RutaStream stream, InferenceCrowd crowd) { return null; } Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VoteCondition.java URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VoteCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff ============================================================================== --- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VoteCondition.java (original) +++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VoteCondition.java Mon Apr 29 13:40:26 2013 @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.uima.textmarker.condition; +package org.apache.uima.ruta.condition; import java.util.List; import org.apache.uima.cas.Type; import org.apache.uima.cas.text.AnnotationFS; -import org.apache.uima.textmarker.TextMarkerStream; -import org.apache.uima.textmarker.expression.type.TypeExpression; -import org.apache.uima.textmarker.rule.EvaluatedCondition; -import org.apache.uima.textmarker.rule.RuleElement; -import org.apache.uima.textmarker.type.TextMarkerBasic; -import org.apache.uima.textmarker.visitor.InferenceCrowd; +import org.apache.uima.ruta.RutaStream; +import org.apache.uima.ruta.expression.type.TypeExpression; +import org.apache.uima.ruta.rule.EvaluatedCondition; +import org.apache.uima.ruta.rule.RuleElement; +import org.apache.uima.ruta.type.RutaBasic; +import org.apache.uima.ruta.visitor.InferenceCrowd; -public class VoteCondition extends TerminalTextMarkerCondition { +public class VoteCondition extends TerminalRutaCondition { private final TypeExpression type1; @@ -44,15 +44,15 @@ public class VoteCondition extends Termi @Override public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element, - TextMarkerStream stream, InferenceCrowd crowd) { + RutaStream stream, InferenceCrowd crowd) { int count1 = 0; int count2 = 0; int totalCount = 0; if (annotation != null) { - List<TextMarkerBasic> annotations = stream.getBasicsInWindow(annotation); + List<RutaBasic> annotations = stream.getBasicsInWindow(annotation); Type t1 = type1.getType(element.getParent()); Type t2 = type2.getType(element.getParent()); - for (TextMarkerBasic each : annotations) { + for (RutaBasic each : annotations) { totalCount++; if (each.beginsWith(t1)) { count1++;