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 2015/06/23 11:35:08 UTC
svn commit: r1687007 - in
/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta:
action/AbstractStructureAction.java action/AssignAction.java
expression/feature/GenericFeatureExpression.java
Author: pkluegl
Date: Tue Jun 23 09:35:08 2015
New Revision: 1687007
URL: http://svn.apache.org/r1687007
Log:
UIMA-4474
- fixed getter call for numbers
- change order
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java?rev=1687007&r1=1687006&r2=1687007&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AbstractStructureAction.java Tue Jun 23 09:35:08 2015
@@ -103,12 +103,12 @@ public abstract class AbstractStructureA
parent, matchedAnnotation, stream));
} else if (valueObject instanceof INumberExpression) {
- if (range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
+ if (range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
+ structure.setDoubleValue(targetFeature, ((INumberExpression) valueObject)
+ .getDoubleValue(parent, matchedAnnotation, stream));
+ } else if (range.getName().equals(UIMAConstants.TYPE_INTEGER)) {
structure.setIntValue(targetFeature, ((INumberExpression) valueObject).getIntegerValue(
parent, matchedAnnotation, stream));
- } else if (range.getName().equals(UIMAConstants.TYPE_DOUBLE)) {
- structure.setDoubleValue(targetFeature, ((INumberExpression) valueObject)
- .getDoubleValue(parent, matchedAnnotation, stream));
} else if (range.getName().equals(UIMAConstants.TYPE_FLOAT)) {
structure.setFloatValue(targetFeature, ((INumberExpression) valueObject).getFloatValue(
parent, matchedAnnotation, stream));
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java?rev=1687007&r1=1687006&r2=1687007&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/AssignAction.java Tue Jun 23 09:35:08 2015
@@ -49,12 +49,12 @@ public class AssignAction extends Abstra
RutaBlock parent = element.getParent();
RutaEnvironment environment = parent.getEnvironment();
Class<?> clazz = environment.getVariableType(var);
- if (clazz.equals(Integer.class) && expression instanceof INumberExpression) {
- int v = ((INumberExpression) expression).getIntegerValue(parent, match, element, stream);
- environment.setVariableValue(var, v);
- } else if (clazz.equals(Double.class) && expression instanceof INumberExpression) {
+ if (clazz.equals(Double.class) && expression instanceof INumberExpression) {
double v = ((INumberExpression) expression).getDoubleValue(parent, match, element, stream);
environment.setVariableValue(var, v);
+ } else if (clazz.equals(Integer.class) && expression instanceof INumberExpression) {
+ int v = ((INumberExpression) expression).getIntegerValue(parent, match, element, stream);
+ environment.setVariableValue(var, v);
} else if (clazz.equals(Type.class) && expression instanceof TypeExpression) {
Type v = ((TypeExpression) expression).getType(parent);
environment.setVariableValue(var, v);
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java?rev=1687007&r1=1687006&r2=1687007&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java Tue Jun 23 09:35:08 2015
@@ -111,14 +111,14 @@ public class GenericFeatureExpression ex
if(numberExpression == null) {
numberExpression = ExpressionFactory.createNumberFeatureExpression(featureExpression);
}
- return numberExpression.getIntegerValue(parent, annotation, stream);
+ return numberExpression.getDoubleValue(parent, annotation, stream);
}
public float getFloatValue(RutaBlock parent, AnnotationFS annotation, RutaStream stream) {
if(numberExpression == null) {
numberExpression = ExpressionFactory.createNumberFeatureExpression(featureExpression);
}
- return numberExpression.getIntegerValue(parent, annotation, stream);
+ return numberExpression.getFloatValue(parent, annotation, stream);
}