tolerance for relational conditions (descriptions)

Author: Torsten-Mumme

src/main/java/net/itarray/automotion/internal/properties/Between.java

@@ -7,6 +7,9 @@
 import net.itarray.automotion.validation.properties.Condition;
 import net.itarray.automotion.validation.properties.Expression;
 
+import static java.lang.String.format;
+import static net.itarray.automotion.internal.geometry.Scalar.scalar;
+
 public class Between implements Condition<Scalar> {
 
     private final Condition<Scalar> lowerLimit;
@@ -28,12 +31,16 @@ public <V extends MetricSpace<V>> boolean isSatisfiedOn(Scalar value, Context co
 
     @Override
     public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
-        return String.format("between %s and %s", lowerLimitExpression.getDescription(context, direction), upperLimitExpression.getDescription(context, direction));
+        return format(
+                "between %s and %s%s",
+                lowerLimitExpression.getDescription(context, direction),
+                upperLimitExpression.getDescription(context, direction),
+                context.getTolerance().equals(scalar(0)) ? "" : format("(~%s)", context.getTolerance()));
     }
 
     @Override
     public String toString() {
-        return String.format("between[%s, %s]", lowerLimit, upperLimit);
+        return format("between[%s, %s]", lowerLimit, upperLimit);
     }
 
 

src/main/java/net/itarray/automotion/internal/properties/BinaryScalarConditionWithFixedOperand.java

@@ -8,6 +8,8 @@
 
 import java.util.function.BiPredicate;
 
+import static java.lang.String.format;
+import static net.itarray.automotion.internal.geometry.Scalar.scalar;
 import static org.apache.commons.lang3.text.WordUtils.uncapitalize;
 
 
@@ -34,12 +36,13 @@ public <V extends MetricSpace<V>> boolean isSatisfiedOn(Scalar value, Context co
 
     @Override
     public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
-        return String.format(toStringFormat, fixedOperand.getDescription(context, direction));
+        String tolerance = context.getTolerance().equals(scalar(0)) ? "" : format("(~%s)", context.getTolerance());
+        return format(toStringFormat, fixedOperand.getDescription(context, direction)) + tolerance;
     }
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", uncapitalize(getClass().getSimpleName()), fixedOperand); // todo: tolerance
+        return format("%s(%s)", uncapitalize(getClass().getSimpleName()), fixedOperand);
     }