diff --git a/include/aligator/modelling/multibody/multibody-friction-cone.hpp b/include/aligator/modelling/multibody/multibody-friction-cone.hpp index c24dac983..e87243d7a 100644 --- a/include/aligator/modelling/multibody/multibody-friction-cone.hpp +++ b/include/aligator/modelling/multibody/multibody-friction-cone.hpp @@ -83,9 +83,7 @@ struct MultibodyFrictionConeDataTpl : StageFunctionDataTpl { using Base = StageFunctionDataTpl; using PinData = pinocchio::DataTpl; using VectorXs = typename math_types::VectorXs; - using Vector3s = typename math_types::Vector3s; using MatrixXs = typename math_types::MatrixXs; - using Matrix6Xs = typename math_types::Matrix6Xs; using RigidConstraintDataVector = PINOCCHIO_STD_VECTOR_WITH_EIGEN_ALLOCATOR(pinocchio::RigidConstraintData); @@ -93,7 +91,7 @@ struct MultibodyFrictionConeDataTpl : StageFunctionDataTpl { PinData pin_data_; VectorXs tau_; MatrixXs temp_; - MatrixXs dcone_df_; + Eigen::Matrix dcone_df_; RigidConstraintDataVector constraint_datas_; pinocchio::ProximalSettingsTpl settings; diff --git a/include/aligator/modelling/multibody/multibody-friction-cone.hxx b/include/aligator/modelling/multibody/multibody-friction-cone.hxx index 360921947..588848667 100644 --- a/include/aligator/modelling/multibody/multibody-friction-cone.hxx +++ b/include/aligator/modelling/multibody/multibody-friction-cone.hxx @@ -69,7 +69,7 @@ template MultibodyFrictionConeDataTpl::MultibodyFrictionConeDataTpl( const MultibodyFrictionConeResidualTpl *model) : Base(model->ndx1, model->nu, 2), pin_data_(model->pin_model_), - tau_(model->pin_model_.nv), temp_(3, model->nu), dcone_df_(1, 3) { + tau_(model->pin_model_.nv), temp_(3, model->nu) { tau_.setZero(); temp_.setZero(); dcone_df_.setZero(); diff --git a/include/aligator/solvers/proxddp/solver-proxddp.hxx b/include/aligator/solvers/proxddp/solver-proxddp.hxx index 7627e6c70..512df57cd 100644 --- a/include/aligator/solvers/proxddp/solver-proxddp.hxx +++ b/include/aligator/solvers/proxddp/solver-proxddp.hxx @@ -187,25 +187,6 @@ void SolverProxDDPTpl::cycleProblem( results_.cycleAppend(problem, problem.getInitState()); workspace_.cycleAppend(problem, data); linearSolver_->cycleAppend(workspace_.knots[workspace_.nsteps - 1]); - - switch (linear_solver_choice) { - case LQSolverChoice::SERIAL: { - // linearSolver_->cycleAppend(workspace_.knots[workspace_.nsteps - 1]); - linearSolver_ = std::make_unique>( - workspace_.lqr_problem); - break; - } - case LQSolverChoice::PARALLEL: { - linearSolver_ = std::make_unique>( - workspace_.lqr_problem, num_threads_); - break; - } - case LQSolverChoice::STAGEDENSE: { - linearSolver_ = std::make_unique>( - workspace_.lqr_problem); - break; - } - } } template bool is_nan_any(const VArgs &...args) {