Skip to content

Commit 5cf4ff3

Browse files
committed
Removed fixed cartesian logic
1 parent 3373198 commit 5cf4ff3

File tree

8 files changed

+2
-24
lines changed

8 files changed

+2
-24
lines changed

tesseract_motion_planners/trajopt/include/tesseract_motion_planners/trajopt/profile/trajopt_default_plan_profile.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class TrajOptDefaultPlanProfile : public TrajOptPlanProfile
9292
const std::vector<std::string>& active_links,
9393
int index) const override;
9494

95-
bool isFixedCartesian() const override;
9695
bool isFixedJoint() const override;
9796

9897
tinyxml2::XMLElement* toXML(tinyxml2::XMLDocument& doc) const override;

tesseract_motion_planners/trajopt/include/tesseract_motion_planners/trajopt/profile/trajopt_profile.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class TrajOptPlanProfile
7171
const std::vector<std::string>& active_links,
7272
int index) const = 0;
7373

74-
virtual bool isFixedCartesian() const = 0;
7574
virtual bool isFixedJoint() const = 0;
7675

7776
virtual tinyxml2::XMLElement* toXML(tinyxml2::XMLDocument& doc) const = 0;

tesseract_motion_planners/trajopt/src/profile/trajopt_default_plan_profile.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,6 @@ void TrajOptDefaultPlanProfile::addConstraintErrorFunctions(trajopt::ProblemCons
280280
}
281281
}
282282

283-
bool TrajOptDefaultPlanProfile::isFixedCartesian() const
284-
{
285-
// If the term type is constraint and all coefficients are non-zero
286-
return (term_type == trajopt::TermType::TT_CNT) &&
287-
(abs(cartesian_coeff.array()) >= std::numeric_limits<double>::epsilon()).all();
288-
}
289-
290283
bool TrajOptDefaultPlanProfile::isFixedJoint() const
291284
{
292285
// If the term type is constraint and all coefficients are non-zero

tesseract_motion_planners/trajopt/src/trajopt_motion_planner.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,7 @@ TrajOptMotionPlanner::createProblem(const PlannerRequest& request) const
288288
seed_states.push_back(request.env_state.getJointValues(joint_names));
289289
}
290290

291-
// Add to fixed indices
292-
if (!cwp.isToleranced() && cur_plan_profile->isFixedCartesian())
293-
fixed_steps.push_back(i);
291+
/** @todo If fixed cartesian and not term_type cost add as fixed */
294292
}
295293
else if (move_instruction.getWaypoint().isJointWaypoint())
296294
{

tesseract_motion_planners/trajopt_ifopt/include/tesseract_motion_planners/trajopt_ifopt/profile/trajopt_ifopt_default_plan_profile.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class TrajOptIfoptDefaultPlanProfile : public TrajOptIfoptPlanProfile
6464
const std::vector<std::string>& active_links,
6565
int index) const override;
6666

67-
bool isFixedCartesian() const override;
6867
bool isFixedJoint() const override;
6968

7069
tinyxml2::XMLElement* toXML(tinyxml2::XMLDocument& doc) const override;

tesseract_motion_planners/trajopt_ifopt/include/tesseract_motion_planners/trajopt_ifopt/profile/trajopt_ifopt_profile.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ class TrajOptIfoptPlanProfile
7373
const std::vector<std::string>& active_links,
7474
int index) const = 0;
7575

76-
virtual bool isFixedCartesian() const = 0;
7776
virtual bool isFixedJoint() const = 0;
7877

7978
virtual tinyxml2::XMLElement* toXML(tinyxml2::XMLDocument& doc) const = 0;

tesseract_motion_planners/trajopt_ifopt/src/profile/trajopt_ifopt_default_plan_profile.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,6 @@ void TrajOptIfoptDefaultPlanProfile::apply(TrajOptIfoptProblem& problem,
127127
}
128128
}
129129

130-
bool TrajOptIfoptDefaultPlanProfile::isFixedCartesian() const
131-
{
132-
// If the term type is constraint and all coefficients are non-zero
133-
return (term_type == TrajOptIfoptTermType::CONSTRAINT) &&
134-
(abs(cartesian_coeff.array()) >= std::numeric_limits<double>::epsilon()).all();
135-
}
136-
137130
bool TrajOptIfoptDefaultPlanProfile::isFixedJoint() const
138131
{
139132
// If the term type is constraint and all coefficients are non-zero

tesseract_motion_planners/trajopt_ifopt/src/trajopt_ifopt_motion_planner.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,7 @@ std::shared_ptr<TrajOptIfoptProblem> TrajOptIfoptMotionPlanner::createProblem(co
299299
// Apply profile
300300
cur_plan_profile->apply(*problem, cwp, move_instruction, composite_mi, active_links, i);
301301

302-
// Add to fixed indices
303-
if (!cwp.isToleranced() && cur_plan_profile->isFixedCartesian())
304-
fixed_steps.push_back(i);
302+
/** @todo If fixed cartesian and not term_type cost add as fixed */
305303
}
306304
else if (move_instruction.getWaypoint().isJointWaypoint())
307305
{

0 commit comments

Comments
 (0)