AJ Isaacs
e969260f3d
PairFiller now returns PairFillResult (Parts + BestFits) instead of using a mutable BestFits property. Extracted EvaluateCandidates, TryReduceWorkArea, and BuildTilingAngles for clarity. Simplified the candidate loop by leveraging FillScore comparison semantics. Removed FillRemainingStrip and all its helpers (FindPlacedEdge, BuildRemainingStrip, BuildRotationSet, FindBestFill, TryFewerRows, RemainderPatterns) from FillLinear — these were a major bottleneck in strip nesting, running expensive fills on undersized remnant strips. ShrinkFiller + RemnantFiller already handle space optimization, making the remainder strip fill redundant. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
63 lines
1.9 KiB
C#
63 lines
1.9 KiB
C#
using OpenNest.Engine.Fill;
|
|
using OpenNest.Geometry;
|
|
|
|
namespace OpenNest.Tests;
|
|
|
|
public class PairFillerTests
|
|
{
|
|
private static Drawing MakeRectDrawing(double w, double h)
|
|
{
|
|
var pgm = new OpenNest.CNC.Program();
|
|
pgm.Codes.Add(new OpenNest.CNC.RapidMove(new Vector(0, 0)));
|
|
pgm.Codes.Add(new OpenNest.CNC.LinearMove(new Vector(w, 0)));
|
|
pgm.Codes.Add(new OpenNest.CNC.LinearMove(new Vector(w, h)));
|
|
pgm.Codes.Add(new OpenNest.CNC.LinearMove(new Vector(0, h)));
|
|
pgm.Codes.Add(new OpenNest.CNC.LinearMove(new Vector(0, 0)));
|
|
return new Drawing("rect", pgm);
|
|
}
|
|
|
|
[Fact]
|
|
public void Fill_ReturnsPartsForSimpleDrawing()
|
|
{
|
|
var plateSize = new Size(120, 60);
|
|
var filler = new PairFiller(plateSize, 0.5);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
var workArea = new Box(0, 0, 120, 60);
|
|
|
|
var result = filler.Fill(item, workArea);
|
|
|
|
Assert.NotNull(result.Parts);
|
|
Assert.NotNull(result.BestFits);
|
|
}
|
|
|
|
[Fact]
|
|
public void Fill_EmptyResult_WhenPartTooLarge()
|
|
{
|
|
var plateSize = new Size(10, 10);
|
|
var filler = new PairFiller(plateSize, 0.5);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 20) };
|
|
var workArea = new Box(0, 0, 10, 10);
|
|
|
|
var result = filler.Fill(item, workArea);
|
|
|
|
Assert.NotNull(result.Parts);
|
|
Assert.Empty(result.Parts);
|
|
}
|
|
|
|
[Fact]
|
|
public void Fill_RespectsCancellation()
|
|
{
|
|
var cts = new System.Threading.CancellationTokenSource();
|
|
cts.Cancel();
|
|
|
|
var plateSize = new Size(120, 60);
|
|
var filler = new PairFiller(plateSize, 0.5);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
var workArea = new Box(0, 0, 120, 60);
|
|
|
|
var result = filler.Fill(item, workArea, token: cts.Token);
|
|
|
|
Assert.NotNull(result.Parts);
|
|
}
|
|
}
|