Scalar min and max

Author: Torsten-Mumme

src/main/java/net/itarray/automotion/internal/geometry/Interval.java

@@ -41,7 +41,7 @@ public boolean isEmpty() {
 
     public Interval intersect(Interval interval) {
         return new Interval(
-                begin.isLessOrEqualTo(interval.begin) ? interval.begin : begin,
-                end.isLessOrEqualTo(interval.end) ? end : interval.end);
+                begin.max(interval.begin),
+                end.min(interval.end));
     }
 }

src/main/java/net/itarray/automotion/internal/geometry/Scalar.java

@@ -98,4 +98,12 @@ public Scalar times(Scalar multiplicator) {
     public Scalar by(Scalar divisor) {
         return new Scalar(fraction.divide(divisor.fraction));
     }
+
+    public Scalar min(Scalar other) {
+        return isLessOrEqualTo(other) ? this : other;
+    }
+
+    public Scalar max(Scalar other) {
+        return isGreaterOrEqualTo(other) ? this : other;
+    }
 }

src/test/java/net/itarray/automotion/tests/geometry/ScalarTest.java

@@ -131,10 +131,41 @@ public void isGreaterThanWorks() {
     }
 
     @Test
-    public void shouldName() {
+    public void minimumWithSmallerScalarReturnsTheSmallerScalar() {
+        assertThat(scalar.min(scalar.minus(1))).isEqualTo(scalar.minus(1));
+    }
+
+    @Test
+    public void minimumWithEqualScalarReturnsTheScalar() {
+        assertThat(scalar.min(scalar)).isEqualTo(scalar);
+    }
+
+    @Test
+    public void minimumWithLargerScalarReturnsTheScalar() {
+        assertThat(scalar.min(scalar.plus(1))).isEqualTo(scalar);
+    }
+
+    @Test
+    public void maximumWithSmallerScalarReturnsTheScalar() {
+        assertThat(scalar.max(scalar.minus(1))).isEqualTo(scalar);
+    }
+
+    @Test
+    public void maximumWithEqualScalarReturnsTheScalar() {
+        assertThat(scalar.max(scalar)).isEqualTo(scalar);
+    }
+
+    @Test
+    public void maximumWithLargerScalarReturnsTheLargerScalar() {
+        assertThat(scalar.max(scalar.plus(1))).isEqualTo(scalar.plus(1));
+    }
+
+    @Test
+    public void satisfies() {
         TestContext context = new TestContext();
         Direction direction = Direction.RIGHT;
         assertThat(scalar.satisfies(Condition.greaterOrEqualTo(value), context, direction)).isTrue();
         assertThat(scalar.satisfies(Condition.greaterOrEqualTo(value+1), context, direction)).isFalse();
     }
 }
+