Previously each job fixed one plate size and ran a single Nest() call, which doesn't reflect the actual problem: a real job is fulfilled across however many plates are needed, drawn from a pool of standard sheet sizes, not forced onto one fixed sheet. NestEngineBase.Nest() has no way to pick its own plate's size - it fills whatever Plate it's given - so size selection now lives in the harness itself, applied identically to every engine: - BenchmarkJob carries the full candidate size pool (CandidateSizes) instead of one fixed PlateSize; one job per file, not one per size. - BenchmarkRunner drives a loop: while items remain, pick the smallest candidate size that fits the largest still-unplaced drawing (reusing the codebase's own MultiPlateNester.CreatePlate/FitsBounds), build a fresh plate of that size, and run one Nest() call to fill it. Repeat until everything is placed, no candidate size fits what's left, or a safety cap (40 plates) is hit. - NestValidator now validates bounds/spacing per plate but the quantity cap once globally across all plates, since that limit belongs to the whole order, not any one sheet. - JobResult/Report report PlatesUsed and a per-size breakdown instead of a single-plate bounding-box compactness metric; utilization is now aggregated across every plate the engine used. Ranking keeps the same rule (utilization first), with fewer plates as the tie-break when both are fully placed and tied - the natural multi-plate analogue of the old single-plate compactness tie-break. Smoke-tested against the synthetic sample across 5 candidate sizes: correctly builds one job, picks the smallest fitting size, uses however many plates each engine needs (1-2 here), and still catches StripNestEngine's pre-existing out-of-bounds bug.
134 lines
4.4 KiB
C#
134 lines
4.4 KiB
C#
using OpenNest.Geometry;
|
|
using OpenNest.IO;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
|
|
namespace OpenNest.Benchmark
|
|
{
|
|
/// <summary>
|
|
/// Builds BenchmarkJobs from .nest files on disk. Fully generic: works on
|
|
/// any valid .nest file, using whatever drawings/quantities/plate settings
|
|
/// it contains. One job per file, carrying the full pool of candidate
|
|
/// sheet sizes the engine may use across the whole nest - by default the
|
|
/// distinct sizes already present in that file, or a fixed override list
|
|
/// (e.g. a standard sheet-size lineup) applied to every file.
|
|
/// </summary>
|
|
public static class JobLoader
|
|
{
|
|
public static List<BenchmarkJob> Load(string inputPath, IReadOnlyList<Size> sheetSizeOverrides = null,
|
|
double? partSpacingOverride = null)
|
|
{
|
|
var files = ResolveFiles(inputPath);
|
|
var jobs = new List<BenchmarkJob>();
|
|
|
|
foreach (var file in files)
|
|
{
|
|
Nest nest;
|
|
|
|
try
|
|
{
|
|
nest = new NestReader(file).Read();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Console.Error.WriteLine($"[JobLoader] Skipping '{file}': failed to read ({ex.Message})");
|
|
continue;
|
|
}
|
|
|
|
var requests = BuildRequests(nest);
|
|
|
|
if (requests.Count == 0)
|
|
{
|
|
Console.Error.WriteLine($"[JobLoader] Skipping '{file}': no drawings with quantity > 0");
|
|
continue;
|
|
}
|
|
|
|
var template = ResolvePlateTemplate(nest);
|
|
var sizes = sheetSizeOverrides != null && sheetSizeOverrides.Count > 0
|
|
? sheetSizeOverrides.ToList()
|
|
: ResolveSheetSizes(nest);
|
|
|
|
jobs.Add(new BenchmarkJob
|
|
{
|
|
SourceFile = file,
|
|
CandidateSizes = sizes,
|
|
EdgeSpacing = template.EdgeSpacing,
|
|
PartSpacing = partSpacingOverride ?? template.PartSpacing,
|
|
Quadrant = template.Quadrant,
|
|
Requests = requests,
|
|
});
|
|
}
|
|
|
|
return jobs;
|
|
}
|
|
|
|
private static List<string> ResolveFiles(string inputPath)
|
|
{
|
|
if (Directory.Exists(inputPath))
|
|
{
|
|
return Directory.GetFiles(inputPath, "*.nest", SearchOption.AllDirectories)
|
|
.OrderBy(f => f, StringComparer.OrdinalIgnoreCase)
|
|
.ToList();
|
|
}
|
|
|
|
if (File.Exists(inputPath))
|
|
return new List<string> { inputPath };
|
|
|
|
throw new FileNotFoundException($"Benchmark input not found: {inputPath}");
|
|
}
|
|
|
|
private static List<DrawingRequest> BuildRequests(Nest nest)
|
|
{
|
|
var requests = new List<DrawingRequest>();
|
|
|
|
foreach (var drawing in nest.Drawings)
|
|
{
|
|
var qty = drawing.Quantity.Required;
|
|
|
|
if (qty <= 0)
|
|
continue;
|
|
|
|
var constraints = drawing.Constraints;
|
|
|
|
requests.Add(new DrawingRequest
|
|
{
|
|
Drawing = drawing,
|
|
Quantity = qty,
|
|
Priority = drawing.Priority,
|
|
StepAngle = constraints?.StepAngle ?? 0,
|
|
RotationStart = constraints?.StartAngle ?? 0,
|
|
RotationEnd = constraints?.EndAngle ?? 0,
|
|
});
|
|
}
|
|
|
|
return requests;
|
|
}
|
|
|
|
private static (Spacing EdgeSpacing, double PartSpacing, int Quadrant) ResolvePlateTemplate(Nest nest)
|
|
{
|
|
var source = nest.Plates?.FirstOrDefault();
|
|
|
|
if (source != null)
|
|
return (source.EdgeSpacing, source.PartSpacing, source.Quadrant);
|
|
|
|
var defaults = nest.PlateDefaults;
|
|
return (defaults.EdgeSpacing, defaults.PartSpacing, defaults.Quadrant);
|
|
}
|
|
|
|
private static List<Size> ResolveSheetSizes(Nest nest)
|
|
{
|
|
var sizes = (nest.Plates ?? Enumerable.Empty<Plate>())
|
|
.Select(p => p.Size)
|
|
.Distinct()
|
|
.ToList();
|
|
|
|
if (sizes.Count == 0)
|
|
sizes.Add(nest.PlateDefaults.Size);
|
|
|
|
return sizes;
|
|
}
|
|
}
|
|
}
|