svn commit: r1687780 - in /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta: condition/IfCondition.java condition/ImplicitCondition.java condition/ScoreCondition.java expression/bool/BooleanNumberExpression.java

[pkluegl]

Author: pkluegl
Date: Fri Jun 26 14:41:00 2015
New Revision: 1687780

URL: http://svn.apache.org/r1687780
Log:
UIMA-4472
- added match context to getters in expressions

Modified:
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java?rev=1687780&r1=1687779&r2=1687780&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
 Fri Jun 26 14:41:00 2015
@@ -38,7 +38,7 @@ public class IfCondition extends Abstrac
   @Override
   public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element, 
RutaStream stream,
           InferenceCrowd crowd) {
-    return new EvaluatedCondition(this, 
expression.getBooleanValue(element.getParent(), null,
+    return new EvaluatedCondition(this, 
expression.getBooleanValue(element.getParent(), annotation,
             stream));
   }
 

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java?rev=1687780&r1=1687779&r2=1687780&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
 Fri Jun 26 14:41:00 2015
@@ -50,7 +50,7 @@ public class ImplicitCondition extends A
           InferenceCrowd crowd) {
     if (expr instanceof IBooleanExpression) {
       IBooleanExpression be = (IBooleanExpression) expr;
-      return new EvaluatedCondition(this, 
be.getBooleanValue(element.getParent(), null, stream));
+      return new EvaluatedCondition(this, 
be.getBooleanValue(element.getParent(), annotation, stream));
     } else if (expr instanceof FeatureMatchExpression) {
       FeatureMatchExpression fme = (FeatureMatchExpression) expr;
       TypeExpression typeExpr = fme.getTypeExpr(element.getParent());

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java?rev=1687780&r1=1687779&r2=1687780&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
 Fri Jun 26 14:41:00 2015
@@ -63,8 +63,8 @@ public class ScoreCondition extends Term
     if (var != null) {
       element.getParent().getEnvironment().setVariableValue(var, score);
     }
-    boolean value = score >= min.getDoubleValue(element.getParent(), null, 
stream)
-            && score <= max.getDoubleValue(element.getParent(), null, stream);
+    boolean value = score >= min.getDoubleValue(element.getParent(), 
annotation, stream)
+            && score <= max.getDoubleValue(element.getParent(), annotation, 
stream);
     return new EvaluatedCondition(this, value);
   }
 

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java?rev=1687780&r1=1687779&r2=1687780&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
 Fri Jun 26 14:41:00 2015
@@ -41,8 +41,8 @@ public class BooleanNumberExpression ext
 
   @Override
   public boolean getBooleanValue(RutaBlock parent, AnnotationFS annotation, 
RutaStream stream) {
-    double doubleValue1 = getFristExpression().getDoubleValue(parent, null, 
stream);
-    double doubleValue2 = getSecondExpression().getDoubleValue(parent, null, 
stream);
+    double doubleValue1 = getFristExpression().getDoubleValue(parent, 
annotation, stream);
+    double doubleValue2 = getSecondExpression().getDoubleValue(parent, 
annotation, stream);
     return eval(doubleValue1, getOperator(), doubleValue2);
   }