Skip to content

Commit 3122709

Browse files
committed
core: Initialize all RigidConstraintDataTpl values
1 parent 5c4bc5b commit 3122709

File tree

1 file changed

+46
-13
lines changed

1 file changed

+46
-13
lines changed

include/pinocchio/algorithm/contact-info.hpp

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,8 @@ namespace pinocchio
496496
template<
497497
typename InputMatrix,
498498
typename OutputMatrix,
499-
template<typename, int> class JointCollectionTpl>
499+
template<typename, int>
500+
class JointCollectionTpl>
500501
void jacobian_matrix_product(
501502
const ModelTpl<Scalar, Options, JointCollectionTpl> & model,
502503
const DataTpl<Scalar, Options, JointCollectionTpl> & data,
@@ -901,11 +902,43 @@ namespace pinocchio
901902

902903
/// \brief Default constructor
903904
RigidConstraintDataTpl()
905+
: contact_force(Force::Zero())
906+
, oMc1(SE3::Identity())
907+
, oMc2(SE3::Identity())
908+
, c1Mc2(SE3::Identity())
909+
, contact_placement_error(Motion::Zero())
910+
, contact1_velocity(Motion::Zero())
911+
, contact2_velocity(Motion::Zero())
912+
, contact_velocity_error(Motion::Zero())
913+
, contact_acceleration(Motion::Zero())
914+
, contact_acceleration_desired(Motion::Zero())
915+
, contact_acceleration_error(Motion::Zero())
916+
, contact1_acceleration_drift(Motion::Zero())
917+
, contact2_acceleration_drift(Motion::Zero())
918+
, contact_acceleration_deviation(Motion::Zero())
919+
, extended_motion_propagators_joint1()
920+
, lambdas_joint1()
921+
, extended_motion_propagators_joint2()
922+
, dv1_dq(6, 0)
923+
, da1_dq(6, 0)
924+
, da1_dv(6, 0)
925+
, da1_da(6, 0)
926+
, dv2_dq(6, 0)
927+
, da2_dq(6, 0)
928+
, da2_dv(6, 0)
929+
, da2_da(6, 0)
930+
, dvc_dq()
931+
, dac_dq()
932+
, dac_dv()
933+
, dac_da()
904934
{
905935
}
906936

907937
explicit RigidConstraintDataTpl(const ContactModel & contact_model)
908938
: contact_force(Force::Zero())
939+
, oMc1(SE3::Identity())
940+
, oMc2(SE3::Identity())
941+
, c1Mc2(SE3::Identity())
909942
, contact_placement_error(Motion::Zero())
910943
, contact1_velocity(Motion::Zero())
911944
, contact2_velocity(Motion::Zero())
@@ -919,18 +952,18 @@ namespace pinocchio
919952
, extended_motion_propagators_joint1(contact_model.depth_joint1, Matrix6::Zero())
920953
, lambdas_joint1(contact_model.depth_joint1, Matrix6::Zero())
921954
, extended_motion_propagators_joint2(contact_model.depth_joint2, Matrix6::Zero())
922-
, dv1_dq(6, contact_model.nv)
923-
, da1_dq(6, contact_model.nv)
924-
, da1_dv(6, contact_model.nv)
925-
, da1_da(6, contact_model.nv)
926-
, dv2_dq(6, contact_model.nv)
927-
, da2_dq(6, contact_model.nv)
928-
, da2_dv(6, contact_model.nv)
929-
, da2_da(6, contact_model.nv)
930-
, dvc_dq(contact_model.size(), contact_model.nv)
931-
, dac_dq(contact_model.size(), contact_model.nv)
932-
, dac_dv(contact_model.size(), contact_model.nv)
933-
, dac_da(contact_model.size(), contact_model.nv)
955+
, dv1_dq(Matrix6x::Zero(6, contact_model.nv))
956+
, da1_dq(Matrix6x::Zero(6, contact_model.nv))
957+
, da1_dv(Matrix6x::Zero(6, contact_model.nv))
958+
, da1_da(Matrix6x::Zero(6, contact_model.nv))
959+
, dv2_dq(Matrix6x::Zero(6, contact_model.nv))
960+
, da2_dq(Matrix6x::Zero(6, contact_model.nv))
961+
, da2_dv(Matrix6x::Zero(6, contact_model.nv))
962+
, da2_da(Matrix6x::Zero(6, contact_model.nv))
963+
, dvc_dq(MatrixX::Zero(contact_model.size(), contact_model.nv))
964+
, dac_dq(MatrixX::Zero(contact_model.size(), contact_model.nv))
965+
, dac_dv(MatrixX::Zero(contact_model.size(), contact_model.nv))
966+
, dac_da(MatrixX::Zero(contact_model.size(), contact_model.nv))
934967
{
935968
}
936969

0 commit comments

Comments
 (0)