generalized direction parameter for expressions and conditions

Torsten-Mumme · Torsten-Mumme · commit c9406a5fc131 · 2017-12-07T14:41:29.000+01:00
diff --git a/src/main/java/net/itarray/automotion/internal/properties/Between.java b/src/main/java/net/itarray/automotion/internal/properties/Between.java
@@ -1,6 +1,8 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Condition;
 import net.itarray.automotion.validation.properties.Expression;
@@ -20,12 +22,12 @@ public Between(Expression<Scalar> lowerLimit, Expression<Scalar> upperLimit) {
     }
 
     @Override
-    public boolean isSatisfiedOn(Scalar value, Context context, Direction direction) {
+    public <V extends MetricSpace<V>> boolean isSatisfiedOn(Scalar value, Context context, ExtendGiving<V> direction) {
         return lowerLimit.isSatisfiedOn(value, context, direction) && upperLimit.isSatisfiedOn(value, context, direction);
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    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));
     }
 
diff --git a/src/main/java/net/itarray/automotion/internal/properties/BinaryExpression.java b/src/main/java/net/itarray/automotion/internal/properties/BinaryExpression.java
@@ -1,6 +1,8 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Expression;
 
@@ -27,12 +29,12 @@ public BinaryExpression(Expression<L> left, Expression<R> right, BiFunction<L, R
     }
 
     @Override
