feat: add IFillComparer interface and DefaultFillComparer

Extracts the fill result scoring contract into IFillComparer with a DefaultFillComparer implementation that preserves the existing count-then-density lexicographic ranking via FillScore.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-03-21 12:36:04 -04:00
parent 0ec22f2207
commit f894ffd27c
3 changed files with 102 additions and 0 deletions

View File

@@ -0,0 +1,23 @@
using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Engine.Fill
{
/// <summary>
/// Ranks fill results by count first, then density.
/// This is the original scoring logic used by DefaultNestEngine.
/// </summary>
public class DefaultFillComparer : IFillComparer
{
public bool IsBetter(List<Part> candidate, List<Part> current, Box workArea)
{
if (candidate == null || candidate.Count == 0)
return false;
if (current == null || current.Count == 0)
return true;
return FillScore.Compute(candidate, workArea) > FillScore.Compute(current, workArea);
}
}
}

View File

@@ -0,0 +1,14 @@
using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Engine
{
/// <summary>
/// Determines whether a candidate fill result is better than the current best.
/// Implementations must be stateless and thread-safe.
/// </summary>
public interface IFillComparer
{
bool IsBetter(List<Part> candidate, List<Part> current, Box workArea);
}
}

View File

@@ -0,0 +1,65 @@
using OpenNest.Engine;
using OpenNest.Engine.Fill;
using OpenNest.Geometry;
namespace OpenNest.Tests;
public class DefaultFillComparerTests
{
private readonly IFillComparer comparer = new DefaultFillComparer();
private readonly Box workArea = new(0, 0, 100, 100);
[Fact]
public void NullCandidate_ReturnsFalse()
{
var current = new List<Part> { TestHelpers.MakePartAt(0, 0, 10) };
Assert.False(comparer.IsBetter(null, current, workArea));
}
[Fact]
public void EmptyCandidate_ReturnsFalse()
{
var current = new List<Part> { TestHelpers.MakePartAt(0, 0, 10) };
Assert.False(comparer.IsBetter(new List<Part>(), current, workArea));
}
[Fact]
public void NullCurrent_ReturnsTrue()
{
var candidate = new List<Part> { TestHelpers.MakePartAt(0, 0, 10) };
Assert.True(comparer.IsBetter(candidate, null, workArea));
}
[Fact]
public void HigherCount_Wins()
{
var candidate = new List<Part>
{
TestHelpers.MakePartAt(0, 0, 10),
TestHelpers.MakePartAt(20, 0, 10),
TestHelpers.MakePartAt(40, 0, 10)
};
var current = new List<Part>
{
TestHelpers.MakePartAt(0, 0, 10),
TestHelpers.MakePartAt(20, 0, 10)
};
Assert.True(comparer.IsBetter(candidate, current, workArea));
}
[Fact]
public void SameCount_HigherDensityWins()
{
var candidate = new List<Part>
{
TestHelpers.MakePartAt(0, 0, 10),
TestHelpers.MakePartAt(12, 0, 10)
};
var current = new List<Part>
{
TestHelpers.MakePartAt(0, 0, 10),
TestHelpers.MakePartAt(50, 0, 10)
};
Assert.True(comparer.IsBetter(candidate, current, workArea));
}
}