Skip to content
Snippets Groups Projects
Commit 008820ca authored by Timo Weberruß's avatar Timo Weberruß
Browse files

Fix stuff for buildable state

parent 9ce93392
No related branches found
No related tags found
2 merge requests!109Social layers,!55Draft: Implement human grouping
This commit is part of merge request !55. Comments created here will be created in the context of that merge request.
...@@ -10,8 +10,6 @@ BOOST_GEOMETRY_REGISTER_POINT_2D(Point, double, boost::geometry::cs::cartesian, ...@@ -10,8 +10,6 @@ BOOST_GEOMETRY_REGISTER_POINT_2D(Point, double, boost::geometry::cs::cartesian,
namespace armarx::navigation::human namespace armarx::navigation::human
{ {
ConvexHullGenerator::ConvexHullGenerator() = default;
shapes::Polygon shapes::Polygon
ConvexHullGenerator::createShape(const HumanGroup& group) const ConvexHullGenerator::createShape(const HumanGroup& group) const
{ {
...@@ -29,7 +27,7 @@ namespace armarx::navigation::human ...@@ -29,7 +27,7 @@ namespace armarx::navigation::human
} }
BoostPoly poly; BoostPoly poly;
const BoostPoly hull; BoostPoly hull;
poly.outer().assign(coordinates.begin(), coordinates.end()); poly.outer().assign(coordinates.begin(), coordinates.end());
boost::geometry::convex_hull(poly, hull); boost::geometry::convex_hull(poly, hull);
...@@ -47,5 +45,6 @@ namespace armarx::navigation::human ...@@ -47,5 +45,6 @@ namespace armarx::navigation::human
} }
return {.vertices = vertices}; return {.vertices = vertices};
} }
} // namespace armarx::navigation::human } // namespace armarx::navigation::human
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
namespace armarx::navigation::human namespace armarx::navigation::human
{ {
EuclideanDistance::EuclideanDistance() = default;
double double
EuclideanDistance::computeDistance(const Human& h1, const Human& h2) const EuclideanDistance::computeDistance(const Human& h1, const Human& h2) const
{ {
......
...@@ -33,7 +33,7 @@ namespace armarx::navigation::human ...@@ -33,7 +33,7 @@ namespace armarx::navigation::human
class EuclideanDistance : public DistanceFunction class EuclideanDistance : public DistanceFunction
{ {
public: public:
EuclideanDistance(); EuclideanDistance() = default;
double computeDistance(const Human& h1, const Human& h2) const override; double computeDistance(const Human& h1, const Human& h2) const override;
}; };
} // namespace armarx::navigation::human } // namespace armarx::navigation::human
...@@ -46,9 +46,9 @@ using armarx::navigation::human::Human; ...@@ -46,9 +46,9 @@ using armarx::navigation::human::Human;
BOOST_AUTO_TEST_CASE(testEuclideanDistance) BOOST_AUTO_TEST_CASE(testEuclideanDistance)
{ {
EuclideanDistance distance = EuclideanDistance(); // EuclideanDistance distance = EuclideanDistance();
Pose2D pose1 = Pose2D::Identity(); // Pose2D pose1 = Pose2D::Identity();
// pose1.translation() = Eigen::Vector2f(3, 4); // pose1.translation() = Eigen::Vector2f(3, 4);
// pose1.linear() = Eigen::Rotation2Df(1.1).toRotationMatrix(); // pose1.linear() = Eigen::Rotation2Df(1.1).toRotationMatrix();
// Human h1 = {.pose = pose1, // Human h1 = {.pose = pose1,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment