Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jrl-walkgen
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
Container Registry
Model registry
Operate
Environments
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Guilhem Saurel
jrl-walkgen
Commits
dcc5fae2
Commit
dcc5fae2
authored
8 years ago
by
Olivier Stasse
Committed by
mnaveau
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix pb with pinocchio-devel getFrameParent->getFrameId
Fix pb with unitary tests.
parent
336d19d8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake
+1
-1
1 addition, 1 deletion
cmake
src/RobotDynamics/pinocchiorobot.cpp
+6
-6
6 additions, 6 deletions
src/RobotDynamics/pinocchiorobot.cpp
tests/CMakeLists.txt
+31
-6
31 additions, 6 deletions
tests/CMakeLists.txt
with
38 additions
and
13 deletions
cmake
@
1ad98457
Compare
5663a002
...
1ad98457
Subproject commit
5663a002a905b5c8d84a69d8e74044a8e34a48ed
Subproject commit
1ad984575ca91a4e19ce9eb9d092e92d09fcb7fb
This diff is collapsed.
Click to expand it.
src/RobotDynamics/pinocchiorobot.cpp
+
6
−
6
View file @
dcc5fae2
...
...
@@ -144,12 +144,12 @@ bool PinocchioRobot::initializeRobotModelAndData(se3::Model * robotModel,
m_robotModel
=
robotModel
;
// initialize the short cut for the joint ids
m_chest
=
m_robotModel
->
getFrame
Parent
(
"torso"
);
m_waist
=
m_robotModel
->
getFrame
Parent
(
"BODY"
);
m_leftFoot
.
associatedAnkle
=
m_robotModel
->
getFrame
Parent
(
"l_ankle"
);
m_rightFoot
.
associatedAnkle
=
m_robotModel
->
getFrame
Parent
(
"r_ankle"
);
m_leftWrist
=
m_robotModel
->
getFrame
Parent
(
"l_wrist"
);
m_rightWrist
=
m_robotModel
->
getFrame
Parent
(
"r_wrist"
);
m_chest
=
m_robotModel
->
getFrame
Id
(
"torso"
);
m_waist
=
m_robotModel
->
getFrame
Id
(
"BODY"
);
m_leftFoot
.
associatedAnkle
=
m_robotModel
->
getFrame
Id
(
"l_ankle"
);
m_rightFoot
.
associatedAnkle
=
m_robotModel
->
getFrame
Id
(
"r_ankle"
);
m_leftWrist
=
m_robotModel
->
getFrame
Id
(
"l_wrist"
);
m_rightWrist
=
m_robotModel
->
getFrame
Id
(
"r_wrist"
);
DetectAutomaticallyShoulders
();
// intialize the "initial pose" (q=[0]) data
...
...
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
31
−
6
View file @
dcc5fae2
...
...
@@ -113,6 +113,31 @@ MACRO(ADD_JRL_WALKGEN_TEST test_arg test_file_name)
ENDMACRO
(
ADD_JRL_WALKGEN_TEST
)
MACRO
(
ADD_JRL_WALKGEN_EXE test_arg test_file_name
)
SET
(
test_name
"
${
test_arg
}${
BITS
}
"
)
ADD_EXECUTABLE
(
${
test_name
}
${
test_file_name
}
TestObject.cpp
CommonTools.cpp
ClockCPUTime.cpp
../src/portability/gettimeofday.cc
)
MESSAGE
(
STATUS
"Prepare test : "
${
test_name
}
)
SET
(
urdfpath
${
SIMPLE_HUMANOID_DESCRIPTION_PKGDATAROOTDIR
}
/simple_humanoid_description/urdf/simple_humanoid.urdf
)
SET
(
srdfpath
${
SIMPLE_HUMANOID_DESCRIPTION_PKGDATAROOTDIR
}
/simple_humanoid_description/srdf/simple_humanoid.srdf
)
LIST
(
APPEND LOGGING_WATCHED_VARIABLES urdfpath srdfpath
)
TARGET_LINK_LIBRARIES
(
${
test_name
}
${
PROJECT_NAME
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
test_name
}
jrl-mal
)
ENDMACRO
(
ADD_JRL_WALKGEN_EXE
)
#######################
## Test Morisawa 2007 #
...
...
@@ -123,12 +148,12 @@ ENDMACRO(ADD_JRL_WALKGEN_TEST)
# the following disabled test case are just useful code for offline
# motion generation using the specialized inverse kinmatics of a robot
#
ADD_JRL_WALKGEN_
TEST
(TestMorisawa2007ShortWalk TestMorisawa2007.cpp)
#
ADD_JRL_WALKGEN_
TEST
(TestMorisawa2007Climbing TestMorisawa2007.cpp)
#
ADD_JRL_WALKGEN_
TEST
(TestMorisawa2007GoingDown TestMorisawa2007.cpp)
#
ADD_JRL_WALKGEN_
TEST
(TestMorisawa2007SteppingStones TestMorisawa2007.cpp)
#
ADD_JRL_WALKGEN_
TEST
(TestMorisawa2007WalkingOnBeam TestMorisawa2007.cpp)
#
ADD_JRL_WALKGEN_
TEST
(TestMorisawa2007GoThroughWall TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_
EXE
(
TestMorisawa2007ShortWalk TestMorisawa2007.cpp
)
ADD_JRL_WALKGEN_
EXE
(
TestMorisawa2007Climbing TestMorisawa2007.cpp
)
ADD_JRL_WALKGEN_
EXE
(
TestMorisawa2007GoingDown TestMorisawa2007.cpp
)
ADD_JRL_WALKGEN_
EXE
(
TestMorisawa2007SteppingStones TestMorisawa2007.cpp
)
ADD_JRL_WALKGEN_
EXE
(
TestMorisawa2007WalkingOnBeam TestMorisawa2007.cpp
)
ADD_JRL_WALKGEN_
EXE
(
TestMorisawa2007GoThroughWall TestMorisawa2007.cpp
)
####################
## Test Herdt 2010 #
...
...
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