Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
822fa051
Unverified
Commit
822fa051
authored
Nov 16, 2020
by
Justin Carpentier
Committed by
GitHub
Nov 16, 2020
Browse files
Merge pull request #1341 from jcarpent/topic/boost
Fix Boost warning + fix doc
parents
4dcea71b
4bea0715
Pipeline
#12244
passed with stage
in 118 minutes and 41 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
doc/Overview.md
View file @
822fa051
...
...
@@ -67,7 +67,7 @@ We start with a simple program to compute the robot inverse dynamics. It is give
You can compile the C++ version by including Pinocchio and Eigen header directories.
\c
ode g++ -
I /path/to/eigen -I /path/to/pinocchio/include/
overview-simple.cpp -o overview-simple
\e
ndcode
\c
ode g++ -
std=c++11 $(pkg-config --cflags --libs pinocchio)
overview-simple.cpp -o overview-simple
\e
ndcode
where
`/path/to/pinocchio`
is your chosen installation directory for Pinocchio.
If you do not know Eigen's installation path, you can retrive it with
`pkg-config --cflags eigen3`
.
...
...
@@ -136,10 +136,9 @@ in Python.
\s
ubsection OverviewComplexCompile Compiling and running your program
This time, we must specify that URDFDOM is needed, as the model will be parsed from URDF.
Also, we need to link to
`liburdfdom_model`
and to
`libboost_system`
.
In similar way than the previous example, you simple need to do:
\c
ode g++ -
I /path/to/eigen -I /path/to/pinocchio/include/ -DPINOCCHIO_URDFDOM_TYPEDEF_SHARED_PTR -DPINOCCHIO_WITH_URDFDOM overview-urdf.cpp -lboost_system -lurdfdom_model
-o overview-urdf
\e
ndcode
\c
ode g++ -
std=c++11 $(pkg-config --cflags --libs pinocchio) overview-urdf.cpp
-o overview-urdf
\e
ndcode
The program typically runs with a UR5 URDF description, that can be found for example in this repository https://github.com/humanoid-path-planner/ur_description
...
...
src/multibody/data.hxx
View file @
822fa051
//
// Copyright (c) 2015-20
19
CNRS INRIA
// Copyright (c) 2015-20
20
CNRS INRIA
// Copyright (c) 2015 Wandercraft, 86 rue de Paris 91400 Orsay, France.
//
...
...
@@ -11,9 +11,6 @@
#include "pinocchio/utils/string-generator.hpp"
#include "pinocchio/multibody/liegroup/liegroup-algo.hpp"
#include <boost/bind.hpp>
#include <boost/utility.hpp>
/// @cond DEV
namespace
pinocchio
...
...
src/multibody/geometry.hxx
View file @
822fa051
...
...
@@ -7,6 +7,9 @@
#include "pinocchio/multibody/model.hpp"
#include <boost/bind/bind.hpp>
#include <boost/utility.hpp>
/// @cond DEV
namespace
pinocchio
...
...
@@ -94,7 +97,7 @@ namespace pinocchio
inline
GeomIndex
GeometryModel
::
getGeometryId
(
const
std
::
string
&
name
)
const
{
using
namespace
boost
::
placeholders
;
GeometryObjectVector
::
const_iterator
it
=
std
::
find_if
(
geometryObjects
.
begin
(),
geometryObjects
.
end
(),
...
...
@@ -105,6 +108,7 @@ namespace pinocchio
inline
bool
GeometryModel
::
existGeometryName
(
const
std
::
string
&
name
)
const
{
using
namespace
boost
::
placeholders
;
return
std
::
find_if
(
geometryObjects
.
begin
(),
geometryObjects
.
end
(),
boost
::
bind
(
&
GeometryObject
::
name
,
_1
)
==
name
)
!=
geometryObjects
.
end
();
...
...
src/multibody/model.hxx
View file @
822fa051
...
...
@@ -10,9 +10,6 @@
#include "pinocchio/utils/string-generator.hpp"
#include "pinocchio/multibody/liegroup/liegroup-algo.hpp"
#include <boost/bind.hpp>
#include <boost/utility.hpp>
/// @cond DEV
namespace
pinocchio
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment