aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(engine): thread explicit placement strategy through multi-plate orchestrators

Browse Source
This commit is contained in:
aj
2026-09-21 20:22:45 -04:00
parent 856dbfd8af
commit f36e124039
5 changed files with 242 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Engine/MultiPlateNester.cs
+11 -4
View File
@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using OpenNest.Engine.Fill;
using OpenNest.Engine.Jobs.Placement;
using OpenNest.Engine.Jobs.Placement.Fillers;
using OpenNest.Geometry;
using OpenNest.Math;
@@ -26,6 +28,7 @@ namespace OpenNest.Engine
private readonly IProgress<NestProgress> _progress;
private readonly CancellationToken _token;
private readonly MultiPlateNestOptions _options;
private readonly string _strategy;
private bool HasPlateOptions => _plateOptions != null && _plateOptions.Count > 0;
@@ -45,8 +48,12 @@ namespace OpenNest.Engine
_platePool = InitializePlatePool(existingPlates);
_progress = progress;
_token = token;
_strategy = PlateFillService.ResolveStrategy(options.Strategy);
}
private PlateFillerBase CreateFiller(Plate plate) =>
PlateFillService.CreateFiller(_strategy, plate);
// --- Static Utility Methods ---
public static bool FitsBounds(Box container, Box part)
@@ -226,7 +233,7 @@ namespace OpenNest.Engine
private int FillAndPlace(PlateResult pr, Box zone, NestItem item)
{
var engine = NestEngineRegistry.Create(pr.Plate);
var engine = CreateFiller(pr.Plate);
var clonedItem = CloneItem(item);
var parts = engine.Fill(clonedItem, zone, _progress, _token);
@@ -381,7 +388,7 @@ namespace OpenNest.Engine
if (remnants.Count == 0)
break;
var engine = NestEngineRegistry.Create(pr.Plate);
var engine = CreateFiller(pr.Plate);
foreach (var remnant in remnants)
{
@@ -430,7 +437,7 @@ namespace OpenNest.Engine
if (remnants.Count == 0)
break;
var engine = NestEngineRegistry.Create(plate);
var engine = CreateFiller(plate);
foreach (var remnant in remnants)
{
@@ -643,7 +650,7 @@ namespace OpenNest.Engine
upgradeOption,
remnants =>
{
var engine = NestEngineRegistry.Create(target.Plate);
var engine = CreateFiller(target.Plate);
var tempItems = donorParts
.GroupBy(p => p.BaseDrawing)
.Select(g => new NestItem