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

style: apply CSharpier formatting to all C# sources

Browse Source 
Repo-wide sweep with the pinned CSharpier 1.3.0 tool. Whitespace and
line-wrapping only; OpenNest.Engine.Tests (109) and OpenNest.IO.Tests
pass after reformat, full solution builds 0 errors.

Added .csharpierignore so csproj/config XML keeps its existing layout
(CSharpier's XML wrapping churns attributes with zero benefit).

Formatting is now enforceable: dotnet csharpier check . passes.
This commit is contained in:
aj
2026-09-20 16:41:50 -04:00
parent 8e6fa677fb
commit aec0523062
476 changed files with 16592 additions and 7800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Training/Data/TrainingDbContext.cs
+2 -6
View File
@@ -30,17 +30,13 @@ namespace OpenNest.Training.Data
modelBuilder.Entity<TrainingRun>(e =>
{
e.HasIndex(r => r.PartId).HasDatabaseName("idx_runs_partid");
e.HasOne(r => r.Part)
.WithMany(p => p.Runs)
.HasForeignKey(r => r.PartId);
e.HasOne(r => r.Part).WithMany(p => p.Runs).HasForeignKey(r => r.PartId);
});
modelBuilder.Entity<TrainingAngleResult>(e =>
{
e.HasIndex(a => a.RunId).HasDatabaseName("idx_angleresults_runid");
e.HasOne(a => a.Run)
.WithMany(r => r.AngleResults)
.HasForeignKey(a => a.RunId);
e.HasOne(a => a.Run).WithMany(r => r.AngleResults).HasForeignKey(a => a.RunId);
});
}
}
OpenNest.Training/Program.cs
+73 -29
View File
@@ -1,14 +1,14 @@
using OpenNest;
using OpenNest.Engine.BestFit;
using OpenNest.Engine.ML;
using OpenNest.Gpu;
using OpenNest.Geometry;
using OpenNest.IO;
using OpenNest.Training;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using OpenNest;
using OpenNest.Engine.BestFit;
using OpenNest.Engine.ML;
using OpenNest.Geometry;
using OpenNest.Gpu;
using OpenNest.IO;
using OpenNest.Training;
using Color = System.Drawing.Color;
// Parse arguments.
@@ -83,21 +83,32 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
var sheetSuite = new[]
{
new Size(96, 48), new Size(120, 48), new Size(144, 48),
new Size(96, 60), new Size(120, 60), new Size(144, 60),
new Size(96, 72), new Size(120, 72), new Size(144, 72),
new Size(48, 24), new Size(120, 10)
new Size(96, 48),
new Size(120, 48),
new Size(144, 48),
new Size(96, 60),
new Size(120, 60),
new Size(144, 60),
new Size(96, 72),
new Size(120, 72),
new Size(144, 72),
new Size(48, 24),
new Size(120, 10),
};
var dxfFiles = Directory.GetFiles(dir, "*.dxf", SearchOption.AllDirectories)
var dxfFiles = Directory
.GetFiles(dir, "*.dxf", SearchOption.AllDirectories)
.Concat(Directory.GetFiles(dir, "*.dwg", SearchOption.AllDirectories))
.ToArray();
Console.WriteLine($"Found {dxfFiles.Length} CAD files");
var resolvedDb = dbPath.EndsWith(".db", StringComparison.OrdinalIgnoreCase) ? dbPath : dbPath + ".db";
var resolvedDb = dbPath.EndsWith(".db", StringComparison.OrdinalIgnoreCase)
? dbPath
: dbPath + ".db";
Console.WriteLine($"Database: {Path.GetFullPath(resolvedDb)}");
Console.WriteLine($"Sheet sizes: {sheetSuite.Length} configurations");
Console.WriteLine($"Spacing: {s:F2}");
if (saveDir != null) Console.WriteLine($"Saving nests to: {saveDir}");
if (saveDir != null)
Console.WriteLine($"Saving nests to: {saveDir}");
Console.WriteLine("---");
using var db = new TrainingDatabase(dbPath);
@@ -133,8 +144,10 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
Drawing drawing;
try
{
drawing = CadImporter.ImportDrawing(file,
new CadImportOptions { DetectBends = false, Name = Path.GetFileName(file) });
drawing = CadImporter.ImportDrawing(
file,
new CadImportOptions { DetectBends = false, Name = Path.GetFileName(file) }
);
}
catch (System.Exception ex)
{
@@ -171,7 +184,11 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
bfSw.Stop();
Console.WriteLine($" Best-fits computed in {bfSw.ElapsedMilliseconds}ms");
var partId = db.GetOrAddPart(Path.GetFileName(file), features, drawing.Program.ToString());
var partId = db.GetOrAddPart(
Path.GetFileName(file),
features,
drawing.Program.ToString()
);
var partSw = Stopwatch.StartNew();
var runsThisPart = 0;
var bestUtil = 0.0;
@@ -215,17 +232,22 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
var engineInfo = $"{result.WinnerEngine}({result.WinnerTimeMs}ms)";
if (!string.IsNullOrEmpty(result.RunnerUpEngine))
engineInfo += $", 2nd={result.RunnerUpEngine}({result.RunnerUpPartCount}pcs/{result.RunnerUpTimeMs}ms)";
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}");
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;
if (saveDir != null)
{
// Deterministic bucket (00-FF) based on filename hash
uint hash = 0;
foreach (char c in partNo) hash = (hash * 31) + c;
foreach (char c in partNo)
hash = (hash * 31) + c;
var bucket = (hash % 256).ToString("X2");
var partDir = Path.Combine(saveDir, bucket, partNo);
@@ -242,13 +264,19 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
nestObj = new Nest(nestName)
{
Units = templateNest.Units,
DateCreated = DateTime.Now
DateCreated = DateTime.Now,
};
nestObj.PlateDefaults.SetFromExisting(templateNest.PlateDefaults.CreateNew());
nestObj.PlateDefaults.SetFromExisting(
templateNest.PlateDefaults.CreateNew()
);
}
else
{
nestObj = new Nest(nestName) { Units = Units.Inches, DateCreated = DateTime.Now };
nestObj = new Nest(nestName)
{
Units = Units.Inches,
DateCreated = DateTime.Now,
};
}
nestObj.Drawings.Add(drawing);
@@ -261,7 +289,15 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
writer.Write(savedFilePath);
}
db.AddRun(partId, size.Width, size.Length, s, result, savedFilePath, result.AngleResults);
db.AddRun(
partId,
size.Width,
size.Length,
s,
result,
savedFilePath,
result.AngleResults
);
runsThisPart++;
totalRuns++;
}
@@ -269,7 +305,9 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
BestFitCache.Invalidate(drawing);
partSw.Stop();
processed++;
Console.WriteLine($" Total: {runsThisPart} runs, best={bestCount}pcs @ {bestUtil:P1}, {partSw.ElapsedMilliseconds}ms");
Console.WriteLine(
$" Total: {runsThisPart} runs, best={bestCount}pcs @ {bestUtil:P1}, {partSw.ElapsedMilliseconds}ms"
);
}
catch (Exception ex)
{
@@ -281,7 +319,9 @@ int RunDataCollection(string dir, string dbPath, string saveDir, double s, strin
totalSw.Stop();
Console.WriteLine("---");
Console.WriteLine($"Processed: {processed} parts, {totalRuns} total runs");
Console.WriteLine($"Skipped: {skippedExisting} (existing) + {skippedGeometry} (no geometry) + {skippedFeatures} (no features)");
Console.WriteLine(
$"Skipped: {skippedExisting} (existing) + {skippedGeometry} (no geometry) + {skippedFeatures} (no features)"
);
Console.WriteLine($"Time: {totalSw.Elapsed:h\\:mm\\:ss}");
Console.WriteLine($"Database: {Path.GetFullPath(resolvedDb)}");
return 0;
@@ -296,8 +336,12 @@ void PrintUsage()
Console.Error.WriteLine();
Console.Error.WriteLine("Options:");
Console.Error.WriteLine(" --spacing <value> Part spacing (default: 0.5)");
Console.Error.WriteLine(" --db <path> SQLite database path (default: OpenNestTraining.db)");
Console.Error.WriteLine(" --save-nests <dir> Directory to save individual .nest nests for each winner");
Console.Error.WriteLine(
" --db <path> SQLite database path (default: OpenNestTraining.db)"
);
Console.Error.WriteLine(
" --save-nests <dir> Directory to save individual .nest nests for each winner"
);
Console.Error.WriteLine(" --template <path> Nest template (.nstdot) for plate defaults");
Console.Error.WriteLine(" -h, --help Show this help");
}
OpenNest.Training/TrainingDatabase.cs
+43 -26
View File
@@ -1,12 +1,12 @@
using Microsoft.EntityFrameworkCore;
using OpenNest.Engine.ML;
using OpenNest.IO;
using OpenNest.Training.Data;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using Microsoft.EntityFrameworkCore;
using OpenNest.Engine.ML;
using OpenNest.IO;
using OpenNest.Training.Data;
namespace OpenNest.Training
{
@@ -27,7 +27,8 @@ namespace OpenNest.Training
public long GetOrAddPart(string fileName, PartFeatures features, string geometryData)
{
var existing = _db.Parts.FirstOrDefault(p => p.FileName == fileName);
if (existing != null) return existing.Id;
if (existing != null)
return existing.Id;
var part = new TrainingPart
{
@@ -40,7 +41,7 @@ namespace OpenNest.Training
PerimeterToAreaRatio = features.PerimeterToAreaRatio,
VertexCount = features.VertexCount,
Bitmask = features.Bitmask,
GeometryData = geometryData
GeometryData = geometryData,
};
_db.Parts.Add(part);
@@ -51,10 +52,11 @@ namespace OpenNest.Training
public bool HasRun(string fileName, double sheetWidth, double sheetHeight, double spacing)
{
return _db.Runs.Any(r =>
r.Part.FileName == fileName &&
r.SheetWidth == sheetWidth &&
r.SheetHeight == sheetHeight &&
r.Spacing == spacing);
r.Part.FileName == fileName
&& r.SheetWidth == sheetWidth
&& r.SheetHeight == sheetHeight
&& r.Spacing == spacing
);
}
public int RunCount(string fileName)
@@ -62,7 +64,15 @@ namespace OpenNest.Training
return _db.Runs.Count(r => r.Part.FileName == fileName);
}
public void AddRun(long partId, double w, double h, double s, BruteForceResult result, string filePath, List<AngleResult> angleResults = null)
public void AddRun(
long partId,
double w,
double h,
double s,
BruteForceResult result,
string filePath,
List<AngleResult> angleResults = null
)
{
var run = new TrainingRun
{
@@ -82,7 +92,7 @@ namespace OpenNest.Training
RunnerUpTimeMs = result.RunnerUpTimeMs,
ThirdPlaceEngine = result.ThirdPlaceEngine ?? "",
ThirdPlacePartCount = result.ThirdPlacePartCount,
ThirdPlaceTimeMs = result.ThirdPlaceTimeMs
ThirdPlaceTimeMs = result.ThirdPlaceTimeMs,
};
_db.Runs.Add(run);
@@ -91,13 +101,15 @@ namespace OpenNest.Training
{
foreach (var ar in angleResults)
{
_db.AngleResults.Add(new Data.TrainingAngleResult
{
Run = run,
AngleDeg = ar.AngleDeg,
Direction = ar.Direction.ToString(),
PartCount = ar.PartCount
});
_db.AngleResults.Add(
new Data.TrainingAngleResult
{
Run = run,
AngleDeg = ar.AngleDeg,
Direction = ar.Direction.ToString(),
PartCount = ar.PartCount,
}
);
}
}
@@ -106,12 +118,13 @@ namespace OpenNest.Training
public int BackfillPerimeterToAreaRatio()
{
var partsToFix = _db.Parts
.Where(p => p.PerimeterToAreaRatio == 0)
var partsToFix = _db
.Parts.Where(p => p.PerimeterToAreaRatio == 0)
.Select(p => new { p.Id, p.GeometryData })
.ToList();
if (partsToFix.Count == 0) return 0;
if (partsToFix.Count == 0)
return 0;
var updated = 0;
foreach (var item in partsToFix)
@@ -126,7 +139,8 @@ namespace OpenNest.Training
drawing.UpdateArea();
var features = FeatureExtractor.Extract(drawing);
if (features == null) continue;
if (features == null)
continue;
var part = _db.Parts.Find(item.Id);
part.PerimeterToAreaRatio = features.PerimeterToAreaRatio;
@@ -170,7 +184,8 @@ namespace OpenNest.Training
try
{
_db.Database.ExecuteSqlRaw(@"
_db.Database.ExecuteSqlRaw(
@"
CREATE TABLE IF NOT EXISTS AngleResults (
Id INTEGER PRIMARY KEY AUTOINCREMENT,
RunId INTEGER NOT NULL,
@@ -178,9 +193,11 @@ namespace OpenNest.Training
Direction TEXT NOT NULL,
PartCount INTEGER NOT NULL,
FOREIGN KEY (RunId) REFERENCES Runs(Id)
)");
)"
);
_db.Database.ExecuteSqlRaw(
"CREATE INDEX IF NOT EXISTS idx_angleresults_runid ON AngleResults (RunId)");
"CREATE INDEX IF NOT EXISTS idx_angleresults_runid ON AngleResults (RunId)"
);
}
catch
{