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

feat(engine): integrate AnglePredictor into FindBestFill angle selection

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-14 20:28:50 -04:00
parent 8cc14997af
commit e33b5ba063
1 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenNest.Engine/NestEngine.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using System.Threading; using System.Threading;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Engine.BestFit; using OpenNest.Engine.BestFit;
using OpenNest.Engine.ML;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using OpenNest.RectanglePacking; using OpenNest.RectanglePacking;
@@ -129,6 +130,32 @@ namespace OpenNest
} }
} }
// When the work area triggers a full sweep (and we're not forcing it for training),
// try ML angle prediction to reduce the sweep.
if (!ForceFullAngleSweep && angles.Count > 2)
{
var features = FeatureExtractor.Extract(item.Drawing);
if (features != null)
{
var predicted = AnglePredictor.PredictAngles(
features, workArea.Width, workArea.Length);
if (predicted != null)
{
// Use predicted angles, but always keep bestRotation and bestRotation + 90.
var mlAngles = new List<double>(predicted);
if (!mlAngles.Any(a => a.IsEqualTo(bestRotation)))
mlAngles.Add(bestRotation);
if (!mlAngles.Any(a => a.IsEqualTo(bestRotation + Angle.HalfPI)))
mlAngles.Add(bestRotation + Angle.HalfPI);
Debug.WriteLine($"[FindBestFill] ML: {angles.Count} angles -> {mlAngles.Count} predicted");
angles = mlAngles;
}
}
}
// Try pair-based approach first. // Try pair-based approach first.
var pairResult = FillWithPairs(item, workArea); var pairResult = FillWithPairs(item, workArea);
var best = pairResult; var best = pairResult;
@@ -214,6 +241,32 @@ namespace OpenNest
} }
} }
// When the work area triggers a full sweep (and we're not forcing it for training),
// try ML angle prediction to reduce the sweep.
if (!ForceFullAngleSweep && angles.Count > 2)
{
var features = FeatureExtractor.Extract(item.Drawing);
if (features != null)
{
var predicted = AnglePredictor.PredictAngles(
features, workArea.Width, workArea.Length);
if (predicted != null)
{
// Use predicted angles, but always keep bestRotation and bestRotation + 90.
var mlAngles = new List<double>(predicted);
if (!mlAngles.Any(a => a.IsEqualTo(bestRotation)))
mlAngles.Add(bestRotation);
if (!mlAngles.Any(a => a.IsEqualTo(bestRotation + Angle.HalfPI)))
mlAngles.Add(bestRotation + Angle.HalfPI);
Debug.WriteLine($"[FindBestFill] ML: {angles.Count} angles -> {mlAngles.Count} predicted");
angles = mlAngles;
}
}
}
// Pairs phase first // Pairs phase first
var pairSw = Stopwatch.StartNew(); var pairSw = Stopwatch.StartNew();
var pairResult = FillWithPairs(item, workArea, token, progress); var pairResult = FillWithPairs(item, workArea, token, progress);