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
Pierre Fernbach
tsid
Commits
f66a8459
Commit
f66a8459
authored
Nov 21, 2017
by
andreadelprete
Browse files
[inv-dyn-form-acc-force] Fix bug: weight of force regularization task was not updated
parent
64e6efa0
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/formulations/inverse-dynamics-formulation-acc-force.cpp
View file @
f66a8459
...
...
@@ -278,6 +278,20 @@ const HQPData & InverseDynamicsFormulationAccForce::computeProblemData(double ti
const
ConstraintEquality
&
fr
=
cl
->
contact
.
computeForceRegularizationTask
(
time
,
q
,
v
,
m_data
);
cl
->
forceRegTask
->
matrix
().
middleCols
(
m_v
+
cl
->
index
,
m
)
=
fr
.
matrix
();
cl
->
forceRegTask
->
vector
()
=
fr
.
vector
();
// update weight of force regularization task
ConstraintLevel
::
iterator
itt
;
for
(
int
i
=
1
;
i
<
m_hqpData
.
size
();
i
++
)
{
for
(
itt
=
m_hqpData
[
i
].
begin
();
itt
!=
m_hqpData
[
i
].
end
();
itt
++
)
{
if
(
itt
->
second
->
name
()
==
cl
->
contact
.
name
())
{
itt
->
first
=
cl
->
contact
.
getForceRegularizationWeight
();
break
;
}
}
}
}
const
Matrix
&
M_a
=
m_robot
.
mass
(
m_data
).
bottomRows
(
m_v
-
6
);
...
...
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