Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
Navigation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
Skills
Navigation
Commits
3576ed73
Commit
3576ed73
authored
2 years ago
by
Timo Weberruß
Browse files
Options
Downloads
Patches
Plain Diff
Use ConvexHullGenerator in HumanGrouper
parent
7c6a6135
No related branches found
Branches containing commit
No related tags found
2 merge requests
!109
Social layers
,
!55
Draft: Implement human grouping
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/armarx/navigation/human/ConvexHullGenerator.h
+1
-1
1 addition, 1 deletion
source/armarx/navigation/human/ConvexHullGenerator.h
source/armarx/navigation/human/HumanGrouper.cpp
+3
-1
3 additions, 1 deletion
source/armarx/navigation/human/HumanGrouper.cpp
with
4 additions
and
2 deletions
source/armarx/navigation/human/ConvexHullGenerator.h
+
1
−
1
View file @
3576ed73
...
...
@@ -34,7 +34,7 @@ namespace armarx::navigation::human
* @brief A GroupShapeGenerator that defines the group shape of a set of humans as the
* convex hull of their positions in 2D space.
*/
class
ConvexHullGenerator
:
GroupShapeGenerator
class
ConvexHullGenerator
:
public
GroupShapeGenerator
{
public:
ConvexHullGenerator
();
...
...
This diff is collapsed.
Click to expand it.
source/armarx/navigation/human/HumanGrouper.cpp
+
3
−
1
View file @
3576ed73
#include
"CombinedDistance.h"
#include
"ConvexHullGenerator.h"
#include
"HumanGrouper.h"
namespace
armarx
::
navigation
::
human
...
...
@@ -6,12 +7,13 @@ namespace armarx::navigation::human
HumanGrouper
::
HumanGrouper
(
GroupingSettings
settings
)
:
settings
(
settings
)
{
this
->
distanceFunction
=
new
CombinedDistance
(
settings
.
maxOrientationInfluence
);
this
->
shapeGenerator
=
NULL
;
// TODO: implement and use interface
this
->
shapeGenerator
=
new
ConvexHullGenerator
();
}
HumanGrouper
::~
HumanGrouper
()
{
delete
this
->
distanceFunction
;
delete
this
->
shapeGenerator
;
}
void
HumanGrouper
::
updateHumans
(
std
::
vector
<
human
::
Human
>
&
newHumans
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment