update testbed and unittest to adapt to span changes

This commit is contained in:
Tom Hulton-Harrop
2023-04-23 20:02:13 +01:00
parent 4a5d11548c
commit 567f5ffd0a
2 changed files with 121 additions and 162 deletions

View File

@@ -15,56 +15,47 @@
BOOST_AUTO_TEST_CASE(BasicTest)
{
std::vector<p2t::Point*> polyline{
new p2t::Point(0, 0),
new p2t::Point(1, 0),
new p2t::Point(1, 1),
std::vector<p2t::Point> polyline{
p2t::Point(0, 0),
p2t::Point(1, 0),
p2t::Point(1, 1),
};
p2t::CDT cdt{ polyline };
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 1);
BOOST_CHECK_EQUAL(*result[0]->GetPoint(0), *polyline[0]);
BOOST_CHECK_EQUAL(*result[0]->GetPoint(1), *polyline[1]);
BOOST_CHECK_EQUAL(*result[0]->GetPoint(2), *polyline[2]);
BOOST_CHECK_EQUAL(*result[0]->GetPoint(0), polyline[0]);
BOOST_CHECK_EQUAL(*result[0]->GetPoint(1), polyline[1]);
BOOST_CHECK_EQUAL(*result[0]->GetPoint(2), polyline[2]);
BOOST_CHECK(p2t::IsDelaunay(result));
for (const auto p : polyline) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(QuadTest)
{
std::vector<p2t::Point*> polyline{ new p2t::Point(0, 0), new p2t::Point(0, 1),
new p2t::Point(1, 1), new p2t::Point(1, 0) };
std::vector<p2t::Point> polyline{ p2t::Point(0, 0), p2t::Point(0, 1),
p2t::Point(1, 1), p2t::Point(1, 0) };
p2t::CDT cdt{ polyline };
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 2);
BOOST_CHECK(p2t::IsDelaunay(result));
for (const auto p : polyline) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(NarrowQuadTest)
{
// Very narrow quad that used to demonstrate a failure case during
// triangulation
std::vector<p2t::Point*> polyline {
new p2t::Point(0.0, 0.0),
new p2t::Point(1.0e-05, 0.0),
new p2t::Point(1.1e-04, 3.0e-07),
new p2t::Point(1.0e-04, 3.0e-07)
std::vector<p2t::Point> polyline {
p2t::Point(0.0, 0.0),
p2t::Point(1.0e-05, 0.0),
p2t::Point(1.1e-04, 3.0e-07),
p2t::Point(1.0e-04, 3.0e-07)
};
p2t::CDT cdt{ polyline };
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 2);
BOOST_CHECK(p2t::IsDelaunay(result));
for (const auto p : polyline) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(ConcaveBoundaryTest)
@@ -72,23 +63,23 @@ BOOST_AUTO_TEST_CASE(ConcaveBoundaryTest)
// Concave-by-less-than-epsilon boundaries used to potentially fail
// during triangulation
const double eps = 1e-15; // This gave EdgeEvent - null triangle
std::vector<p2t::Point*> polyline {
new p2t::Point(0,0),
new p2t::Point(0.5,eps),
new p2t::Point(1,0),
new p2t::Point(1-eps,0.836541),
new p2t::Point(1,2),
new p2t::Point(.46,1.46+eps),
new p2t::Point(0,1),
new p2t::Point(eps,0.5)
std::vector<p2t::Point> polyline {
p2t::Point(0,0),
p2t::Point(0.5,eps),
p2t::Point(1,0),
p2t::Point(1-eps,0.836541),
p2t::Point(1,2),
p2t::Point(.46,1.46+eps),
p2t::Point(0,1),
p2t::Point(eps,0.5)
};
const double r2o4 = std::sqrt(2.)/4;
std::vector<p2t::Point*> hole {
new p2t::Point(0.5+r2o4,0.5),
new p2t::Point(0.5,0.5+r2o4),
new p2t::Point(0.5-r2o4,0.5),
new p2t::Point(0.5-eps,0.5-r2o4)
std::vector<p2t::Point> hole {
p2t::Point(0.5+r2o4,0.5),
p2t::Point(0.5,0.5+r2o4),
p2t::Point(0.5-r2o4,0.5),
p2t::Point(0.5-eps,0.5-r2o4)
};
std::vector<p2t::Point> interior_points
@@ -104,109 +95,94 @@ BOOST_AUTO_TEST_CASE(ConcaveBoundaryTest)
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 18);
BOOST_CHECK(p2t::IsDelaunay(result));
for (const auto p : polyline) {
delete p;
}
for (const auto p : hole) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(PolygonTest01)
{
// Reported in issue #10
std::vector<p2t::Point*> polyline = {
new p2t::Point(-0.388419120000000006598384061363, 0.0368141516905975269002837535481),
new p2t::Point(-0.388419120000000006598384061363, 0.0104235565411950892311665484158),
new p2t::Point(-0.611580879999999993401615938637, 0.0104235565411950892311665484158),
new p2t::Point(-0.611580879999999993401615938637, 0.1483950316905975341796875),
new p2t::Point(-0.578899596898762469621146919962, 0.227294628589359948289683188705),
new p2t::Point(-0.500000000000000000000000000000, 0.259975911690597527581303438637),
new p2t::Point(+0.500000000000000000000000000000, 0.259975911690597527581303438637),
new p2t::Point(+0.578899596898762469621146919962, 0.227294628589359948289683188705),
new p2t::Point(+0.611580879999999993401615938637, 0.1483950316905975341796875),
new p2t::Point(+0.611580879999999993401615938637, 0.0104235565411950614755909327869),
new p2t::Point(+0.388419120000000006598384061363, 0.0104235565411950892311665484158),
new p2t::Point(+0.388419120000000006598384061363, 0.0368141516905975130224959457337)
std::vector<p2t::Point> polyline = {
p2t::Point(-0.388419120000000006598384061363, 0.0368141516905975269002837535481),
p2t::Point(-0.388419120000000006598384061363, 0.0104235565411950892311665484158),
p2t::Point(-0.611580879999999993401615938637, 0.0104235565411950892311665484158),
p2t::Point(-0.611580879999999993401615938637, 0.1483950316905975341796875),
p2t::Point(-0.578899596898762469621146919962, 0.227294628589359948289683188705),
p2t::Point(-0.500000000000000000000000000000, 0.259975911690597527581303438637),
p2t::Point(+0.500000000000000000000000000000, 0.259975911690597527581303438637),
p2t::Point(+0.578899596898762469621146919962, 0.227294628589359948289683188705),
p2t::Point(+0.611580879999999993401615938637, 0.1483950316905975341796875),
p2t::Point(+0.611580879999999993401615938637, 0.0104235565411950614755909327869),
p2t::Point(+0.388419120000000006598384061363, 0.0104235565411950892311665484158),
p2t::Point(+0.388419120000000006598384061363, 0.0368141516905975130224959457337)
};
p2t::CDT cdt{ polyline };
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 10);
for (const auto p : polyline) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(PolygonTest02)
{
// Reported in issue #10
std::vector<p2t::Point*> polyline = {
new p2t::Point(0.9636984967276516, 0.7676550649687783),
new p2t::Point(0.9636984967276516, -0.7676550649687641),
new p2t::Point(-0.3074475690811459, -0.7676550649687641),
new p2t::Point(0.09401654924378076, -0.2590574983578904),
new p2t::Point(0.10567230819363671, -0.09864698028880525),
new p2t::Point(-0.03901177977841874, -0.028405214140875046),
new p2t::Point(-0.428964921810446, -0.08483619470406722),
new p2t::Point(-0.5128305980156834, -0.12847817634298053),
new p2t::Point(-0.5512747518916774, -0.2148501697175078),
new p2t::Point(-0.5917836778064418, -0.7037530067555622),
new p2t::Point(-0.5520451065921502, -0.7676550649687641),
new p2t::Point(-0.9636984967276516, -0.7676550649687641),
new p2t::Point(-0.9636984967276516, 0.767655064968778)
std::vector<p2t::Point> polyline = {
p2t::Point(0.9636984967276516, 0.7676550649687783),
p2t::Point(0.9636984967276516, -0.7676550649687641),
p2t::Point(-0.3074475690811459, -0.7676550649687641),
p2t::Point(0.09401654924378076, -0.2590574983578904),
p2t::Point(0.10567230819363671, -0.09864698028880525),
p2t::Point(-0.03901177977841874, -0.028405214140875046),
p2t::Point(-0.428964921810446, -0.08483619470406722),
p2t::Point(-0.5128305980156834, -0.12847817634298053),
p2t::Point(-0.5512747518916774, -0.2148501697175078),
p2t::Point(-0.5917836778064418, -0.7037530067555622),
p2t::Point(-0.5520451065921502, -0.7676550649687641),
p2t::Point(-0.9636984967276516, -0.7676550649687641),
p2t::Point(-0.9636984967276516, 0.767655064968778)
};
p2t::CDT cdt{ polyline };
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 11);
for (const auto p : polyline) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(PolygonTest03)
{
// Reported in issue #10
std::vector<p2t::Point*> polyline = {
new p2t::Point(0.9776422201600001, 0.9776422201599928),
new p2t::Point(0.9776422201599999, -0.977642220160007),
new p2t::Point(-0.12788518519240472, -0.9776422201599928),
new p2t::Point(-0.3913394510746002, -0.33861494064331055),
new p2t::Point(-0.47812835166211676, -0.9776422201599928),
new p2t::Point(-0.9776422201600001, -0.9776422201599928),
new p2t::Point(-0.9776422201600001, 0.977642220160007)
std::vector<p2t::Point> polyline = {
p2t::Point(0.9776422201600001, 0.9776422201599928),
p2t::Point(0.9776422201599999, -0.977642220160007),
p2t::Point(-0.12788518519240472, -0.9776422201599928),
p2t::Point(-0.3913394510746002, -0.33861494064331055),
p2t::Point(-0.47812835166211676, -0.9776422201599928),
p2t::Point(-0.9776422201600001, -0.9776422201599928),
p2t::Point(-0.9776422201600001, 0.977642220160007)
};
p2t::CDT cdt{ polyline };
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 5);
for (const auto p : polyline) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(PolygonTest04)
{
std::vector<p2t::Point*> polyline {
new p2t::Point(450, 2250),
new p2t::Point(450, 1750),
new p2t::Point(400, 1700),
new p2t::Point(350, 1650),
new p2t::Point(350, 500),
new p2t::Point(1050, 1700)
std::vector<p2t::Point> polyline {
p2t::Point(450, 2250),
p2t::Point(450, 1750),
p2t::Point(400, 1700),
p2t::Point(350, 1650),
p2t::Point(350, 500),
p2t::Point(1050, 1700)
};
std::vector<p2t::Point*> hole {
new p2t::Point(980, 1636),
new p2t::Point(950, 1600),
new p2t::Point(650, 1230),
new p2t::Point(625, 1247),
new p2t::Point(600, 1250),
new p2t::Point(591, 1350),
new p2t::Point(550, 2050)
std::vector<p2t::Point> hole {
p2t::Point(980, 1636),
p2t::Point(950, 1600),
p2t::Point(650, 1230),
p2t::Point(625, 1247),
p2t::Point(600, 1250),
p2t::Point(591, 1350),
p2t::Point(550, 2050)
};
p2t::CDT cdt{ polyline };
@@ -215,18 +191,12 @@ BOOST_AUTO_TEST_CASE(PolygonTest04)
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE_EQUAL(result.size(), 13);
for (const auto p : polyline) {
delete p;
}
for (const auto p : hole) {
delete p;
}
}
BOOST_AUTO_TEST_CASE(TestbedFilesTest)
{
for (const auto& filename : { "custom.dat", "diamond.dat", "star.dat", "test.dat" }) {
std::vector<p2t::Point*> polyline;
std::vector<p2t::Point> polyline;
// Load pointset from file
// Parse and tokenize data file
std::string line;
@@ -249,15 +219,12 @@ BOOST_AUTO_TEST_CASE(TestbedFilesTest)
std::back_inserter<std::vector<std::string>>(tokens));
double x = std::stod(tokens[0]);
double y = std::stod(tokens[1]);
polyline.push_back(new p2t::Point(x, y));
polyline.push_back(p2t::Point(x, y));
}
p2t::CDT cdt{ polyline };
BOOST_CHECK_NO_THROW(cdt.Triangulate());
const auto result = cdt.GetTriangles();
BOOST_REQUIRE(result.size() * 3 > polyline.size());
BOOST_CHECK_MESSAGE(p2t::IsDelaunay(result), filename + std::to_string(polyline.size()));
for (const auto p : polyline) {
delete p;
}
}
}