-    public T evaluateIn(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V> direction) {
         return contextBiFunction.apply(left.evaluateIn(context, direction), right.evaluateIn(context, direction), context);
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>>String getDescription(Context context, ExtendGiving<V> direction) {
         String toleranceDescription = context.getTolerance().equals(scalar(0)) ? "" : String.format(" with tolerance %s", context.getTolerance());
         return String.format(
                 descriptionFormat,
diff --git a/src/main/java/net/itarray/automotion/internal/properties/BinaryScalarConditionWithFixedOperand.java b/src/main/java/net/itarray/automotion/internal/properties/BinaryScalarConditionWithFixedOperand.java
@@ -2,6 +2,8 @@
 
 import com.webfirmframework.wffweb.tag.html.formatting.S;
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Condition;
 import net.itarray.automotion.validation.properties.Expression;
@@ -28,12 +30,12 @@ protected boolean applyTo(Scalar operand, Scalar fixedOperand) {
     }
 
     @Override
-    public boolean isSatisfiedOn(Scalar value, Context context, Direction direction) {
+    public <V extends MetricSpace<V>> boolean isSatisfiedOn(Scalar value, Context context, ExtendGiving<V> direction) {
         return applyTo(value, fixedOperand.evaluateIn(context, direction));
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
         return String.format(toStringFormat, fixedOperand.getDescription(context, direction));
     }
 
diff --git a/src/main/java/net/itarray/automotion/internal/properties/ConditionedExpression.java b/src/main/java/net/itarray/automotion/internal/properties/ConditionedExpression.java
@@ -1,6 +1,7 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
 import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.validation.properties.Condition;
 import net.itarray.automotion.validation.properties.Expression;
@@ -16,12 +17,12 @@ public ConditionedExpression(Expression<T> toBeConditioned, Condition<T> toBeApp
     }
 
     @Override
-    public Boolean evaluateIn(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> Boolean evaluateIn(Context context, ExtendGiving<V> direction) {
         return toBeApplied.isSatisfiedOn(toBeConditioned.evaluateIn(context, direction), context, direction);
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
         T t = toBeConditioned.evaluateIn(context, direction);
         return String.format("Expected %s to be %s. Actual %s is: %s",
                 toBeConditioned.getDescription(context, direction),
diff --git a/src/main/java/net/itarray/automotion/internal/properties/ConstantExpression.java b/src/main/java/net/itarray/automotion/internal/properties/ConstantExpression.java
@@ -1,6 +1,8 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Expression;
 
@@ -13,12 +15,12 @@ public ConstantExpression(T value) {
     }
 
     @Override
-    public T evaluateIn(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V> direction) {
         return value;
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
         return value.toString() + "px";
     }
 
diff --git a/src/main/java/net/itarray/automotion/internal/properties/ElementPropertyExpression.java b/src/main/java/net/itarray/automotion/internal/properties/ElementPropertyExpression.java
@@ -24,17 +24,17 @@ public static <V extends MetricSpace<V>> ElementPropertyExpression<V> extend(Ext
     }
 
     @Override
-    public T evaluateIn(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V> direction) {
         return property.evaluateOn(element);
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
         return property.getDescriptionFor(element);
     }
 
     @Override
-    public String getRepeatedDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getRepeatedDescription(Context context, ExtendGiving<V> direction) {
         return property.getName();
     }
 
diff --git a/src/main/java/net/itarray/automotion/internal/properties/PagePercentage.java b/src/main/java/net/itarray/automotion/internal/properties/PagePercentage.java
@@ -1,6 +1,8 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Rectangle;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Expression;
@@ -15,14 +17,14 @@ public PagePercentage(Scalar percentage) {
     }
 
     @Override
-    public Scalar evaluateIn(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> Scalar evaluateIn(Context context, ExtendGiving<V> direction) {
         Rectangle page = context.getPageRectangle();
-        Scalar screenExtend = direction.extend(page).abs();
+        Scalar screenExtend = direction.extend(page).norm();
         return percentage.times(screenExtend).by(scalar(100));
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
         return String.format("%s%% of page (%spx)", percentage, evaluateIn(context, direction));
     }
 
diff --git a/src/main/java/net/itarray/automotion/internal/properties/PagePercentageOrPixels.java b/src/main/java/net/itarray/automotion/internal/properties/PagePercentageOrPixels.java
@@ -1,6 +1,8 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Expression;
 
@@ -35,15 +37,15 @@ public int hashCode() {
     }
 
     @Override
-    public Scalar evaluateIn(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> Scalar evaluateIn(Context context, ExtendGiving<V> direction) {
         if (context.isPixels()) {
             return constant.evaluateIn(context, direction);
         }
         return pagePercentage.evaluateIn(context, direction);
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
         return constant.getDescription(context, direction);
     }
 }
diff --git a/src/main/java/net/itarray/automotion/internal/properties/PixelConstant.java b/src/main/java/net/itarray/automotion/internal/properties/PixelConstant.java
@@ -1,6 +1,8 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Expression;
 
@@ -13,12 +15,12 @@ public PixelConstant(Scalar value) {
     }
 
     @Override
-    public Scalar evaluateIn(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> Scalar evaluateIn(Context context, ExtendGiving<V> direction) {
         return value;
     }
 
     @Override
-    public String getDescription(Context context, Direction direction) {
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
         return value.toString() + "px";
     }
 
diff --git a/src/main/java/net/itarray/automotion/validation/properties/Condition.java b/src/main/java/net/itarray/automotion/validation/properties/Condition.java
@@ -1,6 +1,8 @@
 package net.itarray.automotion.validation.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.internal.properties.Between;
 import net.itarray.automotion.internal.properties.BinaryScalarConditionWithFixedOperand;
@@ -114,13 +116,13 @@ public Condition<Scalar> and(Expression<Scalar> upperLimit) {
         }
     }
 
-    default boolean isSatisfiedOn(T value, Context context, Direction direction) {
+    default <V extends MetricSpace<V>> boolean isSatisfiedOn(T value, Context context, ExtendGiving<V> direction) {
         return applyTo(new ConstantExpression<T>(value)).evaluateIn(context, direction);
     }
 
     default Expression<Boolean> applyTo(Expression<T> toBeConditioned) {
         return new ConditionedExpression<>(toBeConditioned, this);
     }
 
-    String getDescription(Context context, Direction direction);
+    <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction);
 }
diff --git a/src/main/java/net/itarray/automotion/validation/properties/Expression.java b/src/main/java/net/itarray/automotion/validation/properties/Expression.java
@@ -1,6 +1,7 @@
 package net.itarray.automotion.validation.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
 import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.internal.properties.BinaryExpression;
@@ -43,11 +44,11 @@ static <V extends MetricSpace<V>> Expression<Boolean> equalTo(Expression<V> left
                 "%s to be equal to %s");
     }
 
-    T evaluateIn(Context context, Direction direction);
+    <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V> direction);
 
-    String getDescription(Context context, Direction direction);
+    <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction);
 
-    default String getRepeatedDescription(Context context, Direction direction) {
+    default <V extends MetricSpace<V>> String getRepeatedDescription(Context context, ExtendGiving<V> direction) {
         return getDescription(context, direction);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package net.itarray.automotion.internal.properties;`
`2`	`2`
`3`	`3`	`import net.itarray.automotion.internal.geometry.Direction;`
	`4`	`+import net.itarray.automotion.internal.geometry.ExtendGiving;`
	`5`	`+import net.itarray.automotion.internal.geometry.MetricSpace;`
`4`	`6`	`import net.itarray.automotion.internal.geometry.Scalar;`
`5`	`7`	`import net.itarray.automotion.validation.properties.Condition;`
`6`	`8`	`import net.itarray.automotion.validation.properties.Expression;`
`@@ -20,12 +22,12 @@ public Between(Expression<Scalar> lowerLimit, Expression<Scalar> upperLimit) {`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`@Override`
`23`		`- public boolean isSatisfiedOn(Scalar value, Context context, Direction direction) {`
	`25`	`+ public <V extends MetricSpace<V>> boolean isSatisfiedOn(Scalar value, Context context, ExtendGiving<V> direction) {`
`24`	`26`	`return lowerLimit.isSatisfiedOn(value, context, direction) && upperLimit.isSatisfiedOn(value, context, direction);`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`@Override`
`28`		`- public String getDescription(Context context, Direction direction) {`
	`30`	`+ public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {`
`29`	`31`	`return String.format("between %s and %s", lowerLimitExpression.getDescription(context, direction), upperLimitExpression.getDescription(context, direction));`
`30`	`32`	`}`
`31`	`33`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`import com.webfirmframework.wffweb.tag.html.formatting.S;`
`4`	`4`	`import net.itarray.automotion.internal.geometry.Direction;`
	`5`	`+import net.itarray.automotion.internal.geometry.ExtendGiving;`
	`6`	`+import net.itarray.automotion.internal.geometry.MetricSpace;`
`5`	`7`	`import net.itarray.automotion.internal.geometry.Scalar;`
`6`	`8`	`import net.itarray.automotion.validation.properties.Condition;`
`7`	`9`	`import net.itarray.automotion.validation.properties.Expression;`
`@@ -28,12 +30,12 @@ protected boolean applyTo(Scalar operand, Scalar fixedOperand) {`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`@Override`
`31`		`- public boolean isSatisfiedOn(Scalar value, Context context, Direction direction) {`
	`33`	`+ public <V extends MetricSpace<V>> boolean isSatisfiedOn(Scalar value, Context context, ExtendGiving<V> direction) {`
`32`	`34`	`return applyTo(value, fixedOperand.evaluateIn(context, direction));`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`@Override`
`36`		`- public String getDescription(Context context, Direction direction) {`
	`38`	`+ public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {`
`37`	`39`	`return String.format(toStringFormat, fixedOperand.getDescription(context, direction));`
`38`	`40`	`}`
`39`	`41`
Original file line number	Diff line number	Diff line change
`@@ -24,17 +24,17 @@ public static <V extends MetricSpace<V>> ElementPropertyExpression<V> extend(Ext`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`		`- public T evaluateIn(Context context, Direction direction) {`
	`27`	`+ public <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V> direction) {`
`28`	`28`	`return property.evaluateOn(element);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
`32`		`- public String getDescription(Context context, Direction direction) {`
	`32`	`+ public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {`
`33`	`33`	`return property.getDescriptionFor(element);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public String getRepeatedDescription(Context context, Direction direction) {`
	`37`	`+ public <V extends MetricSpace<V>> String getRepeatedDescription(Context context, ExtendGiving<V> direction) {`
`38`	`38`	`return property.getName();`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package net.itarray.automotion.validation.properties;`
`2`	`2`
`3`	`3`	`import net.itarray.automotion.internal.geometry.Direction;`
	`4`	`+import net.itarray.automotion.internal.geometry.ExtendGiving;`
	`5`	`+import net.itarray.automotion.internal.geometry.MetricSpace;`
`4`	`6`	`import net.itarray.automotion.internal.geometry.Scalar;`
`5`	`7`	`import net.itarray.automotion.internal.properties.Between;`
`6`	`8`	`import net.itarray.automotion.internal.properties.BinaryScalarConditionWithFixedOperand;`
`@@ -114,13 +116,13 @@ public Condition<Scalar> and(Expression<Scalar> upperLimit) {`
`114`	`116`	`}`
`115`	`117`	`}`
`116`	`118`
`117`		`- default boolean isSatisfiedOn(T value, Context context, Direction direction) {`
	`119`	`+ default <V extends MetricSpace<V>> boolean isSatisfiedOn(T value, Context context, ExtendGiving<V> direction) {`
`118`	`120`	`return applyTo(new ConstantExpression<T>(value)).evaluateIn(context, direction);`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`default Expression<Boolean> applyTo(Expression<T> toBeConditioned) {`
`122`	`124`	`return new ConditionedExpression<>(toBeConditioned, this);`
`123`	`125`	`}`
`124`	`126`
`125`		`- String getDescription(Context context, Direction direction);`
	`127`	`+ <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction);`
`126`	`128`	`}`