Additional post merge cleanup

Author: JimBobSquarePants

PolygonClipper.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.12.35707.178 d17.12
+VisualStudioVersion = 17.12.35707.178
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolygonClipper", "src\PolygonClipper\PolygonClipper.csproj", "{3C8D945E-6074-437E-B6EA-237BD0C80411}"
 EndProject
@@ -74,4 +74,8 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2C73BEEC-091B-45E4-A0BD-7D7CD16A8451}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{3c8d945e-6074-437e-b6ea-237bd0c80411}*SharedItemsImports = 5
+		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
+	EndGlobalSection
 EndGlobal

src/PolygonClipper/Contour.cs

@@ -2,7 +2,6 @@
 // Licensed under the Six Labors Split License.
 
 using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 

src/PolygonClipper/Polygon.cs

@@ -2,7 +2,6 @@
 // Licensed under the Six Labors Split License.
 
 using System.Collections;
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
 namespace SixLabors.PolygonClipper;

src/PolygonClipper/PolygonClipper.cs

@@ -208,7 +208,7 @@ public Polygon Run()
             if (sweepEvent.Left)
             {
                 // Insert the event into the status line and get neighbors
-                int it = sweepEvent.PosSL = statusLine.Insert(sweepEvent);
+                int it = sweepEvent.PosSL = statusLine.Add(sweepEvent);
                 prevEvent = statusLine.Prev(it);
                 nextEvent = statusLine.Next(it);
 
@@ -428,13 +428,13 @@ private static void ComputeFields(SweepEvent le, SweepEvent? prev, BooleanOperat
         {
             // Previous line segment in sl belongs to a different polygon that "se" belongs to.
             le.InOut = !prev.OtherInOut;
-            le.OtherInOut = prev.Vertical() ? !prev.InOut : prev.InOut;
+            le.OtherInOut = prev.IsVertical() ? !prev.InOut : prev.InOut;
         }
 
         // Compute PrevInResult field
         if (prev != null)
         {
-            le.PrevInResult = (!InResult(prev, operation) || prev.Vertical())
+            le.PrevInResult = (!InResult(prev, operation) || prev.IsVertical())
                 ? prev.PrevInResult
                 : prev;
         }
@@ -562,8 +562,8 @@ private static int PossibleIntersection(
 
         // Point intersections
         int nIntersections = PolygonUtilities.FindIntersection(
-            le1.Segment(),
-            le2.Segment(),
+            le1.GetSegment(),
+            le2.GetSegment(),
             out Vertex ip1,
             out Vertex _); // Currently unused but could be used to detect collinear overlapping segments
 

src/PolygonClipper/SegmentComparer.cs

@@ -56,7 +56,7 @@ public int Compare(SweepEvent? x, SweepEvent? y)
             // If they share their left endpoint, use the right endpoint to sort
             if (perhapsInversedX.Point == perhapsInversedY.Point)
             {
-                return LessIf(perhapsInversedX.Below(perhapsInversedY.OtherEvent.Point), inversed);
+                return LessIf(perhapsInversedX.IsBelow(perhapsInversedY.OtherEvent.Point), inversed);
             }
 
             // Different left endpoints: use the y-coordinate to sort if x-coordinates are the same

src/PolygonClipper/StablePriorityQueue{T,TComparer}.cs

@@ -17,8 +17,18 @@ internal sealed class StablePriorityQueue<T, TComparer>
     where TComparer : IComparer<T>
 {
     private const int Log2Arity = 2;
+    private const int DefaultCapacity = 16;
     private readonly List<T> heap;
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StablePriorityQueue{T, TComparer}"/> class with a specified comparer.
+    /// </summary>
+    /// <param name="comparer">The comparer to determine the priority of the elements.</param>
+    public StablePriorityQueue(TComparer comparer)
+       : this(comparer, DefaultCapacity)
+    {
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="StablePriorityQueue{T, TComparer}"/> class with a specified comparer.
     /// </summary>
@@ -27,7 +37,7 @@ internal sealed class StablePriorityQueue<T, TComparer>
     public StablePriorityQueue(TComparer comparer, int capacity)
     {
         this.Comparer = comparer ?? throw new ArgumentNullException(nameof(comparer));
-        this.heap = new List<T>(capacity > 0 ? capacity : 16);
+        this.heap = new List<T>(capacity > 0 ? capacity : DefaultCapacity);
     }
 
     /// <summary>

src/PolygonClipper/StatusLine.cs

@@ -25,11 +25,17 @@ namespace SixLabors.PolygonClipper;
 [DebuggerDisplay("Count = {Count}")]
 internal sealed class StatusLine
 {
+    private const int DefaultCapacity = 16;
     private readonly List<SweepEvent> sortedEvents;
     private readonly SegmentComparer comparer = new();
 
+    public StatusLine()
+        : this(DefaultCapacity)
+    {
+    }
+
     public StatusLine(int capacity)
-        => this.sortedEvents = new List<SweepEvent>(capacity > 0 ? capacity : 16);
+        => this.sortedEvents = new List<SweepEvent>(capacity > 0 ? capacity : DefaultCapacity);
 
     /// <summary>
     /// Gets the number of events in the status line.
@@ -40,6 +46,24 @@ public int Count
         get => this.sortedEvents.Count;
     }
 
+    /// <summary>
+    /// Gets the minimum sweep event in the status line (first in sort order).
+    /// </summary>
+    public SweepEvent Min
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get => this.sortedEvents[0];
+    }
+
+    /// <summary>
+    /// Gets the maximum sweep event in the status line (last in sort order).
+    /// </summary>
+    public SweepEvent Max
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get => this.sortedEvents[^1];
+    }
+
     /// <summary>
     /// Gets the event at the specified index.
     /// </summary>
@@ -52,11 +76,11 @@ public SweepEvent this[int index]
     }
 
     /// <summary>
-    /// Inserts a sweep event into the status line, maintaining sorted order.
+    /// Adds a sweep event into the status line, maintaining sorted order.
     /// </summary>
     /// <param name="e">The sweep event to insert.</param>
     /// <returns>The index where the event was inserted.</returns>
-    public int Insert(SweepEvent e)
+    public int Add(SweepEvent e)
     {
         int index = this.sortedEvents.BinarySearch(e, this.comparer);
         if (index < 0)

src/PolygonClipper/SweepEvent.cs

@@ -152,7 +152,7 @@ public SweepEvent(Vertex point, bool left, int contourId)
     /// <see langword="true"/> if the line segment is below the point; otherwise <see langword="false"/>.
     /// </returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool Below(in Vertex p)
+    public bool IsBelow(in Vertex p)
         => this.Left
         ? PolygonUtilities.SignedArea(this.Point, this.OtherEvent.Point, p) > 0D
         : PolygonUtilities.SignedArea(this.OtherEvent.Point, this.Point, p) > 0D;
@@ -165,7 +165,7 @@ public bool Below(in Vertex p)
     /// <see langword="true"/> if the line segment is above the point; otherwise <see langword="false"/>.
     /// </returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool Above(in Vertex p) => !this.Below(p);
+    public bool IsAbove(in Vertex p) => !this.IsBelow(p);
 
     /// <summary>
     /// Is the line segment (point, otherEvent->point) a vertical line segment.
@@ -174,7 +174,7 @@ public bool Below(in Vertex p)
     /// <see langword="true"/> if the line segment is vertical; otherwise <see langword="false"/>.
     /// </returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool Vertical() => this.Point.X == this.OtherEvent.Point.X;
+    public bool IsVertical() => this.Point.X == this.OtherEvent.Point.X;
 
     /// <summary>
     /// Determines if this sweep event comes before another sweep event.
@@ -199,7 +199,7 @@ public bool IsBefore(SweepEvent other)
     /// <summary>
     /// Returns the segment associated with the sweep event.
     /// </summary>
-    /// <returns>The <see cref="Segment"/>.</returns>
+    /// <returns>The <see cref="GetSegment"/>.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Segment Segment() => new(this.Point, this.OtherEvent.Point);
+    public Segment GetSegment() => new(this.Point, this.OtherEvent.Point);
 }

src/PolygonClipper/SweepEventComparer.cs

@@ -50,7 +50,7 @@ public int Compare(SweepEvent? x, SweepEvent? y)
         double area = PolygonUtilities.SignedArea(x.Point, x.OtherEvent.Point, y.OtherEvent.Point);
         if (area != 0)
         {
-            return x.Below(y.OtherEvent.Point) ? -1 : 1;
+            return x.IsBelow(y.OtherEvent.Point) ? -1 : 1;
         }
 
         // Compare by polygon type: subject polygons have higher priority

tests/PolygonClipper.Benchmarks/Program.cs

@@ -5,7 +5,7 @@
 
 namespace SixLabors.PolygonClipper.Benchmarks;
 
-internal class Program
+internal sealed class Program
 {
     public static void Main(string[] args)
         => BenchmarkSwitcher