Skip to content

Commit 411a69a

Browse files
Julia PhamSundermannC
authored andcommitted
fix: correct direction of < and > , also renamed less to lower
1 parent 721f276 commit 411a69a

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/main/java/de/vill/model/constraint/ExpressionConstraint.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ public boolean evaluate(Set<Feature> selectedFeatures) {
7878

7979
if (ConstantSymbols.EQUALS.equals(expressionSymbol)) {
8080
return leftResult == rightResult;
81-
} else if (ConstantSymbols.GREATER.equals(expressionSymbol)) {
81+
} else if (ConstantSymbols.LOWER.equals(expressionSymbol)) {
8282
return leftResult < rightResult;
83-
} else if (ConstantSymbols.LESS.equals(expressionSymbol)) {
83+
} else if (ConstantSymbols.GREATER.equals(expressionSymbol)) {
8484
return leftResult > rightResult;
85-
} else if (ConstantSymbols.LESS_OR_EQUAL.equals(expressionSymbol)) {
86-
return leftResult >= rightResult;
8785
} else if (ConstantSymbols.GREATER_OR_EQUAL.equals(expressionSymbol)) {
86+
return leftResult >= rightResult;
87+
} else if (ConstantSymbols.LOWER_OR_EQUAL.equals(expressionSymbol)) {
8888
return leftResult <= rightResult;
8989
} else if (ConstantSymbols.NOT_EQUALS.equals(expressionSymbol)) {
9090
return leftResult != rightResult;

src/main/java/de/vill/model/constraint/GreaterEqualsEquationConstraint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public class GreaterEqualsEquationConstraint extends ExpressionConstraint {
1212
public GreaterEqualsEquationConstraint(final Expression left, final Expression right) {
13-
super(left, right, ConstantSymbols.LESS_OR_EQUAL);
13+
super(left, right, ConstantSymbols.GREATER_OR_EQUAL);
1414
}
1515

1616
@Override

src/main/java/de/vill/model/constraint/GreaterEquationConstraint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public class GreaterEquationConstraint extends ExpressionConstraint {
1212
public GreaterEquationConstraint(final Expression left, final Expression right) {
13-
super(left, right, ConstantSymbols.LESS);
13+
super(left, right, ConstantSymbols.GREATER);
1414
}
1515

1616
@Override

src/main/java/de/vill/model/constraint/LowerEqualsEquationConstraint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
public class LowerEqualsEquationConstraint extends ExpressionConstraint {
1010
public LowerEqualsEquationConstraint(final Expression left, final Expression right) {
11-
super(left, right, ConstantSymbols.GREATER_OR_EQUAL);
11+
super(left, right, ConstantSymbols.LOWER_OR_EQUAL);
1212
}
1313

1414
@Override

src/main/java/de/vill/model/constraint/LowerEquationConstraint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
public class LowerEquationConstraint extends ExpressionConstraint {
1010
public LowerEquationConstraint(final Expression left, final Expression right) {
11-
super(left, right, ConstantSymbols.GREATER);
11+
super(left, right, ConstantSymbols.LOWER);
1212
}
1313

1414
@Override

src/main/java/de/vill/util/ConstantSymbols.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public class ConstantSymbols {
1212
// Comparison
1313
public static final String EQUALS = "==";
1414
public static final String NOT_EQUALS = "!=";
15-
public static final String GREATER = "<";
16-
public static final String LESS = ">";
17-
public static final String GREATER_OR_EQUAL = "<=";
18-
public static final String LESS_OR_EQUAL = ">=";
15+
public static final String GREATER = ">";
16+
public static final String LOWER = "<";
17+
public static final String GREATER_OR_EQUAL = ">=";
18+
public static final String LOWER_OR_EQUAL = "<=";
1919

2020
//Parenthesis
2121
public static final String PAREN_OPEN = "(";

0 commit comments

Comments
 (0)