@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE(KinodynamicsID_baseTask)
214214
215215BOOST_AUTO_TEST_CASE (KinodynamicsID_allTasks)
216216{
217- RobotModelHandler model_handler = getSoloHandler ();
217+ RobotModelHandler model_handler = getTalosModelHandler ();
218218 RobotDataHandler data_handler (model_handler);
219219 const double dt = 1e-3 ;
220220
@@ -223,25 +223,25 @@ BOOST_AUTO_TEST_CASE(KinodynamicsID_allTasks)
223223 KinodynamicsID::Settings ()
224224 .set_kp_base (7 .)
225225 .set_kp_posture (10 .)
226- .set_kp_contact (10 .0 )
227- .set_w_base (100 .0 )
228- .set_w_posture (1 .0 )
229- .set_w_contact_force (1.0 )
226+ .set_kp_contact (1 .0 )
227+ .set_w_base (10 .0 )
228+ .set_w_posture (10 .0 )
229+ .set_w_contact_force (. 1 )
230230 .set_w_contact_motion (1.0 ));
231231
232232 const Eigen::VectorXd q_target = model_handler.getReferenceState ().head (model_handler.getModel ().nq );
233- Eigen::MatrixXd f_target = Eigen::MatrixXd::Zero ( 4 , 3 ) ;
234- f_target ( 0 , 2 ) = model_handler. getMass () * 9.81 / 4 ;
235- f_target ( 1 , 2 ) = model_handler. getMass () * 9.81 / 4 ;
236- f_target ( 2 , 2 ) = model_handler. getMass () * 9.81 / 4 ;
237- f_target ( 3 , 2 ) = model_handler.getMass () * 9.81 / 4 ;
238-
233+ std::vector<KinodynamicsID::TargetContactForce> f_target ;
234+ for ( int i = 0 ; i < 2 ; i++)
235+ {
236+ f_target. push_back ( KinodynamicsID::TargetContactForce::Zero ( 6 )) ;
237+ f_target[i][ 2 ] = model_handler.getMass () * 9.81 / 4 ;
238+ }
239239 solver.setTarget (
240240 q_target, Eigen::VectorXd::Zero (model_handler.getModel ().nv ), Eigen::VectorXd::Zero (model_handler.getModel ().nv ),
241241 {true , true , true , true }, f_target);
242242
243243 double t = 0 ;
244- Eigen::VectorXd q = solo_q_start ( model_handler);
244+ Eigen::VectorXd q = model_handler. getReferenceState (). head ( model_handler. getModel (). nq );
245245 Eigen::VectorXd v = Eigen::VectorXd::Random (model_handler.getModel ().nv );
246246 Eigen::VectorXd a = Eigen::VectorXd::Random (model_handler.getModel ().nv );
247247 Eigen::VectorXd tau = Eigen::VectorXd::Zero (model_handler.getModel ().nv - 6 );
0 commit comments