Skip to content

Commit 1af860d

Browse files
committed
fix: removes wrong changes
1 parent c03a32a commit 1af860d

3 files changed

Lines changed: 4 additions & 15 deletions

File tree

moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/trajectory_functions.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ bool generateJointTrajectory(const planning_scene::PlanningSceneConstPtr& scene,
145145
const JointLimitsContainer& joint_limits, const KDL::Trajectory& trajectory,
146146
const std::string& group_name, const std::string& link_name,
147147
const std::map<std::string, double>& initial_joint_position,
148-
std::vector<double> time_samples, trajectory_msgs::msg::JointTrajectory& joint_trajectory,
148+
const std::vector<double>& time_samples,
149+
trajectory_msgs::msg::JointTrajectory& joint_trajectory,
149150
moveit_msgs::msg::MoveItErrorCodes& error_code, bool check_self_collision = false);
150151

151152
/**

moveit_planners/pilz_industrial_motion_planner/src/trajectory_functions.cpp

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ bool pilz_industrial_motion_planner::generateJointTrajectory(
341341
const planning_scene::PlanningSceneConstPtr& scene,
342342
const pilz_industrial_motion_planner::JointLimitsContainer& joint_limits, const KDL::Trajectory& trajectory,
343343
const std::string& group_name, const std::string& link_name,
344-
const std::map<std::string, double>& initial_joint_position, std::vector<double> time_samples,
344+
const std::map<std::string, double>& initial_joint_position, const std::vector<double>& time_samples,
345345
trajectory_msgs::msg::JointTrajectory& joint_trajectory, moveit_msgs::msg::MoveItErrorCodes& error_code,
346346
bool check_self_collision)
347347
{
@@ -353,7 +353,6 @@ bool pilz_industrial_motion_planner::generateJointTrajectory(
353353

354354
// sample the trajectory and solve the inverse kinematics
355355
Eigen::Isometry3d pose_sample;
356-
Eigen::Isometry3d pose_sample_last;
357356
std::map<std::string, double> ik_solution_last, ik_solution, joint_velocity_last;
358357
ik_solution_last = initial_joint_position;
359358
for (const auto& item : ik_solution_last)
@@ -375,17 +374,7 @@ bool pilz_industrial_motion_planner::generateJointTrajectory(
375374
joint_trajectory.points.clear();
376375
return false;
377376
}
378-
// if (time_iter != time_samples.begin() && time_samples.size() > 1)
379-
// {
380-
// // Compute the forward kinematics of the IK solution to check the error
381-
// double position_error = (pose_sample_last.translation() - pose_sample.translation()).norm();
382-
// double orientation_error =
383-
// Eigen::AngleAxisd(pose_sample_last.rotation().transpose() * pose_sample.rotation()).angle();
384-
385-
// std::cout << "IK solution error - Position error: " << position_error
386-
// << ", Orientation error: " << orientation_error << std::endl;
387-
// }
388-
// pose_sample_last = pose_sample;
377+
389378
if (time_iter != time_samples.begin())
390379
{
391380
duration_current_sample = *time_iter - *(time_iter - 1);

moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_blender_transition_window.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,6 @@ TEST_F(TrajectoryBlenderTransitionWindowTest, testNonLinearBlending)
662662
geometry_msgs::msg::Pose waypoint_pose = tf2::toMsg(eigen_pose);
663663

664664
// add scaled sine function
665-
// This is causing the test to fail for high accelerations
666665
waypoint_pose.position.x += sine_scaling_factor * sin(sine_arg);
667666
waypoint_pose.position.y += sine_scaling_factor * sin(sine_arg);
668667
waypoint_pose.position.z += sine_scaling_factor * sin(sine_arg);

0 commit comments

Comments
 (0)