mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-11-16 02:15:34 -05:00
Interactive Fill ran the best-fit pair phase first. The first pair computation for a drawing can take about a minute, and until it finished the progress dialog showed no layout, Accept stayed disabled and the status text did not change. The fill now packs the part boxes (RectBestFit) before the pair phase and reports that layout, so Accept is available at once. The layout is only a fallback: strategies still run in their usual order, and a completed fill picks the same winner as before. While the pairs are computed, the detail line reads "Computing best-fit pairs (may take a minute)...". Accept or Stop now stops the wait. The computation keeps running in the background and is cached for the next fill. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
164 lines
5.4 KiB
C#
164 lines
5.4 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using OpenNest.Engine;
|
|
using OpenNest.Engine.Jobs.Placement.Fillers;
|
|
using OpenNest.Engine.Strategies;
|
|
using OpenNest.Geometry;
|
|
|
|
namespace OpenNest.Tests.Strategies;
|
|
|
|
public class FillPipelineTests
|
|
{
|
|
private static Drawing MakeRectDrawing(double w, double h, string name = "rect")
|
|
{
|
|
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(name, pgm);
|
|
}
|
|
|
|
[Fact]
|
|
public void Pipeline_PopulatesPhaseResults()
|
|
{
|
|
var plate = new Plate(60, 120);
|
|
var filler = new DefaultPlateFiller(plate);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
|
|
filler.Fill(item, plate.WorkArea(), null, System.Threading.CancellationToken.None);
|
|
|
|
Assert.True(
|
|
filler.PhaseResults.Count >= FillStrategyRegistry.Strategies.Count,
|
|
$"Expected phase results from all active strategies, got {filler.PhaseResults.Count}"
|
|
);
|
|
}
|
|
|
|
[Fact]
|
|
public void Pipeline_SetsWinnerPhase()
|
|
{
|
|
var plate = new Plate(60, 120);
|
|
var filler = new DefaultPlateFiller(plate);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
|
|
var parts = filler.Fill(
|
|
item,
|
|
plate.WorkArea(),
|
|
null,
|
|
System.Threading.CancellationToken.None
|
|
);
|
|
|
|
Assert.True(parts.Count > 0);
|
|
Assert.True(
|
|
filler.WinnerPhase == NestPhase.Pairs
|
|
|| filler.WinnerPhase == NestPhase.Linear
|
|
|| filler.WinnerPhase == NestPhase.RectBestFit
|
|
|| filler.WinnerPhase == NestPhase.Extents
|
|
|| filler.WinnerPhase == NestPhase.Custom
|
|
);
|
|
}
|
|
|
|
[Fact]
|
|
public void Pipeline_RespectsCancellation()
|
|
{
|
|
var plate = new Plate(60, 120);
|
|
var filler = new DefaultPlateFiller(plate);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
var cts = new System.Threading.CancellationTokenSource();
|
|
cts.Cancel();
|
|
|
|
// Pre-cancelled token should return empty or partial results without throwing
|
|
var parts = filler.Fill(item, plate.WorkArea(), null, cts.Token);
|
|
|
|
// Should not throw — graceful degradation
|
|
Assert.NotNull(parts);
|
|
}
|
|
|
|
[Fact]
|
|
public void Pipeline_ReportsBoxLayoutBeforeBestFitPairs()
|
|
{
|
|
var plate = new Plate(60, 120);
|
|
var filler = new DefaultPlateFiller(plate);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
var reports = new List<NestProgress>();
|
|
|
|
filler.Fill(item, plate.WorkArea(), new SyncProgress(reports.Add), CancellationToken.None);
|
|
|
|
var first = reports.First();
|
|
Assert.True(first.IsOverallBest);
|
|
Assert.Equal(NestPhase.RectBestFit, first.Phase);
|
|
Assert.NotEmpty(first.BestParts);
|
|
}
|
|
|
|
[Fact]
|
|
public void Pipeline_ReportsStatusWhileComputingBestFitPairs()
|
|
{
|
|
var plate = new Plate(60, 120);
|
|
var filler = new DefaultPlateFiller(plate);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
var reports = new List<NestProgress>();
|
|
|
|
filler.Fill(item, plate.WorkArea(), new SyncProgress(reports.Add), CancellationToken.None);
|
|
|
|
var status = Assert.Single(reports, p => p.Description?.StartsWith("Computing best-fit pairs") == true);
|
|
Assert.Equal(NestPhase.Pairs, status.Phase);
|
|
Assert.False(status.IsOverallBest);
|
|
Assert.Equal(reports.First().BestParts.Count, status.BestParts.Count);
|
|
}
|
|
|
|
[Fact]
|
|
public void Pipeline_AcceptedBeforeBestFitPairs_ReturnsBoxLayout()
|
|
{
|
|
var plate = new Plate(60, 120);
|
|
var filler = new DefaultPlateFiller(plate);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
using var cts = new CancellationTokenSource();
|
|
NestProgress first = null;
|
|
|
|
var parts = filler.Fill(
|
|
item,
|
|
plate.WorkArea(),
|
|
new SyncProgress(p =>
|
|
{
|
|
first ??= p;
|
|
cts.Cancel();
|
|
}),
|
|
cts.Token
|
|
);
|
|
|
|
Assert.Equal(NestPhase.RectBestFit, filler.WinnerPhase);
|
|
Assert.Equal(first.BestParts.Count, parts.Count);
|
|
}
|
|
|
|
[Fact]
|
|
public void Pipeline_ShownLayoutNeverRegressesBelowBoxLayout()
|
|
{
|
|
var plate = new Plate(60, 120);
|
|
var filler = new DefaultPlateFiller(plate);
|
|
var item = new NestItem { Drawing = MakeRectDrawing(20, 10) };
|
|
var shown = new List<int>();
|
|
|
|
filler.Fill(
|
|
item,
|
|
plate.WorkArea(),
|
|
new SyncProgress(p =>
|
|
{
|
|
if (p.IsOverallBest)
|
|
shown.Add(p.BestParts.Count);
|
|
}),
|
|
CancellationToken.None
|
|
);
|
|
|
|
for (var i = 1; i < shown.Count; i++)
|
|
Assert.True(shown[i] >= shown[0], $"Report {i} showed {shown[i]} < {shown[0]} parts");
|
|
}
|
|
|
|
private sealed class SyncProgress(Action<NestProgress> report) : IProgress<NestProgress>
|
|
{
|
|
public void Report(NestProgress value) => report(value);
|
|
}
|
|
}
|