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
Humanoid Path Planner
hpp-core
Commits
fa8e4dfa
Commit
fa8e4dfa
authored
Mar 18, 2014
by
Florent Lamiraux
Browse files
Fix locked degree of freedom computations.
parent
922d745c
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/hpp/core/locked-dof.hh
View file @
fa8e4dfa
...
...
@@ -59,6 +59,7 @@ namespace hpp {
}
void
init
(
const
LockedDofPtr_t
&
self
)
{
Constraint
::
init
(
self
);
weak_
=
self
;
}
bool
impl_compute
(
Configuration_t
&
configuration
)
...
...
src/config-projector.cc
View file @
fa8e4dfa
...
...
@@ -96,9 +96,13 @@ namespace hpp {
if
(
size
>
0
)
{
interval
.
first
=
latestIndex
+
1
;
interval
.
second
=
size
;
hppDout
(
info
,
"Adding interval ["
<<
interval
.
first
<<
","
<<
interval
.
second
<<
"]"
);
intervals_
.
push_back
(
interval
);
}
latestIndex
=
index
;
}
hppDout
(
info
,
""
);
// Remove temporary element.
lockedDofs_
.
pop_back
();
}
...
...
@@ -115,10 +119,12 @@ namespace hpp {
nbNonLockedDofs_
=
robot_
->
numberDof
()
-
lockedDofs_
.
size
();
value_
.
resize
(
size
);
reducedJacobian_
.
resize
(
size
,
nbNonLockedDofs_
);
reducedJacobian_
.
setConstant
(
sqrt
(
-
1
));
dqSmall_
.
resize
(
nbNonLockedDofs_
);
dq_
.
fill
(
0.
);
dq_
.
setZero
(
);
toMinusFromSmall_
.
resize
(
nbNonLockedDofs_
);
projMinusFromSmall_
.
resize
(
nbNonLockedDofs_
);
projMinusFrom_
.
setZero
();
reducedProjector_
.
resize
(
nbNonLockedDofs_
,
nbNonLockedDofs_
);
}
...
...
@@ -248,6 +254,9 @@ namespace hpp {
reducedProjector_
-=
V1
*
V1
.
transpose
();
projMinusFromSmall_
=
reducedProjector_
*
toMinusFromSmall_
;
smallToNormal
(
projMinusFromSmall_
,
projMinusFrom_
);
hppDout
(
info
,
"projMinusFromSmall_ = "
<<
projMinusFromSmall_
.
transpose
());
hppDout
(
info
,
"projMinusFrom_ = "
<<
projMinusFrom_
.
transpose
());
model
::
integrate
(
robot_
,
from
,
projMinusFrom_
,
result
);
}
...
...
src/problem-solver.cc
View file @
fa8e4dfa
...
...
@@ -92,7 +92,7 @@ namespace hpp {
if
(
robot_
)
constraints_
->
addConstraint
(
constraint
);
else
hppDout
(
info
,
"Cannot add constraint while robot is not set"
);
hppDout
(
error
,
"Cannot add constraint while robot is not set"
);
}
void
ProblemSolver
::
resetConstraints
()
...
...
Write
Preview
Supports
Markdown
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