diff --git a/OpenNest.Engine/INestOptimizer.cs b/OpenNest.Engine/INestOptimizer.cs index 42dce81..29fde8f 100644 --- a/OpenNest.Engine/INestOptimizer.cs +++ b/OpenNest.Engine/INestOptimizer.cs @@ -7,7 +7,7 @@ namespace OpenNest /// /// Result of a nest optimization run. /// - public class NestResult + public class OptimizationResult { /// /// The best sequence found: (drawingId, rotation, drawing) tuples in placement order. @@ -31,7 +31,7 @@ namespace OpenNest /// public interface INestOptimizer { - NestResult Optimize(List items, Box workArea, NfpCache cache, + OptimizationResult Optimize(List items, Box workArea, NfpCache cache, Dictionary> candidateRotations, CancellationToken cancellation = default); } diff --git a/OpenNest.Engine/SimulatedAnnealing.cs b/OpenNest.Engine/SimulatedAnnealing.cs index d2dc4b9..f36a08a 100644 --- a/OpenNest.Engine/SimulatedAnnealing.cs +++ b/OpenNest.Engine/SimulatedAnnealing.cs @@ -17,7 +17,7 @@ namespace OpenNest private const double DefaultMinTemperature = 0.1; private const int DefaultMaxNoImprovement = 500; - public NestResult Optimize(List items, Box workArea, NfpCache cache, + public OptimizationResult Optimize(List items, Box workArea, NfpCache cache, Dictionary> candidateRotations, CancellationToken cancellation = default) { @@ -28,7 +28,7 @@ namespace OpenNest var sequence = BuildInitialSequence(items, candidateRotations); if (sequence.Count == 0) - return new NestResult { Sequence = sequence, Score = default, Iterations = 0 }; + return new OptimizationResult { Sequence = sequence, Score = default, Iterations = 0 }; // Evaluate initial solution. var blf = new BottomLeftFill(workArea, cache); @@ -105,7 +105,7 @@ namespace OpenNest Debug.WriteLine($"[SA] Done: {iteration} iters, best={bestScore.Count} parts, density={bestScore.Density:P1}"); - return new NestResult + return new OptimizationResult { Sequence = bestSequence, Score = bestScore,