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:39:14 UTC
svn commit: r1477060 [2/2] -
/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/GetListAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,14 +27,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.string.StringExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.string.StringExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class GetListAction extends AbstractTextMarkerAction {
+public class GetListAction extends AbstractRutaAction {
private static final String TYPES = "Types";
@@ -53,7 +53,7 @@ public class GetListAction extends Abstr
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
String op = opExpr.getStringValue(element.getParent());
List<Type> list = new ArrayList<Type>();
@@ -66,7 +66,7 @@ public class GetListAction extends Abstr
for (AnnotationFS matched : matchedAnnotations) {
if (TYPES_AT_BEGIN.equals(op)) {
- TextMarkerBasic beginAnchor = stream.getBeginAnchor(matched.getBegin());
+ RutaBasic beginAnchor = stream.getBeginAnchor(matched.getBegin());
Collection<Set<AnnotationFS>> values = beginAnchor.getBeginMap().values();
Set<AnnotationFS> aset = new HashSet<AnnotationFS>();
for (Set<AnnotationFS> set : values) {
@@ -76,7 +76,7 @@ public class GetListAction extends Abstr
list.add(annotationFS.getType());
}
} else if (TYPES_AT_END.equals(op)) {
- TextMarkerBasic endAnchor = stream.getEndAnchor(matched.getEnd());
+ RutaBasic endAnchor = stream.getEndAnchor(matched.getEnd());
Collection<Set<AnnotationFS>> values = endAnchor.getEndMap().values();
Set<AnnotationFS> aset = new HashSet<AnnotationFS>();
for (Set<AnnotationFS> set : values) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/LogAction.java Mon Apr 29 13:39:13 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class LogAction extends AbstractTextMarkerAction {
+public class LogAction extends AbstractRutaAction {
public static final String LOGGER_NAME = Logger.global.getName();
@@ -43,7 +43,7 @@ public class LogAction extends AbstractT
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
String msg = text.getStringValue(element.getParent());
Logger.getLogger(LOGGER_NAME).log(level, msg);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkAction.java Mon Apr 29 13:39:13 2013
@@ -17,20 +17,20 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
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.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaAnnotation;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class MarkAction extends AbstractMarkAction {
@@ -45,7 +45,7 @@ public class MarkAction extends Abstract
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Integer> indexList = getIndexList(element, list);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, indexList,
@@ -65,9 +65,9 @@ public class MarkAction extends Abstract
}
protected void updateHeuristicAnnotation(RuleMatch match, RuleElement element,
- TextMarkerStream stream, AnnotationFS matchedAnnotation, double deltaScore) {
- Type heuristicType = stream.getJCas().getCasType(TextMarkerAnnotation.type);
- TextMarkerAnnotation heuristicAnnotation = (TextMarkerAnnotation) stream.getCas()
+ RutaStream stream, AnnotationFS matchedAnnotation, double deltaScore) {
+ Type heuristicType = stream.getJCas().getCasType(RutaAnnotation.type);
+ RutaAnnotation heuristicAnnotation = (RutaAnnotation) stream.getCas()
.createAnnotation(heuristicType, matchedAnnotation.getBegin(),
matchedAnnotation.getEnd());
Annotation newAnnotation = (Annotation) stream.getCas().createAnnotation(
@@ -83,7 +83,7 @@ public class MarkAction extends Abstract
newAnnotation.addToIndexes();
stream.addAnnotation(newAnnotation, match);
} else {
- TextMarkerAnnotation tma = stream.getCorrectTMA(annotationsInWindow, heuristicAnnotation);
+ RutaAnnotation tma = stream.getCorrectTMA(annotationsInWindow, heuristicAnnotation);
if (tma != null) {
tma.removeFromIndexes();
double newScore = tma.getScore() + deltaScore;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java Mon Apr 29 13:39:13 2013
@@ -17,25 +17,25 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.Collection;
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.bool.SimpleBooleanExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.SimpleNumberExpression;
-import org.apache.uima.textmarker.expression.resource.WordListExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
-import org.apache.uima.textmarker.resource.TreeWordList;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.list.StringListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
+import org.apache.uima.ruta.expression.resource.WordListExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.resource.RutaWordList;
+import org.apache.uima.ruta.resource.TreeWordList;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class MarkFastAction extends AbstractMarkAction {
@@ -70,12 +70,12 @@ public class MarkFastAction extends Abst
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOf(element, stream);
for (AnnotationFS annotationFS : matchedAnnotationsOf) {
- TextMarkerStream windowStream = stream.getWindowStream(annotationFS, annotationFS.getType());
- TextMarkerWordList wl = null;
+ RutaStream windowStream = stream.getWindowStream(annotationFS, annotationFS.getType());
+ RutaWordList wl = null;
if (list != null) {
wl = list.getList(element.getParent());
} else if (stringList != null) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkLastAction.java Mon Apr 29 13:39:13 2013
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
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.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class MarkLastAction extends AbstractMarkAction {
@@ -36,14 +36,14 @@ public class MarkLastAction extends Abst
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, null,
element.getContainer());
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
- List<TextMarkerBasic> list = stream.getBasicsInWindow(matchedAnnotation);
+ List<RutaBasic> list = stream.getBasicsInWindow(matchedAnnotation);
if (!list.isEmpty()) {
- TextMarkerBasic last = list.get(list.size() - 1);
+ RutaBasic last = list.get(list.size() - 1);
createAnnotation(last, element, stream, match);
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkOnceAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
@@ -25,12 +25,12 @@ import org.apache.uima.cas.CAS;
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.number.NumberExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class MarkOnceAction extends MarkAction {
@@ -40,7 +40,7 @@ public class MarkOnceAction extends Mark
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Integer> indexList = getIndexList(element, list);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, indexList,
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkTableAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.Collection;
import java.util.HashMap;
@@ -30,21 +30,21 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.textmarker.TextMarkerBlock;
-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.resource.WordTableExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.resource.TextMarkerTable;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaBlock;
+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.resource.WordTableExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.resource.RutaTable;
+import org.apache.uima.ruta.resource.RutaWordList;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class MarkTableAction extends AbstractTextMarkerAction {
+public class MarkTableAction extends AbstractRutaAction {
private final TypeExpression typeExpr;
@@ -78,10 +78,10 @@ public class MarkTableAction extends Abs
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- TextMarkerBlock block = element.getParent();
- TextMarkerTable table = tableExpr.getTable(block);
+ RutaBlock block = element.getParent();
+ RutaTable table = tableExpr.getTable(block);
int index = indexExpr.getIntegerValue(block);
Type type = typeExpr.getType(block);
Map<String, Integer> map = new HashMap<String, Integer>();
@@ -98,7 +98,7 @@ public class MarkTableAction extends Abs
int maxIgnoreCharValue = maxIgnoreChar != null ? maxIgnoreChar.getIntegerValue(element
.getParent()) : 0;
- TextMarkerWordList wordList = table.getWordList(index);
+ RutaWordList wordList = table.getWordList(index);
Collection<AnnotationFS> found = wordList.find(stream, ignoreCaseValue, ignoreLengthValue,
ignoreCharValue.toCharArray(), maxIgnoreCharValue, true);
for (AnnotationFS annotationFS : found) {
@@ -120,7 +120,7 @@ public class MarkTableAction extends Abs
}
private void fillFeatures(TOP structure, Map<String, Integer> map, AnnotationFS annotationFS,
- RuleElement element, List<String> row, TextMarkerStream stream) {
+ RuleElement element, List<String> row, RutaStream stream) {
List<?> featuresList = structure.getType().getFeatures();
for (int i = 0; i < featuresList.size(); i++) {
Feature targetFeature = (Feature) featuresList.get(i);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MatchedTextAction.java Mon Apr 29 13:39:13 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
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.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class MatchedTextAction extends AbstractTextMarkerAction {
+public class MatchedTextAction extends AbstractRutaAction {
private final String var;
@@ -42,7 +42,7 @@ public class MatchedTextAction extends A
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Integer> indexList = getIndexList(match, element);
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, indexList,
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MergeAction.java Mon Apr 29 13:39:13 2013
@@ -17,20 +17,20 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.collections.ListUtils;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.ListExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class MergeAction extends AbstractTextMarkerAction {
+public class MergeAction extends AbstractRutaAction {
@SuppressWarnings("rawtypes")
private List<ListExpression> lists;
@@ -49,7 +49,7 @@ public class MergeAction extends Abstrac
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
boolean union = unionExpr.getBooleanValue(element.getParent());
List<Object> list = new ArrayList<Object>();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveAction.java Mon Apr 29 13:39:13 2013
@@ -17,30 +17,30 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-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.ListExpression;
-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.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStatement;
+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.ListExpression;
+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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class RemoveAction extends AbstractTextMarkerAction {
+public class RemoveAction extends AbstractRutaAction {
private String var;
- private List<TextMarkerExpression> elements;
+ private List<RutaExpression> elements;
- public RemoveAction(String var, List<TextMarkerExpression> list) {
+ public RemoveAction(String var, List<RutaExpression> list) {
super();
this.var = var;
this.elements = list;
@@ -50,20 +50,20 @@ public class RemoveAction extends Abstra
return var;
}
- public List<TextMarkerExpression> getElements() {
+ public List<RutaExpression> getElements() {
return elements;
}
@SuppressWarnings({ "rawtypes" })
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
- TextMarkerStatement parent = element.getParent();
+ RutaStatement parent = element.getParent();
List list = parent.getEnvironment().getVariableValue(var, List.class);
List<Object> toRemove = new ArrayList<Object>();
for (Object entry : list) {
Object value1 = getValue(entry, parent);
- for (TextMarkerExpression arg : elements) {
+ for (RutaExpression arg : elements) {
if(arg instanceof ListExpression) {
ListExpression l = (ListExpression) arg;
List list2 = l.getList(parent);
@@ -87,7 +87,7 @@ public class RemoveAction extends Abstra
parent.getEnvironment().setVariableValue(var, list);
}
- private Object getValue(Object obj, TextMarkerStatement parent) {
+ private Object getValue(Object obj, RutaStatement parent) {
if(obj instanceof NumberExpression) {
return ((NumberExpression)obj).getDoubleValue(parent);
} else if(obj instanceof BooleanExpression) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveDuplicateAction.java Mon Apr 29 13:39:13 2013
@@ -17,24 +17,24 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.apache.uima.textmarker.TextMarkerStatement;
-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.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStatement;
+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.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class RemoveDuplicateAction extends AbstractTextMarkerAction {
+public class RemoveDuplicateAction extends AbstractRutaAction {
private String var;
@@ -49,7 +49,7 @@ public class RemoveDuplicateAction exten
@SuppressWarnings({ "rawtypes" })
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List list = element.getParent().getEnvironment().getVariableValue(var, List.class);
Collection<Object> values = new HashSet<Object>();
@@ -66,7 +66,7 @@ public class RemoveDuplicateAction exten
}
- private Object getValue(Object obj, TextMarkerStatement parent) {
+ private Object getValue(Object obj, RutaStatement parent) {
if(obj instanceof NumberExpression) {
return ((NumberExpression)obj).getDoubleValue(parent);
} else if(obj instanceof BooleanExpression) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveFilterTypeAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveFilterTypeAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveFilterTypeAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveFilterTypeAction.java Mon Apr 29 13:39:13 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class RemoveFilterTypeAction extends AbstractTextMarkerAction {
+public class RemoveFilterTypeAction extends AbstractRutaAction {
public List<TypeExpression> getList() {
return list;
@@ -43,7 +43,7 @@ public class RemoveFilterTypeAction exte
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveRetainTypeAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveRetainTypeAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveRetainTypeAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RemoveRetainTypeAction.java Mon Apr 29 13:39:13 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class RemoveRetainTypeAction extends AbstractTextMarkerAction {
+public class RemoveRetainTypeAction extends AbstractRutaAction {
public List<TypeExpression> getList() {
return list;
@@ -43,7 +43,7 @@ public class RemoveRetainTypeAction exte
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ReplaceAction.java Mon Apr 29 13:39:13 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.string.StringExpression;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class ReplaceAction extends AbstractTextMarkerAction {
+public class ReplaceAction extends AbstractRutaAction {
public StringExpression getReplacement() {
return replacement;
@@ -43,14 +43,14 @@ public class ReplaceAction extends Abstr
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, null,
element.getContainer());
for (AnnotationFS matchedAnnotation : matchedAnnotations) {
- List<TextMarkerBasic> annotationsInWindow = stream.getBasicsInWindow(matchedAnnotation);
+ List<RutaBasic> annotationsInWindow = stream.getBasicsInWindow(matchedAnnotation);
boolean replaced = false;
- for (TextMarkerBasic textMarkerBasic : annotationsInWindow) {
+ for (RutaBasic textMarkerBasic : annotationsInWindow) {
textMarkerBasic.setReplacement(replaced ? "" : replacement.getStringValue(element
.getParent()));
replaced = true;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RetainTypeAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RetainTypeAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RetainTypeAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/RetainTypeAction.java Mon Apr 29 13:39:13 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.cas.Type;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class RetainTypeAction extends AbstractTextMarkerAction {
+public class RetainTypeAction extends AbstractRutaAction {
public List<TypeExpression> getList() {
return list;
@@ -43,7 +43,7 @@ public class RetainTypeAction extends Ab
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
for (TypeExpression each : list) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/SetFeatureAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
@@ -25,19 +25,19 @@ import java.util.List;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
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.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
-import org.apache.uima.textmarker.utils.UIMAUtils;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.rule.RutaRuleElement;
+import org.apache.uima.ruta.utils.UIMAUtils;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class SetFeatureAction extends AbstractTextMarkerAction {
+public class SetFeatureAction extends AbstractRutaAction {
private final StringExpression featureStringExpression;
@@ -95,11 +95,11 @@ public class SetFeatureAction extends Ab
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> types = new ArrayList<Type>();
- if (element instanceof TextMarkerRuleElement) {
- types = ((TextMarkerRuleElement) element).getMatcher().getTypes(element.getParent(), stream);
+ if (element instanceof RutaRuleElement) {
+ types = ((RutaRuleElement) element).getMatcher().getTypes(element.getParent(), stream);
}
if (types == null)
return;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/ShiftAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
import java.util.Set;
@@ -26,13 +26,13 @@ import java.util.TreeSet;
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.type.TypeExpression;
-import org.apache.uima.textmarker.rule.AnnotationComparator;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.type.TypeExpression;
+import org.apache.uima.ruta.rule.AnnotationComparator;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class ShiftAction extends MarkAction {
@@ -41,7 +41,7 @@ public class ShiftAction extends MarkAct
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
Type targetType = type.getType(element.getParent());
List<Integer> indexList = getIndexList(element, list);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TransferAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.List;
@@ -26,12 +26,12 @@ import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
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.RuleElement;
-import org.apache.uima.textmarker.rule.RuleElementMatch;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleElementMatch;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class TransferAction extends TypeSensitiveAction {
@@ -40,7 +40,7 @@ public class TransferAction extends Type
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<List<RuleElementMatch>> list = match.getMatchInfo(element);
CAS cas = stream.getCas();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrieAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.Collection;
import java.util.HashMap;
@@ -25,18 +25,18 @@ import java.util.Map;
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.resource.WordListExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.resource.TextMarkerWordList;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.resource.WordListExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.resource.RutaWordList;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TrieAction extends AbstractTextMarkerAction {
+public class TrieAction extends AbstractRutaAction {
private final WordListExpression list;
@@ -66,7 +66,7 @@ public class TrieAction extends Abstract
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
Map<String, Type> typeMap = new HashMap<String, Type>();
@@ -84,7 +84,7 @@ public class TrieAction extends Abstract
double distanceValue = distance.getDoubleValue(element.getParent());
String ignoreCharValue = ignoreChar.getStringValue(element.getParent());
- TextMarkerWordList wl = list.getList(element.getParent());
+ RutaWordList wl = list.getList(element.getParent());
Collection<AnnotationFS> found = wl.find(stream, typeMap, ignoreCaseValue, ignoreLengthValue,
editValue, distanceValue, ignoreCharValue);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TrimAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.List;
@@ -25,16 +25,16 @@ 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.TextMarkerStatement;
-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.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.type.TextMarkerBasic;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStatement;
+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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class TrimAction extends AbstractTextMarkerAction {
+public class TrimAction extends AbstractRutaAction {
private TypeListExpression typeList;
@@ -47,7 +47,7 @@ public class TrimAction extends Abstract
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<AnnotationFS> matchedAnnotationsOf = match.getMatchedAnnotationsOf(element, stream);
List<Type> typesToTrim = getTypes(element.getParent());
@@ -57,19 +57,19 @@ public class TrimAction extends Abstract
}
private void trimAnnotation(AnnotationFS annotation, List<Type> typesToTrim, RuleMatch match,
- TextMarkerStream stream) {
+ RutaStream stream) {
int oldBegin = annotation.getBegin();
int oldEnd = annotation.getEnd();
int newBegin = oldBegin;
int newEnd = oldEnd;
- TextMarkerBasic beginBasic = stream.getBeginAnchor(oldBegin);
+ RutaBasic beginBasic = stream.getBeginAnchor(oldBegin);
while (isPartof(beginBasic, typesToTrim) && beginBasic.getBegin() < oldEnd) {
beginBasic = stream.getBasicNextTo(false, beginBasic);
}
newBegin = beginBasic.getBegin();
- TextMarkerBasic endBasic = stream.getEndAnchor(oldEnd);
+ RutaBasic endBasic = stream.getEndAnchor(oldEnd);
while (isPartof(endBasic, typesToTrim) && endBasic.getEnd() > newBegin) {
endBasic = stream.getBasicNextTo(true, endBasic);
}
@@ -88,7 +88,7 @@ public class TrimAction extends Abstract
}
}
- private boolean isPartof(TextMarkerBasic basic, List<Type> typesToTrim) {
+ private boolean isPartof(RutaBasic basic, List<Type> typesToTrim) {
for (Type type : typesToTrim) {
boolean partOf = basic.isPartOf(type);
if (partOf) {
@@ -98,7 +98,7 @@ public class TrimAction extends Abstract
return false;
}
- private List<Type> getTypes(TextMarkerStatement parent) {
+ private List<Type> getTypes(RutaStatement parent) {
List<Type> result = new ArrayList<Type>();
if (types != null) {
for (TypeExpression each : types) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TypeSensitiveAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TypeSensitiveAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TypeSensitiveAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/TypeSensitiveAction.java Mon Apr 29 13:39:13 2013
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
-public abstract class TypeSensitiveAction extends AbstractTextMarkerAction {
+public abstract class TypeSensitiveAction extends AbstractRutaAction {
public TypeSensitiveAction(TypeExpression type) {
super();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
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.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class UnmarkAction extends TypeSensitiveAction {
@@ -47,7 +47,7 @@ public class UnmarkAction extends TypeSe
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
Type t = type.getType(element.getParent());
boolean allAtAnchor = false;
@@ -58,7 +58,7 @@ public class UnmarkAction extends TypeSe
List<AnnotationFS> matchedAnnotations = match.getMatchedAnnotations(stream, indexList,
element.getContainer());
for (AnnotationFS annotationFS : matchedAnnotations) {
- TextMarkerBasic beginAnchor = stream.getBeginAnchor(annotationFS.getBegin());
+ RutaBasic beginAnchor = stream.getBeginAnchor(annotationFS.getBegin());
Set<AnnotationFS> beginAnchors = beginAnchor.getBeginAnchors(t);
if (beginAnchors != null) {
for (AnnotationFS each : new ArrayList<AnnotationFS>(beginAnchors)) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAllAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAllAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAllAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/UnmarkAllAction.java Mon Apr 29 13:39:13 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -27,14 +27,14 @@ import java.util.Set;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
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.RuleElement;
-import org.apache.uima.textmarker.rule.RuleElementMatch;
-import org.apache.uima.textmarker.rule.RuleMatch;
-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.RuleElement;
+import org.apache.uima.ruta.rule.RuleElementMatch;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.type.RutaBasic;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
public class UnmarkAllAction extends TypeSensitiveAction {
@@ -46,7 +46,7 @@ public class UnmarkAllAction extends Typ
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
List<Type> retainList = new ArrayList<Type>();
if (list != null) {
@@ -60,7 +60,7 @@ public class UnmarkAllAction extends Typ
RuleElementMatch ruleElementMatch = l.get(0);
List<AnnotationFS> textsMatched = ruleElementMatch.getTextsMatched();
for (AnnotationFS each : textsMatched) {
- TextMarkerBasic beginAnchor = stream.getBeginAnchor(each.getBegin());
+ RutaBasic beginAnchor = stream.getBeginAnchor(each.getBegin());
Set<AnnotationFS> beginAnchors = beginAnchor.getBeginAnchors(t);
for (AnnotationFS annotationFS : beginAnchors) {
if (annotationFS.getEnd() == each.getEnd()
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/VariableAction.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/VariableAction.java?rev=1477060&r1=1477059&r2=1477060&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/VariableAction.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/VariableAction.java Mon Apr 29 13:39:13 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
-import org.apache.uima.textmarker.TextMarkerStream;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleMatch;
-import org.apache.uima.textmarker.visitor.InferenceCrowd;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleMatch;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
-public class VariableAction extends AbstractTextMarkerAction {
+public class VariableAction extends AbstractRutaAction {
private final String var;
@@ -34,7 +34,7 @@ public class VariableAction extends Abst
}
@Override
- public void execute(RuleMatch match, RuleElement element, TextMarkerStream stream,
+ public void execute(RuleMatch match, RuleElement element, RutaStream stream,
InferenceCrowd crowd) {
// TODO
}