Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MATH-749] Handle case that all points are identical. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1564954 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2014-02-05 22:10:22 +00:00
parent b353d07bcc
commit 6b43922648
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/math3/geometry/euclidean/twod/hull/GiftWrap.java
View File

@ -115,7 +115,7 @@ public class GiftWrap extends AbstractConvexHullGenerator2D {
} }
} }
pointOnHull = nextPoint; pointOnHull = nextPoint;
} while (nextPoint != hullVertices.get(0)); } while (nextPoint != hullVertices.get(0) && nextPoint != null);
return hullVertices; return hullVertices;
} }

19
src/test/java/org/apache/commons/math3/geometry/euclidean/twod/hull/ConvexHullGenerator2DAbstractTest.java
View File

@ -87,6 +87,18 @@ public abstract class ConvexHullGenerator2DAbstractTest {
Assert.assertTrue(hull.getLineSegments().length == 1); Assert.assertTrue(hull.getLineSegments().length == 1);
} }
@Test
public void testAllIdentical() {
final Collection<Vector2D> points = new ArrayList<Vector2D>();
points.add(new Vector2D(1, 1));
points.add(new Vector2D(1, 1));
points.add(new Vector2D(1, 1));
points.add(new Vector2D(1, 1));
final ConvexHull2D hull = generator.generate(points);
checkConvexHull(points, hull);
}
@Test @Test
public void testConvexHull() { public void testConvexHull() {
// execute 100 random variations // execute 100 random variations
@ -219,6 +231,10 @@ public abstract class ConvexHullGenerator2DAbstractTest {
double sign = 0.0; double sign = 0.0;
final Vector2D[] points = hull.getVertices(); final Vector2D[] points = hull.getVertices();
if (points.length < 3) {
return true;
}
for (int i = 0; i < points.length; i++) { for (int i = 0; i < points.length; i++) {
Vector2D p1 = points[i == 0 ? points.length - 1 : i - 1]; Vector2D p1 = points[i == 0 ? points.length - 1 : i - 1];
Vector2D p2 = points[i]; Vector2D p2 = points[i];
@ -252,6 +268,9 @@ public abstract class ConvexHullGenerator2DAbstractTest {
final boolean includesCollinearPoints) { final boolean includesCollinearPoints) {
final Collection<Vector2D> hullVertices = Arrays.asList(hull.getVertices()); final Collection<Vector2D> hullVertices = Arrays.asList(hull.getVertices());
if (hullVertices.size() < 3) {
return;
}
final Region<Euclidean2D> region = hull.createRegion(); final Region<Euclidean2D> region = hull.createRegion();
for (final Vector2D p : points) { for (final Vector2D p : points) {