mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-10-26 23:11:07 -04:00
ajandClaude Opus 5.5
5761eefd37
DefaultPlateFiller becomes PlateFiller(plate, policy, layout); PlateFillerBase and StripPlateFiller are gone. PlateLayout.FillThenPack is the old orchestrator path (Fill and both Remnants); PlateLayout.Strips is the old StripPlateFiller.Nest, and Strip is Fill policy plus Strips layout. Lifetimes are unchanged: a strip-layout filler runs every Fill, group Fill and PackArea on a fresh inner filler and gives each strip fresh remnant fillers, so learned angles and PlateNumber never leak into them. The comparer, preferred direction, trim axis and angle recording now read the policy directly. The base class's unsorted two-angle BuildAngles is dropped: only DefaultPlateFiller's pipeline called BuildAngles, and Strip never ran it. Layout-neutral: all 29 FillStackCharacterizationTests pins pass unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
68 lines
3.0 KiB
C#
68 lines
3.0 KiB
C#
using System;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
|
|
using OpenNest.Engine.Jobs.Adapters;
|
|
using OpenNest.Engine.Jobs.Placement.Fillers;
|
|
namespace OpenNest.Engine.Jobs.Placement;
|
|
|
|
/// <summary>
|
|
/// Built-in placement strategy for the whole-job runner. Runs a <see cref="PlateFiller"/> with the
|
|
/// <see cref="PlateLayout.Strips"/> layout (iterative shrink-fill strips, then a pack)
|
|
/// with the same run-scoped bookkeeping as
|
|
/// <see cref="DefaultPlateNester"/>: remaining demand is read from the request and placement counts
|
|
/// are derived from returned placements.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The identity/progress boundary mechanics live in <see cref="CandidatePlacementContext"/>: a private
|
|
/// <see cref="Drawing"/> per requirement is created once per solve and reused across trials
|
|
/// (safe: the filler mutates per-trial <see cref="NestItem.Quantity"/> and canonical copies, never the
|
|
/// shared Drawing). Identity is by Drawing reference. Each trial gets a fresh private <see cref="Plate"/>.
|
|
/// </remarks>
|
|
public sealed class StripPlateNester : IPlateNester
|
|
{
|
|
private readonly Func<Plate, PlateFiller> fillerFactory;
|
|
private readonly OrderedPlateNester restrictedRotationNester = new();
|
|
private readonly CandidatePlacementContext context = new();
|
|
|
|
public StripPlateNester()
|
|
: this(static plate => new PlateFiller(plate, PlateFillPolicy.Fill, PlateLayout.Strips)) { }
|
|
|
|
/// <param name="fillerFactory">Injectable for tests; defaults to the strip-layout <see cref="PlateFiller"/>.</param>
|
|
internal StripPlateNester(Func<Plate, PlateFiller> fillerFactory)
|
|
{
|
|
this.fillerFactory =
|
|
fillerFactory ?? throw new ArgumentNullException(nameof(fillerFactory));
|
|
}
|
|
|
|
public PlateCandidate Place(
|
|
PlatePlacementRequest request,
|
|
IProgress<NestJobProgress> progress = null,
|
|
CancellationToken token = default
|
|
)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(request);
|
|
token.ThrowIfCancellationRequested();
|
|
|
|
// The strip fills try two classification angles and ignore the requirement's rotation
|
|
// bounds, so they can return poses its RotationPolicy forbids. As in
|
|
// DefaultPlateNester, restricted requirements go to the policy-aware ordered nester.
|
|
if (request.Parts.Any(part => part.Rotation.Kind != RotationPolicyKind.Automatic))
|
|
return restrictedRotationNester.Place(request, progress, token);
|
|
|
|
var plate = DrawingJobMapper.CreatePlate(request.Stock);
|
|
var items = context.CreateItems(request.Parts);
|
|
|
|
var filler =
|
|
fillerFactory(plate)
|
|
?? throw new InvalidOperationException("Filler factory returned null.");
|
|
var legacyProgress = CandidateProgressBridge.Create(progress, request.Stock.Id);
|
|
var parts = filler.Nest(items, legacyProgress, token);
|
|
token.ThrowIfCancellationRequested();
|
|
if (parts == null)
|
|
throw new InvalidOperationException("Filler returned null placements.");
|
|
|
|
return new PlateCandidate(context.MapPlacements(parts));
|
|
}
|
|
}
|