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

feat(training): enable forced full angle sweep and store per-angle results

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-14 20:25:33 -04:00
parent a145fd3c60
commit 71fc1e61ef
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Engine/ML/BruteForceRunner.cs
+2 -1
View File
@@ -25,9 +25,10 @@ namespace OpenNest.Engine.ML
public static class BruteForceRunner public static class BruteForceRunner
{ {
public static BruteForceResult Run(Drawing drawing, Plate plate) public static BruteForceResult Run(Drawing drawing, Plate plate, bool forceFullAngleSweep = false)
{ {
var engine = new NestEngine(plate); var engine = new NestEngine(plate);
engine.ForceFullAngleSweep = forceFullAngleSweep;
var item = new NestItem { Drawing = drawing }; var item = new NestItem { Drawing = drawing };
var sw = Stopwatch.StartNew(); var sw = Stopwatch.StartNew();
OpenNest.Training/Program.cs
+8 -3
View File
@@ -200,7 +200,7 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
} }
var sizeSw = Stopwatch.StartNew(); var sizeSw = Stopwatch.StartNew();
var result = BruteForceRunner.Run(drawing, runPlate); var result = BruteForceRunner.Run(drawing, runPlate, forceFullAngleSweep: true);
sizeSw.Stop(); sizeSw.Stop();
if (result == null) if (result == null)
@@ -215,7 +215,12 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
bestCount = result.PartCount; bestCount = result.PartCount;
} }
Console.WriteLine($" {size.Length}x{size.Width} - {result.PartCount}pcs, {result.Utilization:P1}, {sizeSw.ElapsedMilliseconds}ms"); var engineInfo = $"{result.WinnerEngine}({result.WinnerTimeMs}ms)";
if (!string.IsNullOrEmpty(result.RunnerUpEngine))
engineInfo += $", 2nd={result.RunnerUpEngine}({result.RunnerUpPartCount}pcs/{result.RunnerUpTimeMs}ms)";
if (!string.IsNullOrEmpty(result.ThirdPlaceEngine))
engineInfo += $", 3rd={result.ThirdPlaceEngine}({result.ThirdPlacePartCount}pcs/{result.ThirdPlaceTimeMs}ms)";
Console.WriteLine($" {size.Length}x{size.Width} - {result.PartCount}pcs, {result.Utilization:P1}, {sizeSw.ElapsedMilliseconds}ms [{engineInfo}] angles={result.AngleResults.Count}");
string savedFilePath = null; string savedFilePath = null;
if (saveDir != null) if (saveDir != null)
@@ -258,7 +263,7 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
writer.Write(savedFilePath); writer.Write(savedFilePath);
} }
db.AddRun(partId, size.Width, size.Length, s, result, savedFilePath); db.AddRun(partId, size.Width, size.Length, s, result, savedFilePath, result.AngleResults);
runsThisPart++; runsThisPart++;
totalRuns++; totalRuns++;
} }