aj
094c4c196b
Thin-framed, hollow, or concave parts (e.g. SULLYS-035's frame) have inherently low part-to-bbox utilization yet nest tightly, so the 30% MinUtilization floor wrongly dropped every candidate for them. Pair quality is judged by the rotated pair bounding-box area the results are already sorted on; utilization now only ever serves as the high-aspect exception (UtilizationOverride), never as a rejection. Adds a hollow-frame helper plus regression tests that kept pairs exist with low utilization and results stay sorted by pair area.
101 lines
3.7 KiB
C#
101 lines
3.7 KiB
C#
using System.Text.Json;
|
|
using OpenNest.CNC;
|
|
using OpenNest.Geometry;
|
|
|
|
namespace OpenNest.Tests;
|
|
|
|
internal static class TestConfig
|
|
{
|
|
private static readonly Lazy<Dictionary<string, string>> Config = new(() =>
|
|
{
|
|
var dir = AppContext.BaseDirectory;
|
|
for (var i = 0; i < 6; i++)
|
|
{
|
|
var path = Path.Combine(dir, "test-config.json");
|
|
if (File.Exists(path))
|
|
{
|
|
var json = File.ReadAllText(path);
|
|
return JsonSerializer.Deserialize<Dictionary<string, string>>(json) ?? new();
|
|
}
|
|
dir = Path.GetDirectoryName(dir)!;
|
|
}
|
|
return new();
|
|
});
|
|
|
|
public static string? Get(string key) =>
|
|
Config.Value.TryGetValue(key, out var val) ? val : null;
|
|
|
|
public static string? GetExistingPath(string key)
|
|
{
|
|
var path = Get(key);
|
|
return path != null && File.Exists(path) ? path : null;
|
|
}
|
|
}
|
|
|
|
internal static class TestHelpers
|
|
{
|
|
public static Part MakePartAt(double x, double y, double size = 1)
|
|
{
|
|
// CW winding matches CNC convention (OffsetSide.Left = outward)
|
|
var pgm = new Program();
|
|
pgm.Codes.Add(new RapidMove(new Vector(0, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, size)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(size, size)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(size, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, 0)));
|
|
var drawing = new Drawing("test", pgm);
|
|
return new Part(drawing, new Vector(x, y));
|
|
}
|
|
|
|
public static Plate MakePlate(double width = 60, double length = 120, params Part[] parts)
|
|
{
|
|
var plate = new Plate(width, length);
|
|
foreach (var p in parts)
|
|
plate.Parts.Add(p);
|
|
return plate;
|
|
}
|
|
|
|
public static Drawing MakeSquareDrawing(double size = 10)
|
|
{
|
|
// CW winding matches CNC convention (OffsetSide.Left = outward)
|
|
var pgm = new Program();
|
|
pgm.Codes.Add(new RapidMove(new Vector(0, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, size)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(size, size)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(size, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, 0)));
|
|
return new Drawing("square", pgm);
|
|
}
|
|
|
|
public static Drawing MakeFrameDrawing(double w = 20, double h = 6, double t = 0.5)
|
|
{
|
|
// Thin-walled hollow frame: outer CW, inner cutout CCW (CNC convention).
|
|
var pgm = new Program();
|
|
pgm.Codes.Add(new RapidMove(new Vector(0, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, h)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(w, h)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(w, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, 0)));
|
|
pgm.Codes.Add(new RapidMove(new Vector(t, t)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(w - t, t)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(w - t, h - t)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(t, h - t)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(t, t)));
|
|
return new Drawing("frame", pgm);
|
|
}
|
|
|
|
public static Drawing MakeLShapeDrawing()
|
|
{
|
|
// CW winding matches CNC convention (OffsetSide.Left = outward)
|
|
var pgm = new Program();
|
|
pgm.Codes.Add(new RapidMove(new Vector(0, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, 10)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(5, 10)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(5, 5)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(10, 5)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(10, 0)));
|
|
pgm.Codes.Add(new LinearMove(new Vector(0, 0)));
|
|
return new Drawing("lshape", pgm);
|
|
}
|
|
}
|