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/09/12 18:29:28 UTC
svn commit: r1522651 -
/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/
Author: pkluegl
Date: Thu Sep 12 16:29:28 2013
New Revision: 1522651
URL: http://svn.apache.org/r1522651
Log:
UIMA-3262
- fixed parent access in quantifiers
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxGreedy.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxReluctant.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/NormalQuantifier.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusGreedy.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusReluctant.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionGreedy.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionReluctant.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/RuleElementQuantifier.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarGreedy.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarReluctant.java
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxGreedy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxGreedy.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxGreedy.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxGreedy.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.number.NumberExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
@@ -54,9 +53,9 @@ public class MinMaxGreedy implements Rul
}
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
- int minValue = min.getIntegerValue(element.getParent(), null, stream);
- int maxValue = max.getIntegerValue(element.getParent(), null, stream);
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
+ int minValue = min.getIntegerValue(parent, null, stream);
+ int maxValue = max.getIntegerValue(parent, null, stream);
if (matches.size() > 0) {
RuleElementMatch ruleElementMatch = matches.get(matches.size() - 1);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxReluctant.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxReluctant.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxReluctant.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.expression.number.NumberExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
@@ -62,9 +61,9 @@ public class MinMaxReluctant implements
}
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
- int minValue = min.getIntegerValue(element.getParent(), null, stream);
- int maxValue = max.getIntegerValue(element.getParent(), null, stream);
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
+ int minValue = min.getIntegerValue(parent, null, stream);
+ int maxValue = max.getIntegerValue(parent, null, stream);
if (matches.size() > 0) {
RuleElementMatch ruleElementMatch = matches.get(matches.size() - 1);
if (!ruleElementMatch.matched()) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/NormalQuantifier.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/NormalQuantifier.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/NormalQuantifier.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/NormalQuantifier.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -32,20 +31,13 @@ import org.apache.uima.ruta.rule.RuleMat
import org.apache.uima.ruta.visitor.InferenceCrowd;
public class NormalQuantifier implements RuleElementQuantifier {
- // @Override
- // public boolean continueMatch(int index, List<RuleElement> elements, RutaBasic next,
- // RuleElementMatch match, List<RuleElementMatch> matches, RutaStream stream,
- // InferenceCrowd crowd) {
- // return match == null;
- // }
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
if (matches == null) {
return null;
}
boolean result = true;
- boolean resultOr = false;
boolean allEmpty = true;
for (RuleElementMatch match : matches) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusGreedy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusGreedy.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusGreedy.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusGreedy.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -38,7 +37,7 @@ public class PlusGreedy implements RuleE
}
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
boolean result = true;
boolean allEmpty = true;
if (matches == null) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusReluctant.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusReluctant.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusReluctant.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -34,7 +33,7 @@ import org.apache.uima.ruta.visitor.Infe
public class PlusReluctant implements RuleElementQuantifier {
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
boolean result = true;
boolean allEmpty = true;
for (RuleElementMatch match : matches) {
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionGreedy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionGreedy.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionGreedy.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionGreedy.java Thu Sep 12 16:29:28 2013
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -35,7 +34,7 @@ import org.apache.uima.ruta.visitor.Infe
public class QuestionGreedy implements RuleElementQuantifier {
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
boolean result = true;
if (matches == null) {
return Collections.emptyList();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionReluctant.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionReluctant.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionReluctant.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -34,7 +33,7 @@ import org.apache.uima.ruta.visitor.Infe
public class QuestionReluctant implements RuleElementQuantifier {
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
boolean result = true;
for (RuleElementMatch match : matches) {
result &= match.matched() || match.getTextsMatched().isEmpty();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/RuleElementQuantifier.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/RuleElementQuantifier.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/RuleElementQuantifier.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/RuleElementQuantifier.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -33,7 +32,7 @@ import org.apache.uima.ruta.visitor.Infe
public interface RuleElementQuantifier {
- List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches, RutaStatement element,
+ List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches, RutaBlock parent,
RutaStream stream, InferenceCrowd crowd);
boolean continueMatch(boolean after, AnnotationFS annotation, RuleElement ruleElement,
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarGreedy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarGreedy.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarGreedy.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarGreedy.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -38,7 +37,7 @@ public class StarGreedy implements RuleE
}
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
boolean result = true;
if (matches == null) {
return null;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarReluctant.java?rev=1522651&r1=1522650&r2=1522651&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarReluctant.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarReluctant.java Thu Sep 12 16:29:28 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaBlock;
-import org.apache.uima.ruta.RutaStatement;
import org.apache.uima.ruta.RutaStream;
import org.apache.uima.ruta.rule.ComposedRuleElementMatch;
import org.apache.uima.ruta.rule.RuleElement;
@@ -34,7 +33,7 @@ import org.apache.uima.ruta.visitor.Infe
public class StarReluctant implements RuleElementQuantifier {
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
- RutaStatement element, RutaStream stream, InferenceCrowd crowd) {
+ RutaBlock parent, RutaStream stream, InferenceCrowd crowd) {
return matches;
}