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

refactor: replace VPattern/HPattern with unified FillGrid method

Browse Source 
Consolidates two nearly-identical grid generation methods into a single
FillGrid method with a columnMajor parameter. Fixes bug in HPattern
where inner loop used rows instead of columns, and fixes FillNoRotation
silently discarding results by not adding them to Bin.Items.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-07 21:27:11 -05:00
parent 062981ebe9
commit d3704378c2
3 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenNest.Engine/RectanglePacking/FillBestFit.cs
View File

@@ -52,12 +52,12 @@ namespace OpenNest.RectanglePacking
item.Location = bin.Location; item.Location = bin.Location;
bin.Items.AddRange(VPattern(item, normalRows, normalColumns, int.MaxValue)); bin.Items.AddRange(FillGrid(item, normalRows, normalColumns, int.MaxValue));
item.Location.X += item.Width * normalColumns; item.Location.X += item.Width * normalColumns;
item.Rotate(); item.Rotate();
bin.Items.AddRange(VPattern(item, rotateRows, rotateColumns, int.MaxValue)); bin.Items.AddRange(FillGrid(item, rotateRows, rotateColumns, int.MaxValue));
return bin; return bin;
} }
@@ -77,12 +77,12 @@ namespace OpenNest.RectanglePacking
item.Location = bin.Location; item.Location = bin.Location;
bin.Items.AddRange(VPattern(item, normalRows, normalColumns, int.MaxValue)); bin.Items.AddRange(FillGrid(item, normalRows, normalColumns, int.MaxValue));
item.Location.Y += item.Height * normalRows; item.Location.Y += item.Height * normalRows;
item.Rotate(); item.Rotate();
bin.Items.AddRange(VPattern(item, rotateRows, rotateColumns, int.MaxValue)); bin.Items.AddRange(FillGrid(item, rotateRows, rotateColumns, int.MaxValue));
return bin; return bin;
} }

60
OpenNest.Engine/RectanglePacking/FillEngine.cs
View File

@@ -16,61 +16,23 @@ namespace OpenNest.RectanglePacking
public abstract void Fill(Item item, int maxCount); public abstract void Fill(Item item, int maxCount);
/// <summary> protected List<Item> FillGrid(Item item, int rows, int columns, int maxCount, bool columnMajor = true)
/// Vertical pattern.
/// </summary>
/// <param name="item"></param>
/// <param name="rows"></param>
/// <param name="columns"></param>
/// <param name="maxCount"></param>
protected List<Item> VPattern(Item item, int rows, int columns, int maxCount)
{ {
var items = new List<Item>(); var items = new List<Item>();
for (int i = 0; i < columns; i++) var outerCount = columnMajor ? columns : rows;
var innerCount = columnMajor ? rows : columns;
for (var i = 0; i < outerCount; i++)
{ {
var x = item.Width * i + item.X; for (var j = 0; j < innerCount; j++)
for (int j = 0; j < rows; j++)
{ {
var y = item.Height * j + item.Y; var x = (columnMajor ? i : j) * item.Width + item.X;
var y = (columnMajor ? j : i) * item.Height + item.Y;
var addedItem = item.Clone() as Item; var clone = item.Clone() as Item;
addedItem.Location = new Vector(x, y); clone.Location = new Vector(x, y);
items.Add(clone);
items.Add(addedItem);
if (items.Count == maxCount)
return items;
}
}
return items;
}
/// <summary>
/// Horizontal pattern.
/// </summary>
/// <param name="item"></param>
/// <param name="rows"></param>
/// <param name="columns"></param>
/// <param name="maxCount"></param>
protected List<Item> HPattern(Item item, int rows, int columns, int maxCount)
{
var items = new List<Item>();
for (int i = 0; i < rows; i++)
{
var y = item.Height * i + item.Y;
for (int j = 0; j < rows; j++)
{
var x = item.Width * j + item.X;
var addedItem = item.Clone() as Item;
addedItem.Location = new Vector(x, y);
items.Add(addedItem);
if (items.Count == maxCount) if (items.Count == maxCount)
return items; return items;

5
OpenNest.Engine/RectanglePacking/FillNoRotation.cs
View File

@@ -61,10 +61,7 @@ namespace OpenNest.RectanglePacking
columns = (int)System.Math.Ceiling((double)maxCount / rows); columns = (int)System.Math.Ceiling((double)maxCount / rows);
} }
if (item.Width > item.Height) Bin.Items.AddRange(FillGrid(item, rows, columns, maxCount, columnMajor: item.Width > item.Height));
VPattern(item, rows, columns, maxCount);
else
HPattern(item, rows, columns, maxCount);
} }
} }
} }