Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

J

jrl-walkgen
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

080e36ec

Commit 080e36ec authored 10 years ago by mnaveau

Downloads
- Plain Diff

Merge branch 'topic/dynamic_filter_with_metapod_morisawaZMPDiscretization' into topic/merge

Conflicts:
	src/ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.cpp
	src/ZMPRefTrajectoryGeneration/DynamicFilter.cpp

parents 2697b87a 557c7929

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/PreviewControl/PreviewControl.cpp 2 additions, 2 deletions

src/PreviewControl/PreviewControl.cpp
src/ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.cpp 155 additions, 55 deletions

src/ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.cpp
src/ZMPRefTrajectoryGeneration/DynamicFilter.cpp 41 additions, 20 deletions

src/ZMPRefTrajectoryGeneration/DynamicFilter.cpp
src/ZMPRefTrajectoryGeneration/DynamicFilter.hh 5 additions, 1 deletion

src/ZMPRefTrajectoryGeneration/DynamicFilter.hh
tests/TestMorisawa2007.cpp 1 addition, 1 deletion

tests/TestMorisawa2007.cpp

with 204 additions and 79 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment