get rid of boost
This commit is contained in:
Patrick Brosi
Patrick Brosi
parent
63dfda9749
commit
13fb21f626
12 changed files with 717 additions and 174 deletions
|
|
@ -272,38 +272,38 @@ CASE("frechet distance") {
|
|||
|
||||
// ___________________________________________________________________________
|
||||
CASE("geo box alignment") {
|
||||
// Line<double> a;
|
||||
// a.push_back(Point<double>(1, 1));
|
||||
// a.push_back(Point<double>(1, 2));
|
||||
Line<double> a;
|
||||
a.push_back(Point<double>(1, 1));
|
||||
a.push_back(Point<double>(1, 2));
|
||||
|
||||
// Line<double> b;
|
||||
// b.push_back(Point<double>(1, 2));
|
||||
// b.push_back(Point<double>(2, 2));
|
||||
Line<double> b;
|
||||
b.push_back(Point<double>(1, 2));
|
||||
b.push_back(Point<double>(2, 2));
|
||||
|
||||
// Line<double> c;
|
||||
// c.push_back(Point<double>(2, 2));
|
||||
// c.push_back(Point<double>(2, 1));
|
||||
Line<double> c;
|
||||
c.push_back(Point<double>(2, 2));
|
||||
c.push_back(Point<double>(2, 1));
|
||||
|
||||
// Line<double> d;
|
||||
// d.push_back(Point<double>(2, 1));
|
||||
// d.push_back(Point<double>(1, 1));
|
||||
Line<double> d;
|
||||
d.push_back(Point<double>(2, 1));
|
||||
d.push_back(Point<double>(1, 1));
|
||||
|
||||
// Box<double> box(Point<double>(2, 3), Point<double>(5, 4));
|
||||
// MultiLine<double> ml;
|
||||
// ml.push_back(a);
|
||||
// ml.push_back(b);
|
||||
// ml.push_back(c);
|
||||
// ml.push_back(d);
|
||||
Box<double> box(Point<double>(2, 3), Point<double>(5, 4));
|
||||
MultiLine<double> ml;
|
||||
ml.push_back(a);
|
||||
ml.push_back(b);
|
||||
ml.push_back(c);
|
||||
ml.push_back(d);
|
||||
|
||||
// EXPECT(parallelity(box, ml) == approx(1));
|
||||
// ml = rotate(ml, 45);
|
||||
// EXPECT(parallelity(box, ml) == approx(0));
|
||||
// ml = rotate(ml, 45);
|
||||
// EXPECT(parallelity(box, ml) == approx(1));
|
||||
// ml = rotate(ml, 45);
|
||||
// EXPECT(parallelity(box, ml) == approx(0));
|
||||
// ml = rotate(ml, 45);
|
||||
// EXPECT(parallelity(box, ml) == approx(1));
|
||||
EXPECT(parallelity(box, ml) == approx(1));
|
||||
ml = rotate(ml, 45);
|
||||
EXPECT(parallelity(box, ml) == approx(0));
|
||||
ml = rotate(ml, 45);
|
||||
EXPECT(parallelity(box, ml) == approx(1));
|
||||
ml = rotate(ml, 45);
|
||||
EXPECT(parallelity(box, ml) == approx(0));
|
||||
ml = rotate(ml, 45);
|
||||
EXPECT(parallelity(box, ml) == approx(1));
|
||||
},
|
||||
|
||||
// ___________________________________________________________________________
|
||||
|
|
@ -944,7 +944,7 @@ CASE("geometry") {
|
|||
EXPECT(geo::intersects(Box<double>(Point<double>(0, 0), Point<double>(1.5, 1.5)), boxa));
|
||||
|
||||
Polygon<double> poly({Point<double>(1, 1), Point<double>(3, 2), Point<double>(4, 3), Point<double>(6, 3), Point<double>(5, 1)});
|
||||
EXPECT(geo::getWKT(poly) == "POLYGON ((1 1, 3 2, 4 3, 6 3, 5 1))");
|
||||
EXPECT(geo::getWKT(poly) == "POLYGON ((1 1, 3 2, 4 3, 6 3, 5 1, 1 1))");
|
||||
EXPECT(geo::contains(Point<double>(4, 2), poly));
|
||||
EXPECT(!geo::contains(Point<double>(3, 3), poly));
|
||||
EXPECT(geo::contains(Point<double>(1, 1), poly));
|
||||
|
|
@ -977,8 +977,215 @@ CASE("geometry") {
|
|||
EXPECT(geo::rotate(rotLine, 90, Point<double>(2, 2))[1].getX() == approx(3));
|
||||
EXPECT(geo::rotate(rotLine, 90, Point<double>(2, 2))[1].getY() == approx(1));
|
||||
|
||||
MultiLine<double> multiRotLine({{{1, 1}, {3, 3}}, {{1, 3}, {3, 1}}});
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][0].getX() == approx(1));
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][0].getY() == approx(3));
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][1].getX() == approx(3));
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][1].getY() == approx(1));
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][0].getX() == approx(3));
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][0].getY() == approx(3));
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][1].getX() == approx(1));
|
||||
EXPECT(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][1].getY() == approx(1));
|
||||
|
||||
EXPECT(geo::getWKT(multiRotLine) == "MULTILINESTRING ((1 1, 3 3), (1 3, 3 1))");
|
||||
|
||||
EXPECT(geo::contains(multiRotLine[0], geo::move(geo::move(multiRotLine, 1.0, 2.0), -1.0, -2.0)[0]));
|
||||
EXPECT(geo::contains(multiRotLine, geo::getBoundingBox(Line<double>{{1, 1}, {3, 3}, {1, 3}, {3, 1}})));
|
||||
|
||||
EXPECT(geo::contains(getBoundingBox(multiRotLine), geo::getBoundingBox(Line<double>{{1, 1}, {3, 3}, {1, 3}, {3, 1}})));
|
||||
EXPECT(geo::contains(geo::getBoundingBox(Line<double>{{1, 1}, {3, 3}, {1, 3}, {3, 1}}), getBoundingBox(multiRotLine)));
|
||||
|
||||
EXPECT(geo::dist(geo::centroid(rotP), rotP) == approx(0));
|
||||
EXPECT(geo::dist(geo::centroid(rotLine), rotP) == approx(0));
|
||||
EXPECT(geo::dist(geo::centroid(polybox), Point<double>(3.5, 2.5)) == approx(0));
|
||||
EXPECT(geo::dist(geo::centroid(Polygon<double>({{0, 0}, {3, 4}, {4,3}})), Point<double>(7.0/3.0,7.0/3.0)) == approx(0));
|
||||
|
||||
auto polyy = Polygon<double>({{0, 0}, {3, 4}, {4,3}});
|
||||
MultiPolyon<double> mpoly{polyy, polyy};
|
||||
|
||||
EXPECT(geo::getWKT(polyy) == "POLYGON ((0 0, 3 4, 4 3, 0 0))");
|
||||
EXPECT(geo::getWKT(mpoly) == "MULTIPOLYGON (((0 0, 3 4, 4 3, 0 0)), ((0 0, 3 4, 4 3, 0 0)))");
|
||||
|
||||
auto hull = geo::convexHull(Line<double>{{0.1, 3}, {1, 1}, {2, 2}, {4, 4}, {0, 0}, {1, 2}, {3, 1}, {3, 3}});
|
||||
EXPECT(hull.getOuter().size() == size_t(4));
|
||||
EXPECT(hull.getOuter()[0].getX() == approx(0));
|
||||
EXPECT(hull.getOuter()[0].getY() == approx(0));
|
||||
EXPECT(hull.getOuter()[1].getX() == approx(3));
|
||||
EXPECT(hull.getOuter()[1].getY() == approx(1));
|
||||
EXPECT(hull.getOuter()[2].getX() == approx(4));
|
||||
EXPECT(hull.getOuter()[2].getY() == approx(4));
|
||||
EXPECT(hull.getOuter()[3].getX() == approx(0.1));
|
||||
EXPECT(hull.getOuter()[3].getY() == approx(3));
|
||||
EXPECT(geo::contains(geo::convexHull(geo::getBoundingBox(poly)), geo::getBoundingBox(poly)));
|
||||
EXPECT(geo::contains(geo::getBoundingBox(poly), geo::convexHull(geo::getBoundingBox(poly))));
|
||||
|
||||
auto hull2 = geo::convexHull(Line<double>{{0.1, 3}, {1, 1}, {2, 2}, {4, 4}, {0, 0}, {1, 2}, {3, 1}, {3, 3}, {-0.1, 1}});
|
||||
EXPECT(hull2.getOuter().size() == size_t(5));
|
||||
EXPECT(hull2.getOuter()[0].getX() == approx(-.1));
|
||||
EXPECT(hull2.getOuter()[0].getY() == approx(1));
|
||||
EXPECT(hull2.getOuter()[1].getX() == approx(0));
|
||||
EXPECT(hull2.getOuter()[1].getY() == approx(0));
|
||||
EXPECT(hull2.getOuter()[2].getX() == approx(3));
|
||||
EXPECT(hull2.getOuter()[2].getY() == approx(1));
|
||||
EXPECT(hull2.getOuter()[3].getX() == approx(4));
|
||||
EXPECT(hull2.getOuter()[3].getY() == approx(4));
|
||||
EXPECT(hull2.getOuter()[4].getX() == approx(0.1));
|
||||
EXPECT(hull2.getOuter()[4].getY() == approx(3));
|
||||
|
||||
auto hull3 = geo::convexHull(Line<double>{{0.1, 3}, {4, 4}, {0, 0}, {1, 2}, {3, 1}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(4));
|
||||
EXPECT(hull3.getOuter()[0].getX() == approx(0));
|
||||
EXPECT(hull3.getOuter()[0].getY() == approx(0));
|
||||
EXPECT(hull3.getOuter()[1].getX() == approx(3));
|
||||
EXPECT(hull3.getOuter()[1].getY() == approx(1));
|
||||
EXPECT(hull3.getOuter()[2].getX() == approx(4));
|
||||
EXPECT(hull3.getOuter()[2].getY() == approx(4));
|
||||
EXPECT(hull3.getOuter()[3].getX() == approx(0.1));
|
||||
EXPECT(hull3.getOuter()[3].getY() == approx(3));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{0.1, 3}, {4, 4}, {2, 1}, {3, 2}, {0, 0}, {1, 2}, {3, 1}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(4));
|
||||
EXPECT(hull3.getOuter()[0].getX() == approx(0));
|
||||
EXPECT(hull3.getOuter()[0].getY() == approx(0));
|
||||
EXPECT(hull3.getOuter()[1].getX() == approx(3));
|
||||
EXPECT(hull3.getOuter()[1].getY() == approx(1));
|
||||
EXPECT(hull3.getOuter()[2].getX() == approx(4));
|
||||
EXPECT(hull3.getOuter()[2].getY() == approx(4));
|
||||
EXPECT(hull3.getOuter()[3].getX() == approx(0.1));
|
||||
EXPECT(hull3.getOuter()[3].getY() == approx(3));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{4, 4}, {1, 2}, {2, 1}, {3, 2}, {0.1, 3}, {0, 0}, {1, 2}, {3, 1}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(4));
|
||||
EXPECT(hull3.getOuter()[0].getX() == approx(0));
|
||||
EXPECT(hull3.getOuter()[0].getY() == approx(0));
|
||||
EXPECT(hull3.getOuter()[1].getX() == approx(3));
|
||||
EXPECT(hull3.getOuter()[1].getY() == approx(1));
|
||||
EXPECT(hull3.getOuter()[2].getX() == approx(4));
|
||||
EXPECT(hull3.getOuter()[2].getY() == approx(4));
|
||||
EXPECT(hull3.getOuter()[3].getX() == approx(0.1));
|
||||
EXPECT(hull3.getOuter()[3].getY() == approx(3));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{4, 4}, {1, 2}, {3, 1}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(3));
|
||||
EXPECT(hull3.getOuter()[0].getX() == approx(1));
|
||||
EXPECT(hull3.getOuter()[0].getY() == approx(2));
|
||||
EXPECT(hull3.getOuter()[1].getX() == approx(3));
|
||||
EXPECT(hull3.getOuter()[1].getY() == approx(1));
|
||||
EXPECT(hull3.getOuter()[2].getX() == approx(4));
|
||||
EXPECT(hull3.getOuter()[2].getY() == approx(4));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{4, 4}, {1, 2}, {3, 10}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(3));
|
||||
EXPECT(hull3.getOuter()[0].getX() == approx(1));
|
||||
EXPECT(hull3.getOuter()[0].getY() == approx(2));
|
||||
EXPECT(hull3.getOuter()[1].getX() == approx(4));
|
||||
EXPECT(hull3.getOuter()[1].getY() == approx(4));
|
||||
EXPECT(hull3.getOuter()[2].getX() == approx(3));
|
||||
EXPECT(hull3.getOuter()[2].getY() == approx(10));
|
||||
|
||||
Line<double> test{{0.3215348546593775, 0.03629583077160248},
|
||||
{0.02402358131857918, -0.2356728797179394},
|
||||
{0.04590851212470659, -0.4156409924995536},
|
||||
{0.3218384001607433, 0.1379850698988746},
|
||||
{0.11506479756447, -0.1059521474930943},
|
||||
{0.2622539999543261, -0.29702873322836},
|
||||
{-0.161920957418085, -0.4055339716426413},
|
||||
{0.1905378631228002, 0.3698601009043493},
|
||||
{0.2387090918968516, -0.01629827079949742},
|
||||
{0.07495888748668034, -0.1659825110491202},
|
||||
{0.3319341836794598, -0.1821814101954749},
|
||||
{0.07703635755650362, -0.2499430638271785},
|
||||
{0.2069242999022122, -0.2232970760420869},
|
||||
{0.04604079532068295, -0.1923573186549892},
|
||||
{0.05054295812784038, 0.4754929463150845},
|
||||
{-0.3900589168910486, 0.2797829520700341},
|
||||
{0.3120693385713448, -0.0506329867529059},
|
||||
{0.01138812723698857, 0.4002504701728471},
|
||||
{0.009645149586391732, 0.1060251100976254},
|
||||
{-0.03597933197019559, 0.2953639456959105},
|
||||
{0.1818290866742182, 0.001454397571696298},
|
||||
{0.444056063372694, 0.2502497166863175},
|
||||
{-0.05301752458607545, -0.06553921621808712},
|
||||
{0.4823896228171788, -0.4776170002088109},
|
||||
{-0.3089226845734964, -0.06356112199235814},
|
||||
{-0.271780741188471, 0.1810810595574612},
|
||||
{0.4293626522918815, 0.2980897964891882},
|
||||
{-0.004796652127799228, 0.382663812844701},
|
||||
{0.430695573269106, -0.2995073500084759},
|
||||
{0.1799668387323309, -0.2973467472915973},
|
||||
{0.4932166845474547, 0.4928094162538735},
|
||||
{-0.3521487911717489, 0.4352656197131292},
|
||||
{-0.4907368011686362, 0.1865826865533206},
|
||||
{-0.1047924716070224, -0.247073392148198},
|
||||
{0.4374961861758457, -0.001606279519951237},
|
||||
{0.003256207800708899, -0.2729194320486108},
|
||||
{0.04310378203457577, 0.4452604050238248},
|
||||
{0.4916198379282093, -0.345391701297268},
|
||||
{0.001675087028811806, 0.1531837672490476},
|
||||
{-0.4404289572876217, -0.2894855991839297}
|
||||
|
||||
};
|
||||
hull3 = geo::convexHull(test);
|
||||
EXPECT(geo::contains(test, hull3));
|
||||
EXPECT(hull3.getOuter().size() == size_t(8));
|
||||
EXPECT(geo::contains(Polygon<double>({{-0.161920957418085, -0.4055339716426413},
|
||||
{0.05054295812784038, 0.4754929463150845},
|
||||
{0.4823896228171788, -0.4776170002088109},
|
||||
{0.4932166845474547, 0.4928094162538735},
|
||||
{-0.3521487911717489, 0.4352656197131292},
|
||||
{-0.4907368011686362, 0.1865826865533206},
|
||||
{0.4916198379282093, -0.345391701297268},
|
||||
{-0.4404289572876217,
|
||||
-0.2894855991839297}}), hull3));
|
||||
EXPECT(geo::contains(hull3, Polygon<double>({{-0.161920957418085, -0.4055339716426413},
|
||||
{0.05054295812784038, 0.4754929463150845},
|
||||
{0.4823896228171788, -0.4776170002088109},
|
||||
{0.4932166845474547, 0.4928094162538735},
|
||||
{-0.3521487911717489, 0.4352656197131292},
|
||||
{-0.4907368011686362, 0.1865826865533206},
|
||||
{0.4916198379282093, -0.345391701297268},
|
||||
{-0.4404289572876217,
|
||||
-0.2894855991839297}})));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{3, 6}, {8, 10}, {3, 5}, {20, -10}, {-4, 5}, {10, 2}, {5, 1}, {45, 1}, {30, -9}, {3, 14}, {25, -5.5}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(5));
|
||||
EXPECT(hull3.getOuter()[0].getX() == approx(-4));
|
||||
EXPECT(hull3.getOuter()[0].getY() == approx(5));
|
||||
EXPECT(hull3.getOuter()[1].getX() == approx(20));
|
||||
EXPECT(hull3.getOuter()[1].getY() == approx(-10));
|
||||
EXPECT(hull3.getOuter()[2].getX() == approx(30));
|
||||
EXPECT(hull3.getOuter()[2].getY() == approx(-9));
|
||||
EXPECT(hull3.getOuter()[3].getX() == approx(45));
|
||||
EXPECT(hull3.getOuter()[3].getY() == approx(1));
|
||||
EXPECT(hull3.getOuter()[4].getX() == approx(3));
|
||||
EXPECT(hull3.getOuter()[4].getY() == approx(14));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{7, 7}, {7, -7}, {-7, -7}, {-7, 7}, {9, 0}, {-9, 0}, {0, 9}, {0, -9}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(8));
|
||||
EXPECT(geo::contains(geo::Polygon<double>({{-9, 0}, {-7, -7}, {0, -9}, {7, -7}, {9, 0}, {7, 7}, {0, 9}, {-7, 7}}), hull3));
|
||||
EXPECT(geo::contains(hull3, geo::Polygon<double>({{-9, 0}, {-7, -7}, {0, -9}, {7, -7}, {9, 0}, {7, 7}, {0, 9}, {-7, 7}})));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{7, 7}, {7, -7}, {-7, -7}, {-7, 7}, {9, 0}, {-9, 0}, {0, 9}, {0, -9}, {0, 0}, {1, 2}, {-2, 1}, {-1, -1}, {3, 4}, {4, 3}, {-5, 4}, {6, 5}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(8));
|
||||
EXPECT(geo::contains(geo::Polygon<double>({{-9, 0}, {-7, -7}, {0, -9}, {7, -7}, {9, 0}, {7, 7}, {0, 9}, {-7, 7}}), hull3));
|
||||
EXPECT(geo::contains(hull3, geo::Polygon<double>({{-9, 0}, {-7, -7}, {0, -9}, {7, -7}, {9, 0}, {7, 7}, {0, 9}, {-7, 7}})));
|
||||
|
||||
hull3 = geo::convexHull(Line<double>{{0, 0}, {1, 2}, {-2, 1}, {-1, -1}, {3, 4}, {4, 3}, {-5, 4}, {6, 5}, {7, 7}, {7, -7}, {-7, -7}, {-7, 7}, {9, 0}, {-9, 0}, {0, 9}, {0, -9}, {-8, 0}, {8, 0}, {-7, 0}, {7, 0}, {-6, 0}, {6, 0}, {-5, 0}, {5, 0}, {-4, 0}, {4, 0}, {-3, 0}, {3, 0}, {-2, 0}, {2, 0}, {-1, 0}, {1, 0}, {0, -8}, {0, 8}, {0, -7}, {0, 7}, {0, -6}, {0, 6}, {0, -5}, {0, 5}, {0, -4}, {0, 4}, {0, -3}, {0, 3}, {0, -2}, {0, 2}, {0, -1}, {0, 1}, {1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}, {6, 6}, {1, -1}, {2, -2}, {3, -3}, {4, -4}, {5, -5}, {6, -6}, {-1, 1}, {-2, 2}, {-3, 3}, {-4, 4}, {-5, 5}, {-6, 6}, {-1, -1}, {-2, -2}, {-3, -3}, {-4, -4}, {-5, -5}, {-6, -6}});
|
||||
EXPECT(hull3.getOuter().size() == size_t(8));
|
||||
EXPECT(geo::contains(geo::Polygon<double>({{-9, 0}, {-7, -7}, {0, -9}, {7, -7}, {9, 0}, {7, 7}, {0, 9}, {-7, 7}}), hull3));
|
||||
EXPECT(geo::contains(hull3, geo::Polygon<double>({{-9, 0}, {-7, -7}, {0, -9}, {7, -7}, {9, 0}, {7, 7}, {0, 9}, {-7, 7}})));
|
||||
|
||||
EXPECT(geo::area(geo::Point<double>(1, 2)) == approx(0));
|
||||
EXPECT(geo::area(geo::Line<double>{{1, 2}, {2, 5}}) == approx(0));
|
||||
EXPECT(geo::area(geo::Box<double>({0, 0}, {1, 1})) == approx(1));
|
||||
EXPECT(geo::area(geo::Box<double>({1, 1}, {1, 1})) == approx(0));
|
||||
EXPECT(geo::area(geo::Box<double>({0, 0}, {2, 2})) == approx(4));
|
||||
EXPECT(geo::area(geo::Polygon<double>({{0, 0}, {1, 0}, {1, 1}, {0, 1}})) == approx(1));
|
||||
EXPECT(geo::area(geo::Polygon<double>({{0, 0}, {1, 0}, {1, 1}})) == approx(0.5));
|
||||
|
||||
auto obox = geo::getOrientedEnvelope(geo::Line<double>{{0, 0}, {1, 1}, {1.5, 0.5}});
|
||||
EXPECT(geo::contains(geo::convexHull(obox), geo::Polygon<double>({{0.0, 0.0}, {1.0, 1.0}, {1.5, 0.5}, {0.5, -0.5}})));
|
||||
EXPECT(geo::contains(geo::Polygon<double>({{0.0, 0.0}, {1.0, 1.0}, {1.5, 0.5}, {0.5, -0.5}}), geo::convexHull(obox)));
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue