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

refactor(engine): remove legacy nesting engine surface

Browse Source
This commit is contained in:
aj
2026-09-22 14:25:46 -04:00
parent 98c4929d14
commit e65f849c7a
30 changed files with 184 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Engine/DefaultNestEngine.cs
-191
View File
@@ -1,191 +0,0 @@
using System;
using System.Collections.Generic;
using System.Threading;
using OpenNest.Engine.Fill;
using OpenNest.Engine.Jobs.Placement.Fillers;
using OpenNest.Engine.Strategies;
using OpenNest.Geometry;
namespace OpenNest.Engine
{
public class DefaultNestEngine : NestEngineBase
{
private DefaultPlateFiller filler;
private bool forceFullAngleSweep;
public DefaultNestEngine(Plate plate)
: base(plate) { }
public override string Name => "Default";
public override string Description =>
"Multi-phase nesting (Linear, Pairs, RectBestFit, Extents)";
public override NestPhase WinnerPhase
{
get => Filler.WinnerPhase;
protected set => Filler.SetWinnerPhase(value);
}
public override List<PhaseResult> PhaseResults => Filler.PhaseResults;
public override List<AngleResult> AngleResults => Filler.AngleResults;
public bool ForceFullAngleSweep
{
get => forceFullAngleSweep;
set
{
forceFullAngleSweep = value;
if (filler != null)
filler.ForceFullAngleSweep = value;
}
}
private DefaultPlateFiller Filler
{
get
{
if (filler == null || !ReferenceEquals(filler.Plate, Plate))
{
filler = CreateFiller(Plate);
filler.ForceFullAngleSweep = forceFullAngleSweep;
}
return filler;
}
}
private DefaultPlateFiller PrepareFiller()
{
var current = Filler;
current.PlateNumber = PlateNumber;
current.NestDirection = NestDirection;
return current;
}
internal virtual DefaultPlateFiller CreateFiller(Plate plate) =>
new LegacyDefaultPlateFiller(this, plate);
internal DefaultPlateFiller CreateRemnantFiller(Plate plate, RemnantFillPolicy policy) =>
new LegacyRemnantPlateFiller(this, plate, policy);
protected override IFillComparer CreateComparer() => Filler.CreateComparerCore();
public override NestDirection? PreferredDirection => null;
public override ShrinkAxis TrimAxis => ShrinkAxis.Width;
public override List<double> BuildAngles(
NestItem item,
ClassificationResult classification,
Box workArea
) => Filler.BuildAnglesCore(item, classification, workArea);
protected override void RecordProductiveAngles(List<AngleResult> angleResults) =>
Filler.RecordProductiveAnglesCore(angleResults);
protected virtual void RunPipeline(FillContext context) => Filler.RunPipelineCore(context);
public override List<Part> Fill(
NestItem item,
Box workArea,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var current = PrepareFiller();
return current.Fill(item, workArea, progress, token);
}
public override List<Part> Fill(
List<Part> groupParts,
Box workArea,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var current = PrepareFiller();
return current.Fill(groupParts, workArea, progress, token);
}
public override List<Part> PackArea(
Box box,
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var current = PrepareFiller();
return current.PackArea(box, items, progress, token);
}
public override List<Part> Nest(
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
)
{
return base.Nest(items, progress, token);
}
private sealed class LegacyDefaultPlateFiller : DefaultPlateFiller
{
private readonly DefaultNestEngine engine;
internal LegacyDefaultPlateFiller(DefaultNestEngine engine, Plate plate)
: base(plate)
{
this.engine = engine;
}
protected override IFillComparer CreateComparer() => engine.CreateComparer();
public override NestDirection? PreferredDirection => engine.PreferredDirection;
public override ShrinkAxis TrimAxis => engine.TrimAxis;
public override List<double> BuildAngles(
NestItem item,
ClassificationResult classification,
Box workArea
) => engine.BuildAngles(item, classification, workArea);
protected override void RecordProductiveAngles(List<AngleResult> angleResults) =>
engine.RecordProductiveAngles(angleResults);
protected override void RunPipeline(FillContext context) => engine.RunPipeline(context);
}
private sealed class LegacyRemnantPlateFiller : RemnantPlateFiller
{
private readonly DefaultNestEngine engine;
internal LegacyRemnantPlateFiller(
DefaultNestEngine engine,
Plate plate,
RemnantFillPolicy policy
)
: base(plate, policy)
{
this.engine = engine;
}
protected override IFillComparer CreateComparer() => engine.CreateComparer();
public override NestDirection? PreferredDirection => engine.PreferredDirection;
public override ShrinkAxis TrimAxis => engine.TrimAxis;
public override List<double> BuildAngles(
NestItem item,
ClassificationResult classification,
Box workArea
) => engine.BuildAngles(item, classification, workArea);
protected override void RecordProductiveAngles(List<AngleResult> angleResults) =>
engine.RecordProductiveAngles(angleResults);
protected override void RunPipeline(FillContext context) => engine.RunPipeline(context);
}
}
}
OpenNest.Engine/Fill/DefaultFillComparer.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace OpenNest.Engine.Fill
{
/// <summary>
/// Ranks fill results by count first, then density.
/// This is the original scoring logic used by DefaultNestEngine.
/// This is the original scoring logic used by the Default plate filler.
/// </summary>
public class DefaultFillComparer : IFillComparer
{
OpenNest.Engine/HorizontalRemnantEngine.cs
-38
View File
@@ -1,38 +0,0 @@
using System.Collections.Generic;
using OpenNest.Engine.Fill;
using OpenNest.Engine.Jobs.Placement.Fillers;
using OpenNest.Engine.Strategies;
using OpenNest.Geometry;
namespace OpenNest.Engine
{
/// <summary>
/// Optimizes for the largest top-side horizontal drop.
/// </summary>
public class HorizontalRemnantEngine : DefaultNestEngine
{
public HorizontalRemnantEngine(Plate plate)
: base(plate) { }
public override string Name => "Horizontal Remnant";
public override string Description => "Optimizes for largest top-side horizontal drop";
protected override IFillComparer CreateComparer() =>
RemnantFillPolicy.Horizontal.CreateComparer();
public override NestDirection? PreferredDirection =>
RemnantFillPolicy.Horizontal.PreferredDirection;
public override ShrinkAxis TrimAxis => RemnantFillPolicy.Horizontal.TrimAxis;
public override List<double> BuildAngles(
NestItem item,
ClassificationResult classification,
Box workArea
) => RemnantFillPolicy.Horizontal.BuildAngles(item, classification);
internal override DefaultPlateFiller CreateFiller(Plate plate) =>
CreateRemnantFiller(plate, RemnantFillPolicy.Horizontal);
}
}
OpenNest.Engine/Jobs/NestingEngineRegistry.cs
+7 -10
View File
@@ -8,11 +8,10 @@ using System.Reflection;
namespace OpenNest.Engine.Jobs;
/// <summary>
/// Registry of whole-job INestingEngine implementations, parallel to NestEngineRegistry (which is for
/// the legacy single-plate NestEngineBase). The four production strategies are exposed here through
/// FixedStrategyNestingEngine so they compete on equal footing with model-submitted engines. Unlike
/// NestEngineRegistry, this has no ActiveEngineName/global-selection concept — callers choose an engine
/// explicitly from AvailableEngines.
/// Registry of whole-job <see cref="INestingEngine"/> implementations. The four production
/// strategies are exposed through <see cref="FixedStrategyNestingEngine"/> so they compete on
/// equal footing with model-submitted engines. Callers choose an engine explicitly from
/// <see cref="AvailableEngines"/>; there is no process-global active selection.
/// </summary>
public static class NestingEngineRegistry
{
@@ -55,8 +54,7 @@ public static class NestingEngineRegistry
/// <summary>
/// Creates the engine registered under <paramref name="name"/> (case-insensitive). The caller's
/// explicit choice is the whole selection mechanism: unlike the legacy registry there is no
/// process-global active name to consult or mutate. Unknown names throw.
/// explicit choice is the whole selection mechanism; unknown names throw.
/// </summary>
public static INestingEngine Create(string name)
{
@@ -81,9 +79,8 @@ public static class NestingEngineRegistry
}
/// <summary>Scans *.dll in directory for non-abstract INestingEngine types with a public
/// parameterless constructor, registering each under its CLR type name. Mirrors
/// NestEngineRegistry.LoadPlugins's per-assembly/per-type isolation: one bad plugin never
/// prevents the rest from loading.</summary>
/// parameterless constructor, registering each under its CLR type name. Per-assembly and per-type
/// isolation ensures one bad plugin never prevents the rest from loading.</summary>
public static void LoadPlugins(string directory)
{
if (!Directory.Exists(directory))
OpenNest.Engine/Jobs/Placement/Fillers/DefaultPlateFiller.cs
+3 -16
View File
@@ -20,9 +20,7 @@ internal class DefaultPlateFiller : PlateFillerBase
internal DefaultPlateFiller(Plate plate)
: base(plate) { }
protected override IFillComparer CreateComparer() => CreateComparerCore();
internal IFillComparer CreateComparerCore() => new DefaultFillComparer();
protected override IFillComparer CreateComparer() => new DefaultFillComparer();
internal bool ForceFullAngleSweep
{
@@ -34,18 +32,9 @@ internal class DefaultPlateFiller : PlateFillerBase
NestItem item,
ClassificationResult classification,
Box workArea
) => BuildAnglesCore(item, classification, workArea);
internal List<double> BuildAnglesCore(
NestItem item,
ClassificationResult classification,
Box workArea
) => angleBuilder.Build(item, classification, workArea);
protected override void RecordProductiveAngles(List<AngleResult> angleResults) =>
RecordProductiveAnglesCore(angleResults);
internal void RecordProductiveAnglesCore(List<AngleResult> angleResults)
protected override void RecordProductiveAngles(List<AngleResult> angleResults)
{
angleBuilder.RecordProductive(angleResults);
}
@@ -419,9 +408,7 @@ internal class DefaultPlateFiller : PlateFillerBase
return BinConverter.ToParts(bin, items);
}
protected virtual void RunPipeline(FillContext context) => RunPipelineCore(context);
internal void RunPipelineCore(FillContext context)
protected virtual void RunPipeline(FillContext context)
{
var classification = PartClassifier.Classify(context.Item.Drawing);
context.PartType = classification.Type;
OpenNest.Engine/Jobs/Placement/Fillers/PlateFillerBase.cs
+2 -74
View File
@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using OpenNest.Engine;
using OpenNest.Engine.Fill;
using OpenNest.Engine.Strategies;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.Engine.Jobs.Placement.Fillers;
@@ -27,11 +25,6 @@ internal abstract class PlateFillerBase
public NestPhase WinnerPhase { get; protected set; }
internal void SetWinnerPhase(NestPhase winnerPhase)
{
WinnerPhase = winnerPhase;
}
public List<PhaseResult> PhaseResults { get; } = new();
public List<AngleResult> AngleResults { get; } = new();
@@ -61,11 +54,9 @@ internal abstract class PlateFillerBase
protected FillPolicy BuildPolicy() => new(Comparer, PreferredDirection);
internal IFillComparer FillComparer => Comparer;
protected string BuildProgressSummary() => BuildProgressSummary(PhaseResults);
internal static string BuildProgressSummary(IReadOnlyList<PhaseResult> phaseResults)
private static string BuildProgressSummary(IReadOnlyList<PhaseResult> phaseResults)
{
if (phaseResults.Count == 0)
return null;
@@ -78,70 +69,7 @@ internal abstract class PlateFillerBase
}
protected bool IsBetterFill(List<Part> candidate, List<Part> current, Box workArea) =>
IsBetterFill(Comparer, candidate, current, workArea);
internal static bool IsBetterFill(
IFillComparer comparer,
List<Part> candidate,
List<Part> current,
Box workArea
) => comparer.IsBetter(candidate, current, workArea);
protected bool IsBetterValidFill(List<Part> candidate, List<Part> current, Box workArea)
{
if (
candidate != null
&& candidate.Count > 0
&& HasOverlaps(candidate, Plate.PartSpacing)
)
{
Debug.WriteLine(
$"[IsBetterValidFill] REJECTED {candidate.Count} parts due to overlaps (current best: {current?.Count ?? 0})"
);
return false;
}
return IsBetterFill(candidate, current, workArea);
}
internal static bool HasOverlaps(List<Part> parts, double spacing)
{
if (parts == null || parts.Count <= 1)
return false;
for (var i = 0; i < parts.Count; i++)
{
var box1 = parts[i].BoundingBox;
for (var j = i + 1; j < parts.Count; j++)
{
var box2 = parts[j].BoundingBox;
var overlapX = System.Math.Min(box1.Right, box2.Right)
- System.Math.Max(box1.Left, box2.Left);
var overlapY = System.Math.Min(box1.Top, box2.Top)
- System.Math.Max(box1.Bottom, box2.Bottom);
if (overlapX <= Tolerance.Epsilon || overlapY <= Tolerance.Epsilon)
continue;
List<Vector> points;
if (parts[i].Intersects(parts[j], out points))
{
var first = parts[i].BoundingBox;
var second = parts[j].BoundingBox;
Debug.WriteLine(
$"[HasOverlaps] Overlap: part[{i}] ({parts[i].BaseDrawing?.Name}) @ ({first.Left:F2},{first.Bottom:F2})-({first.Right:F2},{first.Top:F2}) rot={parts[i].Rotation:F2}"
+ $" vs part[{j}] ({parts[j].BaseDrawing?.Name}) @ ({second.Left:F2},{second.Bottom:F2})-({second.Right:F2},{second.Top:F2}) rot={parts[j].Rotation:F2}"
+ $" intersections={points?.Count ?? 0}"
);
return true;
}
}
}
return false;
}
Comparer.IsBetter(candidate, current, workArea);
public virtual List<Part> Fill(
NestItem item,
OpenNest.Engine/Jobs/Placement/Fillers/StripPlateFiller.cs
-7
View File
@@ -40,13 +40,6 @@ internal class StripPlateFiller : PlateFillerBase
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
) => PackAreaCore(box, items, progress, token);
internal List<Part> PackAreaCore(
Box box,
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var inner = new DefaultPlateFiller(Plate);
OpenNest.Engine/Jobs/PlateNesterFactory.cs
+2 -3
View File
@@ -5,9 +5,8 @@ namespace OpenNest.Engine.Jobs;
/// <summary>
/// Instance-scoped strategy resolution for the whole-job runner. All four built-in strategies
/// resolve directly to filler-backed plate nesters. The process-global NestEngineRegistry
/// (including plugin registrations and ActiveEngineName) is neither read nor modified.
/// Unknown keys reject.
/// resolve directly to filler-backed plate nesters. Selection is explicit per job; no shared
/// mutable strategy setting is read or modified. Unknown keys reject.
/// </summary>
public static class PlateNesterFactory
{
OpenNest.Engine/NestEngineBase.cs
-216
View File
@@ -1,216 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using OpenNest.Engine;
using OpenNest.Engine.BestFit;
using OpenNest.Engine.Fill;
using OpenNest.Engine.Jobs.Placement.Fillers;
using OpenNest.Engine.Strategies;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.Engine
{
public abstract class NestEngineBase
{
protected NestEngineBase(Plate plate)
{
Plate = plate;
}
public Plate Plate { get; set; }
public int PlateNumber { get; set; }
public NestDirection NestDirection { get; set; }
private readonly List<PhaseResult> phaseResults = new();
private readonly List<AngleResult> angleResults = new();
public virtual NestPhase WinnerPhase { get; protected set; }
public virtual List<PhaseResult> PhaseResults => phaseResults;
public virtual List<AngleResult> AngleResults => angleResults;
public abstract string Name { get; }
public abstract string Description { get; }
// --- Engine policy ---
private IFillComparer _comparer;
protected IFillComparer Comparer => _comparer ??= CreateComparer();
protected virtual IFillComparer CreateComparer() => new DefaultFillComparer();
public virtual NestDirection? PreferredDirection => null;
public virtual ShrinkAxis TrimAxis => ShrinkAxis.Width;
public virtual List<double> BuildAngles(
NestItem item,
ClassificationResult classification,
Box workArea
)
{
return new List<double>
{
classification.PrimaryAngle,
classification.PrimaryAngle + OpenNest.Math.Angle.HalfPI,
};
}
protected virtual void RecordProductiveAngles(List<AngleResult> angleResults) { }
protected FillPolicy BuildPolicy() => new FillPolicy(Comparer, PreferredDirection);
// --- Virtual methods (side-effect-free, return parts) ---
public virtual List<Part> Fill(
NestItem item,
Box workArea,
IProgress<NestProgress> progress,
CancellationToken token
)
{
return new List<Part>();
}
public virtual List<Part> Fill(
List<Part> groupParts,
Box workArea,
IProgress<NestProgress> progress,
CancellationToken token
)
{
return new List<Part>();
}
public virtual List<Part> PackArea(
Box box,
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
)
{
return new List<Part>();
}
// --- Nest: compatibility façade over shared single-plate orchestration ---
public virtual List<Part> Nest(
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
)
{
return PlateFillOrchestrator.Nest(
Plate,
items,
Comparer,
(item, workArea, sink, cancellation) =>
FillExact(item, workArea, sink, cancellation),
(workArea, packItems, sink, cancellation) =>
PackArea(workArea, packItems, sink, cancellation),
progress,
token
);
}
// --- FillExact (non-virtual, delegates to virtual Fill) ---
public List<Part> FillExact(
NestItem item,
Box workArea,
IProgress<NestProgress> progress,
CancellationToken token
)
{
return Fill(item, workArea, progress, token);
}
// --- Convenience overloads (mutate plate, return bool) ---
public bool Fill(NestItem item)
{
return Fill(item, Plate.WorkArea());
}
public bool Fill(NestItem item, Box workArea)
{
var parts = Fill(item, workArea, null, CancellationToken.None);
if (parts == null || parts.Count == 0)
return false;
Plate.Parts.AddRange(parts);
return true;
}
public bool Fill(List<Part> groupParts)
{
return Fill(groupParts, Plate.WorkArea());
}
public bool Fill(List<Part> groupParts, Box workArea)
{
var parts = Fill(groupParts, workArea, null, CancellationToken.None);
if (parts == null || parts.Count == 0)
return false;
Plate.Parts.AddRange(parts);
return true;
}
public bool Pack(List<NestItem> items)
{
var workArea = Plate.WorkArea();
var parts = PackArea(workArea, items, null, CancellationToken.None);
if (parts == null || parts.Count == 0)
return false;
Plate.Parts.AddRange(parts);
return true;
}
// --- Protected utilities ---
internal static void ReportProgress(IProgress<NestProgress> progress, ProgressReport report)
{
NestProgressReporter.Report(progress, report);
}
protected string BuildProgressSummary() =>
PlateFillerBase.BuildProgressSummary(PhaseResults);
protected bool IsBetterFill(List<Part> candidate, List<Part> current, Box workArea) =>
PlateFillerBase.IsBetterFill(Comparer, candidate, current, workArea);
protected bool IsBetterValidFill(List<Part> candidate, List<Part> current, Box workArea)
{
if (
candidate != null
&& candidate.Count > 0
&& HasOverlaps(candidate, Plate.PartSpacing)
)
{
Debug.WriteLine(
$"[IsBetterValidFill] REJECTED {candidate.Count} parts due to overlaps (current best: {current?.Count ?? 0})"
);
return false;
}
return IsBetterFill(candidate, current, workArea);
}
protected static bool HasOverlaps(List<Part> parts, double spacing) =>
PlateFillerBase.HasOverlaps(parts, spacing);
}
}
OpenNest.Engine/NestEngineInfo.cs
-18
View File
@@ -1,18 +0,0 @@
using System;
namespace OpenNest.Engine
{
public class NestEngineInfo
{
public NestEngineInfo(string name, string description, Func<Plate, NestEngineBase> factory)
{
Name = name;
Description = description;
Factory = factory;
}
public string Name { get; }
public string Description { get; }
public Func<Plate, NestEngineBase> Factory { get; }
}
}
OpenNest.Engine/NestEngineRegistry.cs
-134
View File
@@ -1,134 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
namespace OpenNest.Engine
{
public static class NestEngineRegistry
{
private static readonly List<NestEngineInfo> engines = new();
static NestEngineRegistry()
{
Register(
"Default",
"Multi-phase nesting (Linear, Pairs, RectBestFit, Remainder)",
plate => new DefaultNestEngine(plate)
);
Register(
"Strip",
"Strip-based nesting for mixed-drawing layouts",
plate => new StripNestEngine(plate)
);
Register(
"Vertical Remnant",
"Optimizes for largest right-side vertical drop",
plate => new VerticalRemnantEngine(plate)
);
Register(
"Horizontal Remnant",
"Optimizes for largest top-side horizontal drop",
plate => new HorizontalRemnantEngine(plate)
);
}
public static IReadOnlyList<NestEngineInfo> AvailableEngines => engines;
public static string ActiveEngineName { get; set; } = "Default";
public static NestEngineBase Create(Plate plate)
{
var info = engines.FirstOrDefault(e =>
e.Name.Equals(ActiveEngineName, StringComparison.OrdinalIgnoreCase)
);
if (info == null)
{
Debug.WriteLine(
$"[NestEngineRegistry] Engine '{ActiveEngineName}' not found, falling back to Default"
);
info = engines[0];
}
return info.Factory(plate);
}
public static void Register(
string name,
string description,
Func<Plate, NestEngineBase> factory
)
{
if (engines.Any(e => e.Name.Equals(name, StringComparison.OrdinalIgnoreCase)))
{
Debug.WriteLine($"[NestEngineRegistry] Duplicate engine '{name}' skipped");
return;
}
engines.Add(new NestEngineInfo(name, description, factory));
}
public static void LoadPlugins(string directory)
{
if (!Directory.Exists(directory))
return;
foreach (var dll in Directory.GetFiles(directory, "*.dll"))
{
try
{
var assembly = Assembly.LoadFrom(dll);
foreach (var type in assembly.GetTypes())
{
if (type.IsAbstract || !typeof(NestEngineBase).IsAssignableFrom(type))
continue;
var ctor = type.GetConstructor(new[] { typeof(Plate) });
if (ctor == null)
{
Debug.WriteLine(
$"[NestEngineRegistry] Skipping {type.Name}: no Plate constructor"
);
continue;
}
// Create a temporary instance to read Name and Description.
try
{
var tempPlate = new Plate();
var instance = (NestEngineBase)ctor.Invoke(new object[] { tempPlate });
Register(
instance.Name,
instance.Description,
plate => (NestEngineBase)ctor.Invoke(new object[] { plate })
);
Debug.WriteLine(
$"[NestEngineRegistry] Loaded plugin engine: {instance.Name}"
);
}
catch (Exception ex)
{
Debug.WriteLine(
$"[NestEngineRegistry] Failed to instantiate {type.Name}: {ex.Message}"
);
}
}
}
catch (Exception ex)
{
Debug.WriteLine(
$"[NestEngineRegistry] Failed to load assembly {Path.GetFileName(dll)}: {ex.Message}"
);
}
}
}
}
}
OpenNest.Engine/Strategies/FillContext.cs
+1 -1
View File
@@ -84,7 +84,7 @@ namespace OpenNest.Engine.Strategies
/// the canonical drawing's baked source angle whenever it's non-zero. No-op when
/// <see cref="OriginalDrawing"/> isn't set. Internal so callers that build their own
/// <see cref="ProgressReport"/> outside <see cref="ReportProgress"/> (e.g. the fallback
/// report in <c>DefaultPlateFiller.RunPipelineCore</c> for strategies that don't self-report)
/// report in <c>DefaultPlateFiller.RunPipeline</c> for strategies that don't self-report)
/// can apply the same rebind before reaching the UI.
/// </summary>
internal List<Part> ToOriginalFrame(List<Part> parts)
OpenNest.Engine/StripNestEngine.cs
-100
View File
@@ -1,100 +0,0 @@
using System;
using System.Collections.Generic;
using System.Threading;
using OpenNest.Engine.Jobs.Placement.Fillers;
using OpenNest.Geometry;
namespace OpenNest.Engine
{
public class StripNestEngine : NestEngineBase
{
private StripPlateFiller filler;
public StripNestEngine(Plate plate)
: base(plate) { }
public override string Name => "Strip";
public override string Description =>
"Iterative shrink-fill nesting for mixed-drawing layouts";
private StripPlateFiller Filler
{
get
{
if (filler == null || !ReferenceEquals(filler.Plate, Plate))
filler = new LegacyStripPlateFiller(this, Plate);
return filler;
}
}
private StripPlateFiller PrepareFiller()
{
var current = Filler;
current.PlateNumber = PlateNumber;
current.NestDirection = NestDirection;
return current;
}
public override List<Part> Fill(
NestItem item,
Box workArea,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var current = PrepareFiller();
return current.Fill(item, workArea, progress, token);
}
public override List<Part> Fill(
List<Part> groupParts,
Box workArea,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var current = PrepareFiller();
return current.Fill(groupParts, workArea, progress, token);
}
public override List<Part> PackArea(
Box box,
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var current = PrepareFiller();
return current.PackAreaCore(box, items, progress, token);
}
public override List<Part> Nest(
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
)
{
var current = PrepareFiller();
return current.Nest(items, progress, token);
}
private sealed class LegacyStripPlateFiller : StripPlateFiller
{
private readonly StripNestEngine engine;
internal LegacyStripPlateFiller(StripNestEngine engine, Plate plate)
: base(plate)
{
this.engine = engine;
}
public override List<Part> PackArea(
Box box,
List<NestItem> items,
IProgress<NestProgress> progress,
CancellationToken token
) => engine.PackArea(box, items, progress, token);
}
}
}
OpenNest.Engine/VerticalRemnantEngine.cs
-34
View File
@@ -1,34 +0,0 @@
using System.Collections.Generic;
using OpenNest.Engine.Fill;
using OpenNest.Engine.Jobs.Placement.Fillers;
using OpenNest.Engine.Strategies;
using OpenNest.Geometry;
namespace OpenNest.Engine
{
/// <summary>
/// Optimizes for the largest right-side vertical drop.
/// </summary>
public class VerticalRemnantEngine : DefaultNestEngine
{
public VerticalRemnantEngine(Plate plate)
: base(plate) { }
public override string Name => "Vertical Remnant";
public override string Description => "Optimizes for largest right-side vertical drop";
protected override IFillComparer CreateComparer() => RemnantFillPolicy.Vertical.CreateComparer();
public override NestDirection? PreferredDirection => RemnantFillPolicy.Vertical.PreferredDirection;
public override List<double> BuildAngles(
NestItem item,
ClassificationResult classification,
Box workArea
) => RemnantFillPolicy.Vertical.BuildAngles(item, classification);
internal override DefaultPlateFiller CreateFiller(Plate plate) =>
CreateRemnantFiller(plate, RemnantFillPolicy.Vertical);
}
}