mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-11-07 13:05:52 -05:00
DefaultPlateNester, StripPlateNester and RemnantPlateNester differed only in the filler they built. They are replaced by one internal PlateNester over a Func<Plate, PlateFiller>, which keeps the old Place exactly: restricted rotation goes to OrderedPlateNester, and each trial gets a fresh private plate and filler. PlacementStrategies maps Fill (and its legacy "Default" alias), Strip and both Remnants to a filler policy and layout. PlateNesterFactory reads it case-sensitively and PlateFillService ignores case, as before; each keeps its own error type and message. Nothing outside the Engine and its tests used the three public nester types, so they are removed. No layout changes: all 29 fill-stack pins pass with the pin file untouched. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
151 lines
5.1 KiB
C#
151 lines
5.1 KiB
C#
using OpenNest.CNC;
|
|
using OpenNest.Engine.Jobs;
|
|
using OpenNest.Engine.Jobs.Placement;
|
|
using OpenNest.Engine.Jobs.Placement.Fillers;
|
|
using OpenNest.Geometry;
|
|
|
|
namespace OpenNest.Engine.Tests.Jobs;
|
|
|
|
public class NestJobCancellationTests
|
|
{
|
|
[Fact]
|
|
public void PreTrialCancellationSkipsCandidateWorkAndPreservesInput()
|
|
{
|
|
using var cancellation = new CancellationTokenSource();
|
|
cancellation.Cancel();
|
|
var nester = new CancellableNester(_ => new PlateCandidate(
|
|
Array.Empty<NestJobPlacement>()
|
|
));
|
|
var part = new NestJobPart(
|
|
"part",
|
|
PartGeometrySnapshot.FromProgram(TestDrawingFactory.Rectangle(4, 3)),
|
|
1
|
|
);
|
|
var sourceGeometry = part.Geometry.Motions.ToArray();
|
|
var stock = new NestPlateStock("stock", new Size(20, 30), 1);
|
|
var job = new NestJob(new[] { part }, new[] { stock });
|
|
|
|
Assert.Throws<OperationCanceledException>(() =>
|
|
new NestJobRunner(_ => nester).Solve(job, token: cancellation.Token)
|
|
);
|
|
|
|
Assert.Equal(0, nester.Calls);
|
|
Assert.Equal(sourceGeometry, job.Parts[0].Geometry.Motions);
|
|
Assert.Equal(1, job.Parts[0].Quantity);
|
|
Assert.Equal(1, job.Plates[0].Quantity);
|
|
}
|
|
|
|
[Fact]
|
|
public void CancellationDuringCandidateThrowsWithoutCommitOrInputMutation()
|
|
{
|
|
using var cancellation = new CancellationTokenSource();
|
|
var reports = new List<NestJobProgress>();
|
|
var part = new NestJobPart(
|
|
"part",
|
|
PartGeometrySnapshot.FromProgram(TestDrawingFactory.Rectangle(4, 3)),
|
|
1
|
|
);
|
|
var sourceGeometry = part.Geometry.Motions.ToArray();
|
|
var stock = new NestPlateStock("stock", new Size(20, 30), 1);
|
|
var job = new NestJob(new[] { part }, new[] { stock });
|
|
var nester = new CancellableNester(
|
|
(_, token) =>
|
|
{
|
|
cancellation.Cancel();
|
|
token.ThrowIfCancellationRequested();
|
|
return new PlateCandidate(Array.Empty<NestJobPlacement>());
|
|
}
|
|
);
|
|
|
|
Assert.Throws<OperationCanceledException>(() =>
|
|
new NestJobRunner(_ => nester).Solve(
|
|
job,
|
|
new InlineProgress(reports.Add),
|
|
cancellation.Token
|
|
)
|
|
);
|
|
|
|
Assert.Equal(1, nester.Calls);
|
|
Assert.DoesNotContain(reports, report => report.Stage == NestJobStage.PlateCommitted);
|
|
Assert.Equal(sourceGeometry, job.Parts[0].Geometry.Motions);
|
|
Assert.Equal(1, job.Parts[0].Quantity);
|
|
Assert.Equal(1, job.Plates[0].Quantity);
|
|
}
|
|
|
|
[Fact]
|
|
public void LegacyProgressIsWrappedWithCurrentCandidateContext()
|
|
{
|
|
var reports = new List<NestJobProgress>();
|
|
var part = new NestJobPart(
|
|
"part",
|
|
PartGeometrySnapshot.FromProgram(TestDrawingFactory.Rectangle(4, 3)),
|
|
1
|
|
);
|
|
var job = new NestJob(
|
|
new[] { part },
|
|
new[] { new NestPlateStock("stock", new Size(20, 30), 1) }
|
|
);
|
|
var runner = new NestJobRunner(_ => new PlateNester(plate => new ReportingFiller(
|
|
plate
|
|
)));
|
|
|
|
var result = runner.Solve(job, new InlineProgress(reports.Add));
|
|
|
|
Assert.Equal(NestJobStopReason.NoPlacementFound, result.StopReason);
|
|
var legacy = Assert.Single(reports.Where(report => report.LegacyProgress != null));
|
|
Assert.Equal(NestJobStage.EvaluatingCandidate, legacy.Stage);
|
|
Assert.Equal("stock", legacy.StockId);
|
|
Assert.Equal(0, legacy.PlateIndex);
|
|
Assert.Equal(0, legacy.CommittedPlates);
|
|
Assert.Equal(0, legacy.CommittedParts);
|
|
Assert.Equal("legacy detail", legacy.LegacyProgress!.Description);
|
|
}
|
|
|
|
private sealed class InlineProgress(Action<NestJobProgress> report) : IProgress<NestJobProgress>
|
|
{
|
|
public void Report(NestJobProgress value) => report(value);
|
|
}
|
|
|
|
private sealed class CancellableNester : IPlateNester
|
|
{
|
|
private readonly Func<PlatePlacementRequest, CancellationToken, PlateCandidate> place;
|
|
|
|
public CancellableNester(Func<PlatePlacementRequest, PlateCandidate> place)
|
|
{
|
|
this.place = (request, _) => place(request);
|
|
}
|
|
|
|
public CancellableNester(
|
|
Func<PlatePlacementRequest, CancellationToken, PlateCandidate> place
|
|
)
|
|
{
|
|
this.place = place;
|
|
}
|
|
|
|
public int Calls { get; private set; }
|
|
|
|
public PlateCandidate Place(
|
|
PlatePlacementRequest request,
|
|
IProgress<NestJobProgress>? progress = null,
|
|
CancellationToken token = default
|
|
)
|
|
{
|
|
Calls++;
|
|
return place(request, token);
|
|
}
|
|
}
|
|
|
|
private sealed class ReportingFiller(Plate plate) : PlateFiller(plate)
|
|
{
|
|
public override List<Part> Nest(
|
|
List<NestItem> items,
|
|
IProgress<NestProgress>? progress,
|
|
CancellationToken token
|
|
)
|
|
{
|
|
progress?.Report(new NestProgress { Description = "legacy detail" });
|
|
return new List<Part>();
|
|
}
|
|
}
|
|
}
|