Skip to content

Commit aee246d

Browse files
committed
Removed fixed cartesian logic
1 parent 18bf735 commit aee246d

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
@@ -90,7 +90,6 @@ class TrajOptDefaultPlanProfile : public TrajOptPlanProfile
9090
const std::vector<std::string>& active_links,
9191
int index) const override;
9292

93-
bool isFixedCartesian() const override;
9493
bool isFixedJoint() const override;
9594

9695
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
@@ -66,7 +66,6 @@ class TrajOptPlanProfile
6666
const std::vector<std::string>& active_links,
6767
int index) const = 0;
6868

69-
virtual bool isFixedCartesian() const = 0;
7069
virtual bool isFixedJoint() const = 0;
7170

7271
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
@@ -211,13 +211,6 @@ void TrajOptDefaultPlanProfile::addConstraintErrorFunctions(trajopt::ProblemCons
211211
}
212212
}
213213

214-
bool TrajOptDefaultPlanProfile::isFixedCartesian() const
215-
{
216-
// If the term type is constraint and all coefficients are non-zero
217-
return (term_type == trajopt::TermType::TT_CNT) &&
218-
(abs(cartesian_coeff.array()) >= std::numeric_limits<double>::epsilon()).all();
219-
}
220-
221214
bool TrajOptDefaultPlanProfile::isFixedJoint() const
222215
{
223216
// 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
@@ -276,9 +276,7 @@ TrajOptMotionPlanner::createProblem(const PlannerRequest& request) const
276276
seed_states.push_back(request.env_state.getJointValues(joint_names));
277277
}
278278

279-
// Add to fixed indices
280-
if (!cwp.isToleranced() && cur_plan_profile->isFixedCartesian())
281-
fixed_steps.push_back(i);
279+
/** @todo If fixed cartesian and not term_type cost add as fixed */
282280
}
283281
else if (move_instruction.getWaypoint().isJointWaypoint())
284282
{

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
@@ -65,7 +65,6 @@ class TrajOptIfoptDefaultPlanProfile : public TrajOptIfoptPlanProfile
6565
const std::vector<std::string>& active_links,
6666
int index) const override;
6767

68-
bool isFixedCartesian() const override;
6968
bool isFixedJoint() const override;
7069

7170
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
@@ -68,7 +68,6 @@ class TrajOptIfoptPlanProfile
6868
const std::vector<std::string>& active_links,
6969
int index) const = 0;
7070

71-
virtual bool isFixedCartesian() const = 0;
7271
virtual bool isFixedJoint() const = 0;
7372

7473
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
@@ -138,13 +138,6 @@ void TrajOptIfoptDefaultPlanProfile::apply(TrajOptIfoptProblem& problem,
138138
}
139139
}
140140

141-
bool TrajOptIfoptDefaultPlanProfile::isFixedCartesian() const
142-
{
143-
// If the term type is constraint and all coefficients are non-zero
144-
return (term_type == TrajOptIfoptTermType::CONSTRAINT) &&
145-
(abs(cartesian_coeff.array()) >= std::numeric_limits<double>::epsilon()).all();
146-
}
147-
148141
bool TrajOptIfoptDefaultPlanProfile::isFixedJoint() const
149142
{
150143
// 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
@@ -290,9 +290,7 @@ std::shared_ptr<TrajOptIfoptProblem> TrajOptIfoptMotionPlanner::createProblem(co
290290
// Apply profile
291291
cur_plan_profile->apply(*problem, cwp, move_instruction, composite_mi, active_links, i);
292292

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

0 commit comments

Comments
 (0)