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/04/29 15:40:28 UTC
svn commit: r1477061 [1/2] -
/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/
Author: pkluegl
Date: Mon Apr 29 13:40:26 2013
New Revision: 1477061
URL: http://svn.apache.org/r1477061
Log:
UIMA-2850
- renaming
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AfterCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AndCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/BeforeCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CountCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CurrentCountCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/EndsWithCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/FeatureCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IsCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/LastCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/MOfNCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NearCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NotCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/OrCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ParseCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfNeqCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PositionCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/RegExpCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/SizeCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/StartsWithCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TotalCountCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/TypeSentiveCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VariableCondition.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/VoteCondition.java
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AfterCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AfterCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AfterCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AfterCondition.java Mon Apr 29 13:40:26 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.List;
import org.apache.uima.cas.FSIterator;
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.list.TypeListExpression;
-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.list.TypeListExpression;
+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 AfterCondition extends TypeSentiveCondition {
@@ -43,7 +43,7 @@ public class AfterCondition extends Type
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
if (!isWorkingOnList()) {
Type t = type.getType(element.getParent());
boolean result = check(annotation, stream, t);
@@ -61,7 +61,7 @@ public class AfterCondition extends Type
}
}
- private boolean check(AnnotationFS annotation, TextMarkerStream stream, Type t) {
+ private boolean check(AnnotationFS annotation, RutaStream stream, Type t) {
boolean result = false;
FSIterator<AnnotationFS> it = stream.getCas().getAnnotationIndex(t).iterator(annotation);
if (!it.isValid()) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AndCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AndCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AndCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/AndCondition.java Mon Apr 29 13:40:26 2013
@@ -17,29 +17,29 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
import java.util.List;
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 AndCondition extends ComposedTextMarkerCondition {
+public class AndCondition extends ComposedRutaCondition {
- public AndCondition(List<AbstractTextMarkerCondition> conditions) {
+ public AndCondition(List<AbstractRutaCondition> conditions) {
super(conditions);
}
@Override
public EvaluatedCondition eval(AnnotationFS currentSymbol, RuleElement element,
- TextMarkerStream symbolStream, InferenceCrowd crowd) {
+ RutaStream symbolStream, InferenceCrowd crowd) {
boolean result = true;
List<EvaluatedCondition> evals = new ArrayList<EvaluatedCondition>();
- for (AbstractTextMarkerCondition each : conditions) {
+ for (AbstractRutaCondition each : conditions) {
crowd.beginVisit(each, null);
EvaluatedCondition eval = each.eval(currentSymbol, element, symbolStream, crowd);
crowd.endVisit(each, null);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/BeforeCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/BeforeCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/BeforeCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/BeforeCondition.java Mon Apr 29 13:40:26 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.List;
import org.apache.uima.cas.FSIterator;
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.list.TypeListExpression;
-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.list.TypeListExpression;
+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 BeforeCondition extends TypeSentiveCondition {
@@ -43,7 +43,7 @@ public class BeforeCondition extends Typ
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
if (!isWorkingOnList()) {
Type t = type.getType(element.getParent());
boolean result = check(annotation, stream, t);
@@ -61,7 +61,7 @@ public class BeforeCondition extends Typ
}
}
- private boolean check(AnnotationFS annotation, TextMarkerStream stream, Type t) {
+ private boolean check(AnnotationFS annotation, RutaStream stream, Type t) {
boolean result = false;
FSIterator<AnnotationFS> it = stream.getCas().getAnnotationIndex(t).iterator(annotation);
while (it.isValid()) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ConditionFactory.java Mon Apr 29 13:40:26 2013
@@ -17,50 +17,50 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.List;
import org.antlr.runtime.Token;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.resource.WordListExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.resource.WordListExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
public class ConditionFactory {
private ConditionFactory() {
}
- public static AbstractTextMarkerCondition createConditionAnd(
- List<AbstractTextMarkerCondition> conds, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionAnd(
+ List<AbstractRutaCondition> conds, RutaBlock parent) {
return new AndCondition(conds);
}
- public static AbstractTextMarkerCondition createConditionOr(
- List<AbstractTextMarkerCondition> conds, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionOr(
+ List<AbstractRutaCondition> conds, RutaBlock parent) {
return new OrCondition(conds);
}
- public static AbstractTextMarkerCondition createConditionNot(AbstractTextMarkerCondition cond,
- TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionNot(AbstractRutaCondition cond,
+ RutaBlock parent) {
return new NotCondition(cond);
}
- public static AbstractTextMarkerCondition createConditionContains(TypeExpression typeExpr,
+ public static AbstractRutaCondition createConditionContains(TypeExpression typeExpr,
NumberExpression min, NumberExpression max, BooleanExpression percent,
- TextMarkerBlock parent) {
+ RutaBlock parent) {
return new ContainsCondition(typeExpr, min, max, percent);
}
- public static AbstractTextMarkerCondition createConditionContextCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionContextCount(TypeExpression typeExpr,
+ NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -68,8 +68,8 @@ public class ConditionFactory {
return new ContextCountCondition(typeExpr, min, max, varString);
}
- public static AbstractTextMarkerCondition createConditionCurrentCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionCurrentCount(TypeExpression typeExpr,
+ NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -77,8 +77,8 @@ public class ConditionFactory {
return new CurrentCountCondition(typeExpr, min, max, varString);
}
- public static AbstractTextMarkerCondition createConditionCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionCount(TypeExpression typeExpr,
+ NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -86,8 +86,8 @@ public class ConditionFactory {
return new CountCondition(typeExpr, min, max, varString);
}
- public static AbstractTextMarkerCondition createConditionTotalCount(TypeExpression typeExpr,
- NumberExpression min, NumberExpression max, Token var, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionTotalCount(TypeExpression typeExpr,
+ NumberExpression min, NumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -95,25 +95,25 @@ public class ConditionFactory {
return new TotalCountCondition(typeExpr, min, max, varString);
}
- public static AbstractTextMarkerCondition createConditionInList(WordListExpression listExpr,
- NumberExpression dist, BooleanExpression rel, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionInList(WordListExpression listExpr,
+ NumberExpression dist, BooleanExpression rel, RutaBlock parent) {
return new InListCondition(listExpr, dist, rel);
}
- public static AbstractTextMarkerCondition createConditionMOfN(
- List<AbstractTextMarkerCondition> conds, NumberExpression min, NumberExpression max,
- TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionMOfN(
+ List<AbstractRutaCondition> conds, NumberExpression min, NumberExpression max,
+ RutaBlock parent) {
return new MOfNCondition(conds, min, max);
}
- public static AbstractTextMarkerCondition createConditionNear(TypeExpression typeExpr,
+ public static AbstractRutaCondition createConditionNear(TypeExpression typeExpr,
NumberExpression min, NumberExpression max, BooleanExpression direction,
- BooleanExpression filtered, TextMarkerBlock parent) {
+ BooleanExpression filtered, RutaBlock parent) {
return new NearCondition(typeExpr, min, max, direction, filtered);
}
- public static AbstractTextMarkerCondition createConditionPartOf(TypeExpression type,
- TypeListExpression list, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionPartOf(TypeExpression type,
+ TypeListExpression list, RutaBlock parent) {
if (type != null) {
return new PartOfCondition(type);
} else {
@@ -121,23 +121,23 @@ public class ConditionFactory {
}
}
- public static AbstractTextMarkerCondition createConditionPosition(TypeExpression typeExpr,
- NumberExpression pos, BooleanExpression rel, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionPosition(TypeExpression typeExpr,
+ NumberExpression pos, BooleanExpression rel, RutaBlock parent) {
return new PositionCondition(typeExpr, pos, rel);
}
- public static AbstractTextMarkerCondition createConditionRegExp(StringExpression patternExpr,
- BooleanExpression ignoreCase, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionRegExp(StringExpression patternExpr,
+ BooleanExpression ignoreCase, RutaBlock parent) {
return new RegExpCondition(patternExpr, ignoreCase);
}
- public static AbstractTextMarkerCondition createConditionRegExp(Token var, StringExpression patternExpr,
- BooleanExpression ignoreCase, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionRegExp(Token var, StringExpression patternExpr,
+ BooleanExpression ignoreCase, RutaBlock parent) {
return new RegExpCondition(var == null ? null : var.getText(), patternExpr, ignoreCase);
}
- public static AbstractTextMarkerCondition createConditionScore(NumberExpression min,
- NumberExpression max, Token var, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionScore(NumberExpression min,
+ NumberExpression max, Token var, RutaBlock parent) {
String varString = null;
if (var != null) {
varString = var.getText();
@@ -145,23 +145,23 @@ public class ConditionFactory {
return new ScoreCondition(min, max, varString);
}
- public static AbstractTextMarkerCondition createConditionVote(TypeExpression type1Expr,
- TypeExpression type2Expr, TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionVote(TypeExpression type1Expr,
+ TypeExpression type2Expr, RutaBlock parent) {
return new VoteCondition(type1Expr, type2Expr);
}
- public static AbstractTextMarkerCondition createConditionLast(TypeExpression typeExpr,
- TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionLast(TypeExpression typeExpr,
+ RutaBlock parent) {
return new LastCondition(typeExpr);
}
- public static AbstractTextMarkerCondition createConditionIf(BooleanExpression e,
- TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionIf(BooleanExpression e,
+ RutaBlock parent) {
return new IfCondition(e);
}
- public static AbstractTextMarkerCondition createConditionFeature(StringExpression se, Object v,
- TextMarkerBlock parent) {
+ public static AbstractRutaCondition createConditionFeature(StringExpression se, Object v,
+ RutaBlock parent) {
if (v instanceof NumberExpression) {
return new FeatureCondition(se, (NumberExpression) v);
} else if (v instanceof BooleanExpression) {
@@ -172,17 +172,17 @@ public class ConditionFactory {
return null;
}
- public static AbstractTextMarkerCondition createConditionParse(Token id, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionParse(Token id, RutaBlock env) {
String var = id == null ? "" : id.getText();
return new ParseCondition(var);
}
- public static AbstractTextMarkerCondition createConditionVariable(Token id) {
+ public static AbstractRutaCondition createConditionVariable(Token id) {
return new VariableCondition(id.getText());
}
- public static AbstractTextMarkerCondition createConditionIs(TypeExpression type,
- TypeListExpression list, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionIs(TypeExpression type,
+ TypeListExpression list, RutaBlock env) {
if (type != null) {
return new IsCondition(type);
} else {
@@ -190,8 +190,8 @@ public class ConditionFactory {
}
}
- public static AbstractTextMarkerCondition createConditionAfter(TypeExpression type,
- TypeListExpression list, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionAfter(TypeExpression type,
+ TypeListExpression list, RutaBlock env) {
if (type != null) {
return new AfterCondition(type);
} else {
@@ -199,8 +199,8 @@ public class ConditionFactory {
}
}
- public static AbstractTextMarkerCondition createConditionBefore(TypeExpression type,
- TypeListExpression list, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionBefore(TypeExpression type,
+ TypeListExpression list, RutaBlock env) {
if (type != null) {
return new BeforeCondition(type);
} else {
@@ -208,8 +208,8 @@ public class ConditionFactory {
}
}
- public static AbstractTextMarkerCondition createConditionEndsWith(TypeExpression type,
- TypeListExpression list, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionEndsWith(TypeExpression type,
+ TypeListExpression list, RutaBlock env) {
if (type != null) {
return new EndsWithCondition(type);
} else {
@@ -217,8 +217,8 @@ public class ConditionFactory {
}
}
- public static AbstractTextMarkerCondition createConditionStartsWith(TypeExpression type,
- TypeListExpression list, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionStartsWith(TypeExpression type,
+ TypeListExpression list, RutaBlock env) {
if (type != null) {
return new StartsWithCondition(type);
} else {
@@ -226,8 +226,8 @@ public class ConditionFactory {
}
}
- public static AbstractTextMarkerCondition createConditionPartOfNeq(TypeExpression type,
- TypeListExpression list, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionPartOfNeq(TypeExpression type,
+ TypeListExpression list, RutaBlock env) {
if (type != null) {
return new PartOfNeqCondition(type);
} else {
@@ -235,25 +235,25 @@ public class ConditionFactory {
}
}
- public static AbstractTextMarkerCondition createConditionSize(ListExpression<?> list,
- NumberExpression min, NumberExpression max, Token var, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionSize(ListExpression<?> list,
+ NumberExpression min, NumberExpression max, Token var, RutaBlock env) {
return new SizeCondition(list, min, max, var == null ? null : var.getText());
}
- public static AbstractTextMarkerCondition createConditionInList(StringListExpression list,
- NumberExpression dist, BooleanExpression rel, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionInList(StringListExpression list,
+ NumberExpression dist, BooleanExpression rel, RutaBlock env) {
return new InListCondition(list, dist, rel);
}
- public static AbstractTextMarkerCondition createConditionCount(ListExpression<Object> type,
- TextMarkerExpression a, NumberExpression min, NumberExpression max, Token var,
- TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionCount(ListExpression<Object> type,
+ RutaExpression a, NumberExpression min, NumberExpression max, Token var,
+ RutaBlock env) {
return new CountCondition(type, a, min, max, var == null ? null : var.getText());
}
- public static AbstractTextMarkerCondition createConditionContains(ListExpression list,
- TextMarkerExpression a, NumberExpression min, NumberExpression max,
- BooleanExpression percent, TextMarkerBlock env) {
+ public static AbstractRutaCondition createConditionContains(ListExpression list,
+ RutaExpression a, NumberExpression min, NumberExpression max,
+ BooleanExpression percent, RutaBlock env) {
return new ContainsCondition(list, a, min, max, percent);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContainsCondition.java Mon Apr 29 13:40:26 2013
@@ -17,30 +17,30 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
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.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.bool.SimpleBooleanExpression;
-import org.apache.uima.textmarker.expression.list.BooleanListExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.list.NumberListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.SimpleNumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-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.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
+import org.apache.uima.ruta.expression.list.BooleanListExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.list.NumberListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+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 ContainsCondition extends TypeSentiveCondition {
@@ -50,7 +50,7 @@ public class ContainsCondition extends T
private final BooleanExpression percent;
- private TextMarkerExpression arg;
+ private RutaExpression arg;
private ListExpression argList;
@@ -62,7 +62,7 @@ public class ContainsCondition extends T
this.percent = percent == null ? new SimpleBooleanExpression(false) : percent;
}
- public ContainsCondition(ListExpression list, TextMarkerExpression a, NumberExpression min,
+ public ContainsCondition(ListExpression list, RutaExpression a, NumberExpression min,
NumberExpression max, BooleanExpression percent) {
super((TypeExpression) null);
this.min = min == null ? new SimpleNumberExpression(Integer.valueOf(1)) : min;
@@ -74,15 +74,15 @@ public class ContainsCondition extends T
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
int basicCount = 0;
int anchorCount = 0;
int totalCount = 0;
if (type != null) {
if (annotation != null) {
- List<TextMarkerBasic> annotations = stream.getBasicsInWindow(annotation);
- for (TextMarkerBasic each : annotations) {
+ List<RutaBasic> annotations = stream.getBasicsInWindow(annotation);
+ for (RutaBasic each : annotations) {
totalCount++;
Type t = type.getType(element.getParent());
if (each.beginsWith(t) || stream.getCas().getTypeSystem().subsumes(t, each.getType())) {
@@ -157,7 +157,7 @@ public class ContainsCondition extends T
return percent;
}
- public TextMarkerExpression getArg() {
+ public RutaExpression getArg() {
return arg;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ContextCountCondition.java Mon Apr 29 13:40:26 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
import java.util.List;
@@ -25,14 +25,14 @@ import java.util.Set;
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.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.type.TextMarkerBasic;
-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.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class ContextCountCondition extends TypeSentiveCondition {
@@ -52,12 +52,12 @@ public class ContextCountCondition exten
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
Type contextType = type.getType(element.getParent());
stream.moveToFirst();
List<AnnotationFS> visibleContexts = new ArrayList<AnnotationFS>();
while (stream.isValid()) {
- TextMarkerBasic each = (TextMarkerBasic) stream.get();
+ RutaBasic each = (RutaBasic) stream.get();
if (each.beginsWith(contextType)) {
visibleContexts.addAll(each.getBeginAnchors(contextType));
}
@@ -75,8 +75,8 @@ public class ContextCountCondition exten
for (AnnotationFS eachContext : overlappingContexts) {
int index = 0;
int counter = 0;
- List<TextMarkerBasic> basicsInWindow = stream.getBasicsInWindow(eachContext);
- for (TextMarkerBasic eachBasic : basicsInWindow) {
+ List<RutaBasic> basicsInWindow = stream.getBasicsInWindow(eachContext);
+ for (RutaBasic eachBasic : basicsInWindow) {
Set<AnnotationFS> beginAnchors = eachBasic.getBeginAnchors(annotation.getType());
if (beginAnchors != null) {
for (AnnotationFS each : beginAnchors) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CountCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CountCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CountCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CountCondition.java Mon Apr 29 13:40:26 2013
@@ -17,28 +17,28 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
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.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.BooleanListExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.list.NumberListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.SimpleNumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-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.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.BooleanListExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.list.NumberListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+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 CountCondition extends TypeSentiveCondition {
@@ -50,7 +50,7 @@ public class CountCondition extends Type
private ListExpression list;
- private TextMarkerExpression arg;
+ private RutaExpression arg;
public CountCondition(TypeExpression type, NumberExpression min, NumberExpression max, String var) {
super(type);
@@ -59,7 +59,7 @@ public class CountCondition extends Type
this.var = var;
}
- public CountCondition(ListExpression list, TextMarkerExpression a, NumberExpression min,
+ public CountCondition(ListExpression list, RutaExpression a, NumberExpression min,
NumberExpression max, String var) {
super((TypeExpression) null);
this.list = list;
@@ -71,7 +71,7 @@ public class CountCondition extends Type
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
if (arg == null) {
List<AnnotationFS> annotationsInWindow = stream.getAnnotationsInWindow(annotation,
type.getType(element.getParent()));
@@ -142,7 +142,7 @@ public class CountCondition extends Type
return list;
}
- public TextMarkerExpression getArg() {
+ public RutaExpression getArg() {
return arg;
}
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CurrentCountCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CurrentCountCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CurrentCountCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/CurrentCountCondition.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 CurrentCountCondition extends TypeSentiveCondition {
private final NumberExpression min;
@@ -47,7 +47,7 @@ public class CurrentCountCondition exten
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
int count = 0;
Iterator<AnnotationFS> it = stream.getCas().getAnnotationIndex(type.getType(element.getParent()))
.iterator();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/EndsWithCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/EndsWithCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/EndsWithCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/EndsWithCondition.java Mon Apr 29 13:40:26 2013
@@ -17,19 +17,19 @@
* 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.list.TypeListExpression;
-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.list.TypeListExpression;
+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 EndsWithCondition extends TypeSentiveCondition {
@@ -43,7 +43,7 @@ public class EndsWithCondition extends T
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
if (!isWorkingOnList()) {
Type givenType = type.getType(element.getParent());
boolean result = check(stream, annotation, givenType);
@@ -61,8 +61,8 @@ public class EndsWithCondition extends T
}
}
- private boolean check(TextMarkerStream stream, AnnotationFS matched, Type givenType) {
- TextMarkerBasic endAnchor = stream.getEndAnchor(matched.getEnd());
+ private boolean check(RutaStream stream, AnnotationFS matched, Type givenType) {
+ RutaBasic endAnchor = stream.getEndAnchor(matched.getEnd());
return endAnchor.endsWith(givenType);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/FeatureCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/FeatureCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/FeatureCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/FeatureCondition.java Mon Apr 29 13:40:26 2013
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.UIMAConstants;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-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.UIMAConstants;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+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 FeatureCondition extends AbstractTextMarkerCondition {
+public class FeatureCondition extends AbstractRutaCondition {
private final StringExpression featureStringExpression;
@@ -71,7 +71,7 @@ public class FeatureCondition extends Ab
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
String stringValue = featureStringExpression.getStringValue(element.getParent());
Feature featureByBaseName = annotation.getType().getFeatureByBaseName(stringValue);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java Mon Apr 29 13:40:26 2013
@@ -17,16 +17,16 @@
* 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.expression.bool.BooleanExpression;
-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.bool.BooleanExpression;
+import org.apache.uima.ruta.rule.EvaluatedCondition;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class IfCondition extends AbstractTextMarkerCondition {
+public class IfCondition extends AbstractRutaCondition {
private final BooleanExpression expression;
@@ -37,7 +37,7 @@ public class IfCondition extends Abstrac
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
return new EvaluatedCondition(this, expression.getBooleanValue(element.getParent()));
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java Mon Apr 29 13:40:26 2013
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.resource.WordListExpression;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
-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.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.resource.WordListExpression;
+import org.apache.uima.ruta.resource.RutaWordList;
+import org.apache.uima.ruta.rule.EvaluatedCondition;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class InListCondition extends TerminalTextMarkerCondition {
+public class InListCondition extends TerminalRutaCondition {
private BooleanExpression relative;
@@ -60,10 +60,10 @@ public class InListCondition extends Ter
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
String coveredText = annotation.getCoveredText();
if (stringList == null) {
- TextMarkerWordList wordList = listExpr.getList(element.getParent());
+ RutaWordList wordList = listExpr.getList(element.getParent());
return new EvaluatedCondition(this, wordList.contains(coveredText, false, 0, null, 0, true));
}
List<String> sList = stringList.getList(element.getParent());
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IsCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IsCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IsCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IsCondition.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 java.util.Set;
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.list.TypeListExpression;
-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.list.TypeListExpression;
+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 IsCondition extends TypeSentiveCondition {
@@ -44,8 +44,8 @@ public class IsCondition extends TypeSen
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
- TextMarkerBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
+ RutaStream stream, InferenceCrowd crowd) {
+ RutaBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
if (!isWorkingOnList()) {
Set<AnnotationFS> beginAnchors = beginAnchor
.getBeginAnchors(type.getType(element.getParent()));
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/LastCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/LastCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/LastCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/LastCondition.java Mon Apr 29 13:40:26 2013
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
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 LastCondition extends TypeSentiveCondition {
@@ -36,8 +36,8 @@ public class LastCondition extends TypeS
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
- TextMarkerBasic endAnchor = stream.getEndAnchor(annotation.getEnd());
+ RutaStream stream, InferenceCrowd crowd) {
+ RutaBasic endAnchor = stream.getEndAnchor(annotation.getEnd());
Type t = type.getType(element.getParent());
boolean result = endAnchor.beginsWith(t) && endAnchor.endsWith(t);
return new EvaluatedCondition(this, result);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/MOfNCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/MOfNCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/MOfNCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/MOfNCondition.java Mon Apr 29 13:40:26 2013
@@ -17,25 +17,25 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
import java.util.List;
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.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.rule.EvaluatedCondition;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class MOfNCondition extends ComposedTextMarkerCondition {
+public class MOfNCondition extends ComposedRutaCondition {
private final NumberExpression min;
private final NumberExpression max;
- public MOfNCondition(List<AbstractTextMarkerCondition> conditions, NumberExpression min,
+ public MOfNCondition(List<AbstractRutaCondition> conditions, NumberExpression min,
NumberExpression max) {
super(conditions);
this.min = min;
@@ -44,10 +44,10 @@ public class MOfNCondition extends Compo
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
int result = 0;
List<EvaluatedCondition> evals = new ArrayList<EvaluatedCondition>();
- for (AbstractTextMarkerCondition each : conditions) {
+ for (AbstractRutaCondition each : conditions) {
crowd.beginVisit(each, null);
EvaluatedCondition eval = each.eval(annotation, element, stream, crowd);
crowd.endVisit(each, null);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NearCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NearCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NearCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NearCondition.java Mon Apr 29 13:40:26 2013
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.bool.SimpleBooleanExpression;
-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.type.TextMarkerBasic;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
+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.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class NearCondition extends TypeSentiveCondition {
@@ -54,7 +54,7 @@ public class NearCondition extends TypeS
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
int maxValue = max.getIntegerValue(element.getParent());
int minValue = min.getIntegerValue(element.getParent());
boolean forwardValue = forward.getBooleanValue(element.getParent());
@@ -72,8 +72,8 @@ public class NearCondition extends TypeS
while (count <= maxValue) {
if (count >= minValue && it.isValid()) {
FeatureStructure featureStructure = it.get();
- if (featureStructure instanceof TextMarkerBasic) {
- TextMarkerBasic each = (TextMarkerBasic) featureStructure;
+ if (featureStructure instanceof RutaBasic) {
+ RutaBasic each = (RutaBasic) featureStructure;
if (each.isPartOf(type.getType(element.getParent()))) {
return new EvaluatedCondition(this, true);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NotCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NotCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NotCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/NotCondition.java Mon Apr 29 13:40:26 2013
@@ -17,24 +17,24 @@
* 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 NotCondition extends ComposedTextMarkerCondition {
+public class NotCondition extends ComposedRutaCondition {
- public NotCondition(AbstractTextMarkerCondition condition) {
+ public NotCondition(AbstractRutaCondition condition) {
super(condition);
}
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
- AbstractTextMarkerCondition cond = conditions.get(0);
+ RutaStream stream, InferenceCrowd crowd) {
+ AbstractRutaCondition cond = conditions.get(0);
crowd.beginVisit(cond, null);
EvaluatedCondition eval = cond.eval(annotation, element, stream, crowd);
crowd.endVisit(cond, null);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/OrCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/OrCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/OrCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/OrCondition.java Mon Apr 29 13:40:26 2013
@@ -17,28 +17,28 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
import java.util.List;
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 OrCondition extends ComposedTextMarkerCondition {
- public OrCondition(List<AbstractTextMarkerCondition> conditions) {
+public class OrCondition extends ComposedRutaCondition {
+ public OrCondition(List<AbstractRutaCondition> conditions) {
super(conditions);
}
@Override
public EvaluatedCondition eval(AnnotationFS currentSymbol, RuleElement element,
- TextMarkerStream symbolStream, InferenceCrowd crowd) {
+ RutaStream symbolStream, InferenceCrowd crowd) {
boolean result = false;
List<EvaluatedCondition> evals = new ArrayList<EvaluatedCondition>();
- for (AbstractTextMarkerCondition each : conditions) {
+ for (AbstractRutaCondition each : conditions) {
crowd.beginVisit(each, null);
EvaluatedCondition eval = each.eval(currentSymbol, element, symbolStream, crowd);
crowd.endVisit(each, null);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ParseCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ParseCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ParseCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ParseCondition.java Mon Apr 29 13:40:26 2013
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerEnvironment;
-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.RutaEnvironment;
+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 ParseCondition extends AbstractTextMarkerCondition {
+public class ParseCondition extends AbstractRutaCondition {
private final String var;
@@ -38,9 +38,9 @@ public class ParseCondition extends Abst
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
String text = annotation.getCoveredText();
- TextMarkerEnvironment env = element.getParent().getEnvironment();
+ RutaEnvironment env = element.getParent().getEnvironment();
Class<?> type = env.getVariableType(var);
try {
if (Integer.class.equals(type)) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfCondition.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 java.util.Set;
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.list.TypeListExpression;
-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.list.TypeListExpression;
+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 PartOfCondition extends TypeSentiveCondition {
@@ -44,7 +44,7 @@ public class PartOfCondition extends Typ
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
if (!isWorkingOnList()) {
Type t = type.getType(element.getParent());
boolean result = check(t, annotation, element, stream);
@@ -63,8 +63,8 @@ public class PartOfCondition extends Typ
}
private boolean check(Type t, AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream) {
- TextMarkerBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
+ RutaStream stream) {
+ RutaBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
Set<AnnotationFS> beginAnchors = beginAnchor.getBeginAnchors(t);
return beginAnchor.isPartOf(t) || (beginAnchors != null && !beginAnchors.isEmpty());
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfNeqCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfNeqCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfNeqCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PartOfNeqCondition.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 java.util.Set;
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.list.TypeListExpression;
-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.list.TypeListExpression;
+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 PartOfNeqCondition extends TypeSentiveCondition {
@@ -44,7 +44,7 @@ public class PartOfNeqCondition extends
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
if (!isWorkingOnList()) {
Type t = type.getType(element.getParent());
boolean result = check(annotation, stream, t);
@@ -62,10 +62,10 @@ public class PartOfNeqCondition extends
}
}
- private boolean check(AnnotationFS annotation, TextMarkerStream stream, Type t) {
+ private boolean check(AnnotationFS annotation, RutaStream stream, Type t) {
stream.moveTo(annotation);
while (stream.isValid()) {
- TextMarkerBasic each = (TextMarkerBasic) stream.get();
+ RutaBasic each = (RutaBasic) stream.get();
Set<AnnotationFS> set = each.getBeginAnchors(t);
if(set == null) {
stream.moveToPrevious();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PositionCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PositionCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PositionCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/PositionCondition.java Mon Apr 29 13:40:26 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.ArrayList;
import java.util.List;
@@ -25,15 +25,15 @@ import java.util.List;
import org.apache.uima.cas.FSIterator;
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.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-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.rule.TextMarkerRuleElement;
-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.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+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.rule.RutaRuleElement;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class PositionCondition extends TypeSentiveCondition {
@@ -50,11 +50,11 @@ public class PositionCondition extends T
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
Type t = type.getType(element.getParent());
- TextMarkerBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
- TextMarkerBasic endAnchor = stream.getEndAnchor(annotation.getEnd());
+ RutaBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
+ RutaBasic endAnchor = stream.getEndAnchor(annotation.getEnd());
if (beginAnchor == null || endAnchor == null || !beginAnchor.isPartOf(t)
|| !endAnchor.isPartOf(t)) {
return new EvaluatedCondition(this, false);
@@ -81,8 +81,8 @@ public class PositionCondition extends T
}
List<Type> targetTypes = new ArrayList<Type>();
- if (element instanceof TextMarkerRuleElement) {
- TextMarkerRuleElement re = (TextMarkerRuleElement) element;
+ if (element instanceof RutaRuleElement) {
+ RutaRuleElement re = (RutaRuleElement) element;
targetTypes.addAll(re.getMatcher().getTypes(element.getParent(), stream));
} else {
targetTypes.add(annotation.getType());
@@ -94,8 +94,8 @@ public class PositionCondition extends T
int integerValue = position.getIntegerValue(element.getParent());
if (relatively) {
int counter = 0;
- List<TextMarkerBasic> inWindow = stream.getBasicsInWindow(window);
- for (TextMarkerBasic each : inWindow) {
+ List<RutaBasic> inWindow = stream.getBasicsInWindow(window);
+ for (RutaBasic each : inWindow) {
if (beginsWith(each, targetTypes)) {
counter++;
if (counter == integerValue) {
@@ -112,8 +112,8 @@ public class PositionCondition extends T
return new EvaluatedCondition(this, false);
} else {
int counter = 0;
- List<TextMarkerBasic> inWindow = stream.getBasicsInWindow(window);
- for (TextMarkerBasic each : inWindow) {
+ List<RutaBasic> inWindow = stream.getBasicsInWindow(window);
+ for (RutaBasic each : inWindow) {
counter++;
boolean beginsWith = beginsWith(each, targetTypes);
if (each.getBegin() == beginAnchor.getBegin() && beginsWith && counter == integerValue) {
@@ -126,7 +126,7 @@ public class PositionCondition extends T
}
}
- private boolean beginsWith(TextMarkerBasic each, List<Type> targetTypes) {
+ private boolean beginsWith(RutaBasic each, List<Type> targetTypes) {
for (Type type : targetTypes) {
if (each.beginsWith(type)) {
return true;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/RegExpCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/RegExpCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/RegExpCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/RegExpCondition.java Mon Apr 29 13:40:26 2013
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerEnvironment;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.bool.SimpleBooleanExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-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.RutaEnvironment;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.rule.EvaluatedCondition;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class RegExpCondition extends TerminalTextMarkerCondition {
+public class RegExpCondition extends TerminalRutaCondition {
private final StringExpression pattern;
private final BooleanExpression ignoreCase;
@@ -52,7 +52,7 @@ public class RegExpCondition extends Ter
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
Matcher matcher = null;
boolean ignore = ignoreCase == null ? false : ignoreCase.getBooleanValue(element.getParent());
String stringValue = pattern.getStringValue(element.getParent());
@@ -66,7 +66,7 @@ public class RegExpCondition extends Ter
}
matcher = regularExpPattern.matcher(coveredText);
} else {
- TextMarkerEnvironment environment = element.getParent().getEnvironment();
+ RutaEnvironment environment = element.getParent().getEnvironment();
String variableValue = environment.getVariableValue(variable, String.class);
Pattern regularExpPattern = null;
if (ignore) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java Mon Apr 29 13:40:26 2013
@@ -17,22 +17,22 @@
* 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.jcas.tcas.Annotation;
-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.rule.EvaluatedCondition;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.type.TextMarkerAnnotation;
-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.rule.EvaluatedCondition;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.type.RutaAnnotation;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class ScoreCondition extends TerminalTextMarkerCondition {
+public class ScoreCondition extends TerminalRutaCondition {
private final NumberExpression min;
private final NumberExpression max;
@@ -48,16 +48,16 @@ public class ScoreCondition extends Term
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
- Type heuristicType = stream.getJCas().getCasType(TextMarkerAnnotation.type);
+ RutaStream stream, InferenceCrowd crowd) {
+ Type heuristicType = stream.getJCas().getCasType(RutaAnnotation.type);
List<AnnotationFS> annotationsInWindow = stream.getAnnotationsInWindow(annotation,
heuristicType);
double score = 0;
if (!annotationsInWindow.isEmpty()) {
- TextMarkerAnnotation heuristicAnnotation = (TextMarkerAnnotation) stream.getCas()
+ RutaAnnotation heuristicAnnotation = (RutaAnnotation) stream.getCas()
.createAnnotation(heuristicType, annotation.getBegin(), annotation.getEnd());
heuristicAnnotation.setAnnotation((Annotation) annotation);
- TextMarkerAnnotation tma = stream.getCorrectTMA(annotationsInWindow, heuristicAnnotation);
+ RutaAnnotation tma = stream.getCorrectTMA(annotationsInWindow, heuristicAnnotation);
score = tma.getScore();
}
if (var != null) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/SizeCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/SizeCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/SizeCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/SizeCondition.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 org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.SimpleNumberExpression;
-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.list.ListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
+import org.apache.uima.ruta.rule.EvaluatedCondition;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class SizeCondition extends AbstractTextMarkerCondition {
+public class SizeCondition extends AbstractRutaCondition {
private ListExpression<?> listExpr;
@@ -49,7 +49,7 @@ public class SizeCondition extends Abstr
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
int count = listExpr.getList(element.getParent()).size();
boolean value = count >= minExpr.getIntegerValue(element.getParent())
&& count <= maxExpr.getIntegerValue(element.getParent());
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/StartsWithCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/StartsWithCondition.java?rev=1477061&r1=1477060&r2=1477061&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/StartsWithCondition.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/StartsWithCondition.java Mon Apr 29 13:40:26 2013
@@ -17,19 +17,19 @@
* 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.list.TypeListExpression;
-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.list.TypeListExpression;
+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 StartsWithCondition extends TypeSentiveCondition {
@@ -43,7 +43,7 @@ public class StartsWithCondition extends
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RutaStream stream, InferenceCrowd crowd) {
// TODO rewrite
if (!isWorkingOnList()) {
@@ -64,11 +64,11 @@ public class StartsWithCondition extends
return new EvaluatedCondition(this, result);
}
- private boolean check(AnnotationFS annotation, Type t, TextMarkerStream stream) {
+ private boolean check(AnnotationFS annotation, Type t, RutaStream stream) {
if (annotation == null) {
return false;
}
- TextMarkerBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
+ RutaBasic beginAnchor = stream.getBeginAnchor(annotation.getBegin());
return beginAnchor.beginsWith(t);
}