mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-11-17 09:53:52 -05:00
refactor: merge duplicated geometry, settings-file and form helpers
Roslyn Bridge flagged these as copy-paste clusters; each pair now shares one implementation so a fix lands everywhere at once: - Shape.OffsetInward/OffsetOutward differed only in the target winding. - BestFitFinder kept its own copy of SpatialQuery's arc-extreme points. - SplitDrawingForm rebuilt DrawingSplitter's clip-region grid for preview. - GeometryOptimizer's collinear/coradial finders (one misspelled GetCoradialArs) become one generic FindRelated. - Five settings files repeated the write-with-retry loop, and two also repeated the unit parser and unreadable-file filter (SettingsFile). - ClampsForm and SupportGridForm repeated their row/box builders. - Vertical/HorizontalRemnantComparer share a RemnantComparer base. Behavior is unchanged except that Engine/NestStorage settings loads now also tolerate NotSupported/Security exceptions, matching the other settings files' never-throw contract. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4028dafb26
commit
b550640ef0
18 files changed
+291
-517
No files matched your search
@@ -10,14 +10,14 @@ namespace OpenNest.Geometry
|
||||
public static void Optimize(IList<Arc> arcs) =>
|
||||
MergePass(
|
||||
arcs,
|
||||
(list, item, i) => list.GetCoradialArs(item, i),
|
||||
(a, b) => a.IsCoradialTo(b),
|
||||
(Arc a, Arc b, out Arc joined) => TryJoinArcs(a, b, out joined)
|
||||
);
|
||||
|
||||
public static void Optimize(IList<Line> lines) =>
|
||||
MergePass(
|
||||
lines,
|
||||
(list, item, i) => list.GetCollinearLines(item, i),
|
||||
(a, b) => a.IsCollinearTo(b),
|
||||
(Line a, Line b, out Line joined) => TryJoinLines(a, b, out joined)
|
||||
);
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace OpenNest.Geometry
|
||||
|
||||
private static void MergePass<T>(
|
||||
IList<T> items,
|
||||
Func<IList<T>, T, int, List<T>> findCandidates,
|
||||
Func<T, T, bool> related,
|
||||
TryJoin<T> tryJoin
|
||||
)
|
||||
where T : class
|
||||
@@ -69,7 +69,7 @@ namespace OpenNest.Geometry
|
||||
for (var i = 0; i < items.Count; ++i)
|
||||
{
|
||||
var item = items[i];
|
||||
var candidates = findCandidates(items, item, i);
|
||||
var candidates = FindRelated(items, item, i, related);
|
||||
var index = 0;
|
||||
|
||||
while (index < candidates.Count)
|
||||
@@ -214,62 +214,41 @@ namespace OpenNest.Geometry
|
||||
return true;
|
||||
}
|
||||
|
||||
private static List<Line> GetCollinearLines(
|
||||
this IList<Line> lines,
|
||||
Line line,
|
||||
int startIndex
|
||||
/// <summary>
|
||||
/// The items from <paramref name="startIndex"/> on, other than <paramref name="item"/>
|
||||
/// itself, that are <paramref name="related"/> to it.
|
||||
/// </summary>
|
||||
private static List<T> FindRelated<T>(
|
||||
IList<T> items,
|
||||
T item,
|
||||
int startIndex,
|
||||
Func<T, T, bool> related
|
||||
)
|
||||
where T : class
|
||||
{
|
||||
var collinearLines = new List<Line>();
|
||||
var matches = new List<T>();
|
||||
|
||||
Parallel.For(
|
||||
startIndex,
|
||||
lines.Count,
|
||||
items.Count,
|
||||
index =>
|
||||
{
|
||||
var compareLine = lines[index];
|
||||
var candidate = items[index];
|
||||
|
||||
if (Object.ReferenceEquals(line, compareLine))
|
||||
if (Object.ReferenceEquals(item, candidate))
|
||||
return;
|
||||
|
||||
if (!line.IsCollinearTo(compareLine))
|
||||
if (!related(item, candidate))
|
||||
return;
|
||||
|
||||
lock (collinearLines)
|
||||
lock (matches)
|
||||
{
|
||||
collinearLines.Add(compareLine);
|
||||
matches.Add(candidate);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
return collinearLines;
|
||||
}
|
||||
|
||||
private static List<Arc> GetCoradialArs(this IList<Arc> arcs, Arc arc, int startIndex)
|
||||
{
|
||||
var coradialArcs = new List<Arc>();
|
||||
|
||||
Parallel.For(
|
||||
startIndex,
|
||||
arcs.Count,
|
||||
index =>
|
||||
{
|
||||
var compareArc = arcs[index];
|
||||
|
||||
if (Object.ReferenceEquals(arc, compareArc))
|
||||
return;
|
||||
|
||||
if (!arc.IsCoradialTo(compareArc))
|
||||
return;
|
||||
|
||||
lock (coradialArcs)
|
||||
{
|
||||
coradialArcs.Add(compareArc);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
return coradialArcs;
|
||||
return matches;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user