feat: Range improvements

servicetitan · Oct 23, 2023 · 9ff4489 · 9ff4489
1 parent c228d79
commit 9ff4489
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/Stl/Mathematics/Range.cs b/src/Stl/Mathematics/Range.cs
@@ -30,6 +30,8 @@ namespace Stl.Mathematics;
     public bool IsEmpty => EqualityComparer<T>.Default.Equals(Start, End);
     [JsonIgnore, Newtonsoft.Json.JsonIgnore, IgnoreDataMember, MemoryPackIgnore]
     public bool IsNegative => Comparer<T>.Default.Compare(Start, End) > 0;
+    [JsonIgnore, Newtonsoft.Json.JsonIgnore, IgnoreDataMember, MemoryPackIgnore]
+    public bool IsEmptyOrNegative => Comparer<T>.Default.Compare(Start, End) >= 0;
 
     /// <summary>
     /// Creates a new range.

diff --git a/src/Stl/Mathematics/TileLayer.cs b/src/Stl/Mathematics/TileLayer.cs
@@ -63,6 +63,9 @@ public void AssertIsTile(Range<T> range)
 
     public Tile<T>[] GetCoveringTiles(Range<T> range)
     {
+        if (range.IsEmptyOrNegative)
+            return Array.Empty<Tile<T>>();
+
         var tiles = ArrayBuffer<Tile<T>>.Lease(true);
         try {
             GetCoveringTiles(range, ref tiles);
@@ -104,6 +107,8 @@ private void GetOptimalCoveringTiles(Range<T> range, ref ArrayBuffer<Tile<T>> ap
             GetCoveringTiles(range, ref appendTo);
             return;
         }
+        if (range.IsEmptyOrNegative)
+            return;
 
         var tiles = ArrayBuffer<Tile<T>>.Lease(true);
         try {

diff --git a/tests/Stl.Tests/Mathematics/TileStackTest.cs b/tests/Stl.Tests/Mathematics/TileStackTest.cs
@@ -63,6 +63,11 @@ public void LongTileStackTest()
         s.TryGetSmallestCoveringTile((-17, 0), out tile).Should().BeTrue();
         tile.Should().Be(new Tile<long>(-64, 0, layer1));
 
+        layer0.GetCoveringTiles((0, 0)).Should().BeEmpty();
+        layer0.GetCoveringTiles((0, -1)).Should().BeEmpty();
+        layer0.GetCoveringTiles((-16, -16)).Should().BeEmpty();
+        layer0.GetCoveringTiles((-16, -17)).Should().BeEmpty();
+
         layer0.GetCoveringTiles((-1, 1)).Select(t => t.Range)
             .Should()
             .BeEquivalentTo(new Range<long>[] {
@@ -77,6 +82,10 @@ public void LongTileStackTest()
                 (0, 64),
             });
 
+        s.GetOptimalCoveringTiles((0, 0)).Should().BeEmpty();
+        s.GetOptimalCoveringTiles((0, -1)).Should().BeEmpty();
+        s.GetOptimalCoveringTiles((16, -1000)).Should().BeEmpty();
+
         s.GetOptimalCoveringTiles((-17, 257)).Select(t => t.Range)
             .Should()
             .BeEquivalentTo(new Range<long>[] {