mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-11-16 18:15:34 -05:00
Irregular picks each sheet's stock on an estimate of what the leftovers will cost, so a size that took every remaining part could lose the pick to a plan that ended up dearer, and its trial sheet was thrown away. Each pass now keeps those finished plans: one that beats the pass's own plan replaces it, and the rest are reported as alternatives (at most six a pass). No extra sheets are packed. The progress window's layout families now include the sheet sizes, so a one-sheet 60 x 120 layout is offered beside a one-sheet 48 x 144 best instead of being dropped as a near copy. With 48 x 96, 48 x 144 and 60 x 120 offered, the seven sample parts (130 copies) still take one 48 x 144 sheet and now end at 130.7" instead of 136.6"; the tutorial and synthetic nests are unchanged. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
79 lines
3.0 KiB
C#
79 lines
3.0 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using OpenNest.Engine.Jobs;
|
|
using OpenNest.Engine.NestingEngines.Irregular;
|
|
using static OpenNest.Engine.Tests.NestingEngines.JobBuilder;
|
|
using static OpenNest.Engine.Tests.NestingEngines.Shapes;
|
|
|
|
namespace OpenNest.Engine.Tests.NestingEngines;
|
|
|
|
/// <summary>
|
|
/// A stock that takes the whole job on one sheet but loses the decode's per-sheet pick is still
|
|
/// a complete plan: it competes with the decode's own plan and is reported.
|
|
/// </summary>
|
|
public class IrregularPassedOverStockTests
|
|
{
|
|
// Five 10 x 10 squares. "small" holds four, so the look-ahead rates it 441 + 100 * (441 / 400),
|
|
// about 551, under the strip's 572; the fifth square then needs a second small sheet (882).
|
|
private static NestJob UnderestimatedLeftovers() => Job(
|
|
new[] { Part("square", Rectangle(10, 10), 5) },
|
|
new[] { Stock("small", 21, 21, spacing: 0.25), Stock("strip", 11, 52, spacing: 0.25) }
|
|
);
|
|
|
|
[Fact]
|
|
public void APassKeepsTheStockThatFinishedTheJob_WhenItsOwnPlanEndsUpDearer()
|
|
{
|
|
var job = UnderestimatedLeftovers();
|
|
|
|
var result = new IrregularNestingEngine().PlanForTesting(job, 0, null);
|
|
|
|
LayoutAssert.Valid(job, result);
|
|
var sheet = Assert.Single(result.Plates);
|
|
Assert.Equal("strip", sheet.StockId);
|
|
Assert.Equal(5, sheet.Placements.Count);
|
|
}
|
|
|
|
[Fact]
|
|
public void TheDearerStockThatAlsoFinishesTheJob_IsReportedAsAnAlternative()
|
|
{
|
|
var job = Job(
|
|
new[] { Part("square", Rectangle(10, 10), 4) },
|
|
new[] { Stock("big", 60, 120, spacing: 0.25), Stock("small", 25, 25, spacing: 0.25) }
|
|
);
|
|
var reports = new List<NestJobProgress>();
|
|
|
|
var result = new IrregularNestingEngine().Solve(job, new Inline(reports.Add));
|
|
|
|
Assert.Equal("small", Assert.Single(result.Plates).StockId);
|
|
var onBig = reports.Where(r => r.Stage == NestJobStage.PlanAlternative)
|
|
.Select(r => r.Plan!)
|
|
.Where(p => p.Plates.Count == 1 && p.Plates[0].StockId == "big")
|
|
.ToList();
|
|
Assert.NotEmpty(onBig);
|
|
Assert.All(onBig, plan =>
|
|
{
|
|
LayoutAssert.Valid(job, plan);
|
|
Assert.Equal(4, plan.Plates[0].Placements.Count);
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void ReportingNeverChangesTheLayout()
|
|
{
|
|
var job = UnderestimatedLeftovers();
|
|
|
|
var silent = new IrregularNestingEngine().Solve(job);
|
|
var reported = new IrregularNestingEngine().Solve(job, new Inline(_ => { }));
|
|
|
|
Assert.Equal(
|
|
silent.Plates.Select(p => (p.StockId, string.Join(";", p.Placements.Select(q => $"{q.X:R},{q.Y:R},{q.Rotation:R}")))),
|
|
reported.Plates.Select(p => (p.StockId, string.Join(";", p.Placements.Select(q => $"{q.X:R},{q.Y:R},{q.Rotation:R}")))));
|
|
}
|
|
|
|
private sealed class Inline(Action<NestJobProgress> report) : IProgress<NestJobProgress>
|
|
{
|
|
public void Report(NestJobProgress value) => report(value);
|
|
}
|
|
}
|