convenience factory interval(int, int)

Author: Torsten-Mumme

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

@@ -2,6 +2,8 @@
 
 import java.util.Objects;
 
+import static net.itarray.automotion.internal.geometry.Scalar.scalar;
+
 public abstract class Interval {
 
     private Interval() {
@@ -14,6 +16,10 @@ public static Interval interval(Scalar begin, Scalar end) {
         return new NonEmpty(begin, end);
     }
 
+    public static Interval interval(int begin, int end) {
+        return interval(scalar(begin), scalar(end));
+    }
+
     private static String format(String begin, String end) {
         return String.format("[%s, %s[", begin, end);
     }

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

@@ -1,21 +1,19 @@
 package net.itarray.automotion.tests.geometry;
 
 import net.itarray.automotion.internal.geometry.Interval;
-import net.itarray.automotion.internal.geometry.Scalar;
 import org.junit.Test;
 
 import static net.itarray.automotion.internal.geometry.Interval.interval;
-import static net.itarray.automotion.internal.geometry.Scalar.scalar;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ContainedIntervalsTest extends TwoIntervalsTest{
 
     public Interval left() {
-        return interval(scalar(12), scalar(15));
+        return interval(12, 15);
     }
 
     public Interval right() {
-        return interval(scalar(20), scalar(20));
+        return interval(20, 20);
     }
 
     @Test

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

@@ -1,21 +1,19 @@
 package net.itarray.automotion.tests.geometry;
 
 import net.itarray.automotion.internal.geometry.Interval;
-import net.itarray.automotion.internal.geometry.Scalar;
 import org.junit.Test;
 
 import static net.itarray.automotion.internal.geometry.Interval.interval;
-import static net.itarray.automotion.internal.geometry.Scalar.scalar;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class DisjointIntervalsTest extends TwoIntervalsTest{
 
     public Interval left() {
-        return interval(scalar(2), scalar(8));
+        return interval(2, 8);
     }
 
     public Interval right() {
-        return interval(scalar(10), scalar(17));
+        return interval(10, 17);
     }
 
     @Test
@@ -25,7 +23,7 @@ public void haveEmptyIntersection() {
 
     @Test
     public void haveSpanFromSmallestBeginToLargestEnd() {
-        Interval span = interval(scalar(2), scalar(17));
+        Interval span = interval(2, 17);
         assertThat(right().span(left())).isEqualTo(span);
         assertThat(left().span(right())).isEqualTo(span);
     }

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

@@ -1,31 +1,29 @@
 package net.itarray.automotion.tests.geometry;
 
 import net.itarray.automotion.internal.geometry.Interval;
-import net.itarray.automotion.internal.geometry.Scalar;
 import org.junit.Test;
 
 import static net.itarray.automotion.internal.geometry.Interval.interval;
-import static net.itarray.automotion.internal.geometry.Scalar.scalar;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class EmptyAndNonEmptyIntervalsTest extends TwoIntervalsTest{
 
     public Interval left() {
-        return interval(scalar(12), scalar(15));
+        return interval(12, 15);
     }
 
     public Interval right() {
-        return interval(scalar(10), scalar(17));
+        return interval(10, 17);
     }
 
     @Test
     public void haveIntersectionBeginningAtLargerStartAndEndingAtSmallerEnd() {
-        assertThat(right().intersect(left())).isEqualTo(interval(scalar(12), scalar(15)));
+        assertThat(right().intersect(left())).isEqualTo(interval(12, 15));
     }
 
     @Test
     public void haveSpanFromSmallestBeginToLargestEnd() {
-        Interval span = interval(scalar(10), scalar(17));
+        Interval span = interval(10, 17);
         assertThat(right().span(left())).isEqualTo(span);
         assertThat(left().span(right())).isEqualTo(span);
     }

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

@@ -29,13 +29,13 @@ public void isEmpty() {
 
     @Test
     public void isEqualToIntervalsOtherEmptyIntervals() {
-        assertThat(interval).isEqualTo(interval(scalar(100), scalar(99)));
-        assertThat(interval.hashCode()).isEqualTo(interval(scalar(100), scalar(99)).hashCode());
+        assertThat(interval).isEqualTo(interval(100, 99));
+        assertThat(interval.hashCode()).isEqualTo(interval(100, 99).hashCode());
     }
 
     @Test
     public void isNotEqualToNonEmptyIntervals() {
-        assertThat(interval).isNotEqualTo(interval(scalar(10), scalar(20)));
+        assertThat(interval).isNotEqualTo(interval(10, 20));
     }
 
 }

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

@@ -1,30 +1,28 @@
 package net.itarray.automotion.tests.geometry;
 
 import net.itarray.automotion.internal.geometry.Interval;
-import net.itarray.automotion.internal.geometry.Scalar;
 import org.junit.Test;
 
 import static net.itarray.automotion.internal.geometry.Interval.interval;
-import static net.itarray.automotion.internal.geometry.Scalar.scalar;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class OverlappingIntervalsTest extends TwoIntervalsTest{
 
     public Interval left() {
-        return interval(scalar(2), scalar(12));
+        return interval(2, 12);
     }
 
     public Interval right() {
-        return interval(scalar(10), scalar(17));
+        return interval(10, 17);
     }
 
     @Test
     public void haveIntersectionBeginningAtLargerStartAndEndingAtSmallerEnd() {
-        assertThat(right().intersect(left())).isEqualTo(interval(scalar(10), scalar(12)));
+        assertThat(right().intersect(left())).isEqualTo(interval(10, 12));
     }
     @Test
     public void haveSpanFromSmallestBeginToLargestEnd() {
-        Interval span = interval(scalar(2), scalar(17));
+        Interval span = interval(2, 17);
         assertThat(right().span(left())).isEqualTo(span);
         assertThat(left().span(right())).isEqualTo(span);
     }

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

@@ -1,21 +1,19 @@
 package net.itarray.automotion.tests.geometry;
 
 import net.itarray.automotion.internal.geometry.Interval;
-import net.itarray.automotion.internal.geometry.Scalar;
 import org.junit.Test;
 
 import static net.itarray.automotion.internal.geometry.Interval.interval;
-import static net.itarray.automotion.internal.geometry.Scalar.scalar;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TouchingIntervalsTest extends TwoIntervalsTest{
 
     public Interval left() {
-        return interval(scalar(2), scalar(10));
+        return interval(2, 10);
     }
 
     public Interval right() {
-        return interval(scalar(10), scalar(17));
+        return interval(10, 17);
     }
 
     @Test
@@ -25,7 +23,7 @@ public void haveEmptyIntersection() {
 
     @Test
     public void haveSpanFromSmallestBeginToLargestEnd() {
-        Interval span = interval(scalar(2), scalar(17));
+        Interval span = interval(2, 17);
         assertThat(right().span(left())).isEqualTo(span);
         assertThat(left().span(right())).isEqualTo(span);
     }