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
d8d72e09
Commit
d8d72e09
authored
14 years ago
by
Francois Bleibel
Browse files
Options
Downloads
Patches
Plain Diff
Minor corrections.
parent
d541dc84
No related branches found
No related tags found
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/Mathematics/FootConstraintsAsLinearSystemForVelRef.cpp
+15
-3
15 additions, 3 deletions
src/Mathematics/FootConstraintsAsLinearSystemForVelRef.cpp
src/Mathematics/FootHalfSize.cpp
+3
-2
3 additions, 2 deletions
src/Mathematics/FootHalfSize.cpp
with
19 additions
and
6 deletions
cmake
@
3f2af61f
Compare
1a546105
...
3f2af61f
Subproject commit
1a5461058c3f9acb3221b642ef1a9e59b9f3d6de
Subproject commit
3f2af61ff8181b1dec4d710e2a2e28c8f0fb6b7f
This diff is collapsed.
Click to expand it.
src/Mathematics/FootConstraintsAsLinearSystemForVelRef.cpp
+
15
−
3
View file @
d8d72e09
...
...
@@ -97,6 +97,17 @@ FootConstraintsAsLinearSystemForVelRef(SimplePluginManager *aSPM,
aof
.
close
();
}
// Register method to handle
string
aMethodName
[]
=
{
":setfeetconstraint"
};
for
(
int
i
=
0
;
i
<
1
;
i
++
)
{
if
(
!
RegisterMethod
(
aMethodName
[
i
]))
{
std
::
cerr
<<
"Unable to register "
<<
aMethodName
<<
std
::
endl
;
}
}
}
FootConstraintsAsLinearSystemForVelRef
::
...
...
@@ -480,17 +491,18 @@ void FootConstraintsAsLinearSystemForVelRef::CallMethod(std::string &Method, std
{
string
lCmd
;
Args
>>
lCmd
;
if
(
lCmd
==
"XY"
)
{
Args
>>
m_ConstraintOnX
;
Args
>>
m_ConstraintOnY
;
m_RightFootSize
.
setConstraints
(
m_ConstraintOnX
,
m_ConstraintOnY
);
m_LeftFootSize
.
setConstraints
(
m_ConstraintOnX
,
m_ConstraintOnY
);
cout
<<
"Constraint On X: "
<<
m_ConstraintOnX
<<
" Constraint On Y: "
<<
m_ConstraintOnY
<<
endl
;
}
}
}
This diff is collapsed.
Click to expand it.
src/Mathematics/FootHalfSize.cpp
+
3
−
2
View file @
d8d72e09
...
...
@@ -26,6 +26,8 @@
#include
<Mathematics/FootHalfSize.hh>
using
namespace
PatternGeneratorJRL
;
#include
<iostream>
using
namespace
std
;
FootHalfSize
::
FootHalfSize
()
{
...
...
@@ -63,7 +65,6 @@ void FootHalfSize::updateHalfSize()
m_HalfWidth
-=
m_ConstraintsOnX
;
m_HalfHeight
-=
m_ConstraintsOnY
;
}
void
FootHalfSize
::
updateHalfHeightDS
()
...
...
@@ -76,7 +77,7 @@ void FootHalfSize::updateHalfHeightDS()
void
FootHalfSize
::
setConstraints
(
double
OnX
,
double
OnY
)
{
m_ConstraintsOnX
=
OnX
;
m_ConstraintsOn
X
=
OnY
;
m_ConstraintsOn
Y
=
OnY
;
updateHalfSize
();
updateHalfHeightDS
();
...
...
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