Benchmark jobs could only come from .nest files. A JSON manifest now lists DXF files with quantities (plus sheet sizes, spacing, edge spacing, quadrant and per-part allowRotation), imported through CadImporter. DXF paths resolve relative to the manifest; sheet sizes are required from the manifest or --sheet-sizes and are read in the DXFs' own units. Folder scans pick up *.nest and *.manifest.json, and invalid manifests fail loudly. BenchmarkRunner now runs (job x engine) solves concurrently, capped by --parallel N (CLI default 3; --parallel 1 is sequential). Results are written by index so report order is unchanged. Concurrent solves compete for cores, so Time(ms) is only clean at --parallel 1; the run prints a note when N > 1. Also fixes --output for manifest jobs, which tried to read the manifest as a .nest to copy metadata from. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
163 lines
5.4 KiB
C#
163 lines
5.4 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using OpenNest.Geometry;
|
|
using OpenNest.IO;
|
|
|
|
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)
|
|
{
|
|
if (file.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
// Hand-written manifests fail loudly rather than being skipped like unreadable .nest files.
|
|
jobs.Add(DxfManifestLoader.Load(file, sheetSizeOverrides, partSpacingOverride));
|
|
continue;
|
|
}
|
|
|
|
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
|
|
.EnumerateFiles(inputPath, "*", SearchOption.AllDirectories)
|
|
.Where(f =>
|
|
f.EndsWith(".nest", StringComparison.OrdinalIgnoreCase)
|
|
|| f.EndsWith(
|
|
DxfManifestLoader.FolderSuffix,
|
|
StringComparison.OrdinalIgnoreCase
|
|
)
|
|
)
|
|
.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;
|
|
}
|
|
}
|
|
}
|