Skip to content

Commit 28770ae

Browse files
committed
algo/cholesky: fix API to account for Holder in ConstraintCholesky constructor
1 parent 5ba85a9 commit 28770ae

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

include/pinocchio/algorithm/contact-cholesky.hpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ namespace pinocchio
158158
class ConstraintAllocator>
159159
ContactCholeskyDecompositionTpl(
160160
const ModelTpl<S1, O1, JointCollectionTpl> & model,
161-
const std::vector<ConstraintModel, ConstraintAllocator> & contact_models)
161+
const std::vector<ConstraintModel, ConstraintAllocator> & constraint_models)
162162
: D(D_storage.map())
163163
, Dinv(Dinv_storage.map())
164164
, U(U_storage.map())
@@ -169,8 +169,9 @@ namespace pinocchio
169169
typedef std::reference_wrapper<const ConstraintModel> WrappedType;
170170
typedef std::vector<WrappedType> WrappedTypeVector;
171171

172-
WrappedTypeVector wrapped_contact_models(contact_models.cbegin(), contact_models.cend());
173-
resize(model, wrapped_contact_models);
172+
WrappedTypeVector wrapped_constraint_models(
173+
constraint_models.cbegin(), constraint_models.cend());
174+
resize(model, wrapped_constraint_models);
174175
}
175176

176177
///
@@ -185,18 +186,19 @@ namespace pinocchio
185186
int O1,
186187
template<typename, int> class JointCollectionTpl,
187188
template<typename T> class Holder,
188-
class Allocator>
189+
class ConstraintAllocator>
189190
ContactCholeskyDecompositionTpl(
190191
const ModelTpl<S1, O1, JointCollectionTpl> & model,
191-
const std::vector<Holder<const RigidConstraintModelTpl<S1, O1>>, Allocator> & contact_models)
192+
const std::vector<Holder<const ConstraintModel>, ConstraintAllocator> &
193+
wrapped_constraint_models)
192194
: D(D_storage.map())
193195
, Dinv(Dinv_storage.map())
194196
, U(U_storage.map())
195197
, DUt(DUt_storage.map())
196198
, compliance(compliance_storage.map())
197199
, damping(damping_storage.map())
198200
{
199-
resize(model, contact_models);
201+
resize(model, wrapped_constraint_models);
200202
}
201203

202204
///

0 commit comments

Comments
 (0)