Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Another fix for handling double values in rule conditions. #48

Merged
merged 1 commit into from
Sep 20, 2022
Merged

Another fix for handling double values in rule conditions. #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,20 @@ private Boolean evaluateComparatorParameters(Double gt, Double gte, Double lt, D
return stateValue.equals(eq);
} else if (neq != null) {
return !stateValue.equals(neq);
} else if (gt != null) {
return getValueAsDouble(stateValue) > gt;
} else if (gte != null) {
return getValueAsDouble(stateValue) >= gte;
} else if (lt != null) {
return getValueAsDouble(stateValue) < lt;
} else if (lte != null) {
return getValueAsDouble(stateValue) <= lte;
} else {
// valueAsDouble may be null if unparseable ("NULL" or "UNDEF")
Double valueAsDouble = getValueAsDouble(stateValue);
if (valueAsDouble == null) {
return null;
} else if (gt != null) {
return valueAsDouble > gt;
} else if (gte != null) {
return valueAsDouble >= gte;
} else if (lt != null) {
return valueAsDouble < lt;
} else if (lte != null) {
return valueAsDouble <= lte;
}
}
return null;
}
Expand Down