Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edge legalization #21

Merged
merged 9 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 78 additions & 3 deletions Geometrica/DataStructures/DelaunayTriangulation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,29 @@ public static Triangle[] SplitTriangle(Triangle[] triangles, Triangle target, Po
t1 = new Triangle(innerPoint, target[1], target[2]);
t2 = new Triangle(innerPoint, target[2], target[0]);

t0.SetNeighbors(target.GetNeighbor(2), t1, t2);
t1.SetNeighbors(target.GetNeighbor(0), t2, t0);
t2.SetNeighbors(target.GetNeighbor(1), t0, t1);
var n2 = target.GetNeighbor(2);
t0.SetNeighbors(n2, t1, t2);
if(n2 != null)
{
var i = n2.GetNeighborIndex(target);
n2.SetNeighbor(i, t0);
}

var n0 = target.GetNeighbor(0);
t1.SetNeighbors(n0, t2, t0);
if(n0 != null)
{
var i = n0.GetNeighborIndex(target);
n0.SetNeighbor(i, t1);
}

var n1 = target.GetNeighbor(1);
t2.SetNeighbors(n1, t0, t1);
if(n1 != null)
{
var i = n1.GetNeighborIndex(target);
n1.SetNeighbor(i, t2);
}

newTriangles[index++] = t0;
newTriangles[index++] = t1;
Expand All @@ -87,6 +107,61 @@ public static Triangle[] SplitTriangle(Triangle[] triangles, Triangle target, Po

public static Triangle[] LegalizeTriangle(Triangle[] triangles, Triangle targetTriangle, int neighborIndex)
{
var oppositeTriangle = targetTriangle.GetNeighbor(neighborIndex);
if (oppositeTriangle == null)
return triangles;

var oppositePointIndex = oppositeTriangle.GetNeighborIndex(targetTriangle);

if (InCircle(targetTriangle[0], targetTriangle[1], targetTriangle[2], oppositeTriangle[oppositePointIndex]))
return triangles;

var origNeighborsTarget = new[]
{
targetTriangle.GetNeighbor(neighborIndex),
targetTriangle.GetNeighbor((neighborIndex + 1) % 3),
targetTriangle.GetNeighbor((neighborIndex + 2) % 3)
};
var origNeighborsOpposite = new[]
{
oppositeTriangle.GetNeighbor(oppositePointIndex),
oppositeTriangle.GetNeighbor((oppositePointIndex + 1) % 3),
oppositeTriangle.GetNeighbor((oppositePointIndex + 2) % 3)
};
var origPointsTarget = new[]
{
targetTriangle[neighborIndex],
targetTriangle[(neighborIndex + 1) % 3],
targetTriangle[(neighborIndex + 2) % 3]
};
var origPointsOpposite = new[]
{
oppositeTriangle[oppositePointIndex],
oppositeTriangle[(oppositePointIndex + 1) % 3],
oppositeTriangle[(oppositePointIndex + 2) % 3]
};

if (origNeighborsTarget[2] != null)
{
var targetIndex = origNeighborsTarget[2].GetNeighborIndex(targetTriangle);
origNeighborsTarget[2].SetNeighbor(targetIndex, oppositeTriangle);
}
if (origNeighborsOpposite[2] != null)
{
var targetIndex = origNeighborsOpposite[2].GetNeighborIndex(oppositeTriangle);
origNeighborsOpposite[2].SetNeighbor(targetIndex, targetTriangle);
}

targetTriangle[0] = origPointsTarget[0];
targetTriangle[1] = origPointsOpposite[0];
targetTriangle[2] = origPointsTarget[2];
targetTriangle.SetNeighbors(origNeighborsOpposite[2], origNeighborsTarget[1], oppositeTriangle);

oppositeTriangle[0] = origPointsTarget[0];
oppositeTriangle[1] = origPointsOpposite[2];
oppositeTriangle[2] = origPointsOpposite[0];
oppositeTriangle.SetNeighbors(origNeighborsOpposite[1], origNeighborsTarget[2], targetTriangle);

return triangles;
}

Expand Down
9 changes: 9 additions & 0 deletions Geometrica/Primitives/Triangle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ public Point2 this[int key]
$"The provided index {key} was out of bounds, please use index values 0, 1, 2 for triangle point access.")
};
}
set
{
if (key == 0)
_a = value;
else if (key == 1)
_b = value;
else if (key == 2)
_c = value;
}
}

public int Count => 3;
Expand Down
4 changes: 2 additions & 2 deletions GeometricaTests/DelaunayTriangulationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public void SplitTriangle_ConservesNeighbors_AfterSplit()

Assert.AreEqual(t4, triangles[0].GetNeighbor(0));
Assert.AreEqual(t2, triangles[1].GetNeighbor(0));
Assert.AreEqual(t3, triangles[2].GetNeighbor(0));
Assert.AreEqual(null, triangles[2].GetNeighbor(0));
}

[TestMethod]
Expand Down Expand Up @@ -386,7 +386,7 @@ public void LegalizeTriangle_SwapsEdge_ForNonDelaunayPair()
triangles = DelaunayTriangulation.LegalizeTriangle(triangles, t1, 0);

var actual = string.Join<Triangle>(" ", triangles);
Assert.AreEqual("", actual);
Assert.AreEqual("Triangle [0; 0] [0.9; 0.9] [0; 1] Triangle [0; 0] [1; 0] [0.9; 0.9]", actual);
}

[TestMethod]
Expand Down
Loading