Skip to content

[jade] validate trajectory before execution#225

Merged
rhaschke merged 3 commits intojade-develfrom
pr-jade-validate-trajectory
Sep 17, 2016
Merged

[jade] validate trajectory before execution#225
rhaschke merged 3 commits intojade-develfrom
pr-jade-validate-trajectory

Conversation

@davetcoleman
Copy link
Copy Markdown
Member

@davetcoleman davetcoleman commented Sep 16, 2016

Discussion continued from #63 (comment)

@rhaschke feel free to make changes to this shared branch as necessary

rhaschke and others added 2 commits September 16, 2016 01:50
* validate trajectory before execution

* addressed review comments

* moved validateTrajectory to TrajectoryExecutionManager

* addressed @davetcoleman's comments

* make allowed_start_tolerance dynamically configurable

* addressed @v4hn's comments

* moved validate to executeThread

* allow_start_tolerance == 0 disables trajectory validation

* moved validate to execute()

* add validation test

* increased default value for allowed_start_tolerance to 0.01
@v4hn
Copy link
Copy Markdown
Contributor

v4hn commented Sep 16, 2016

As discussed in #63 (comment) ,
the idea was to remove the old constructor in kinetic (for safety reasons) but still provide it in indigo.
Because jade has been officially released in the meanwhile, we should also provide the old constructor in jade. I would propose to deprecate the old constructor in jade.

@davetcoleman
Copy link
Copy Markdown
Member Author

I agree with @v4hn

@rhaschke
Copy link
Copy Markdown
Contributor

OK, I will prepare this.

@rhaschke
Copy link
Copy Markdown
Contributor

Why not deprecate the old constructor in Indigo too? This is a security feature and we should enforce/motivate people to switch asap.

@davetcoleman
Copy link
Copy Markdown
Member Author

If the deprecation is simple a warning during compile time, +1 to adding it to indigo too

Copy link
Copy Markdown
Member Author

@davetcoleman davetcoleman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good after comments

bool TrajectoryExecutionManager::validate(const TrajectoryExecutionContext &context) const
{
if (allowed_start_tolerance_ == 0) // skip validation on this magic number
if (!csm_ || allowed_start_tolerance_ == 0) // skip validation on this magic number
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

improve comment for new condition

reconfigure_impl_ = new DynamicReconfigureImpl(this);

if (!csm_)
ROS_ERROR_NAMED("traj_execution","Trajectory validation before execution is disabled, because no CurrentStateMonitor was provided.");
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sentence was hard to read - remove the "before execution" part

Also, I think this should just be a warning

* re-added replaced constructors (but deprecated)
* issue error msg when CSM is invalid
* skip validation
@rhaschke rhaschke force-pushed the pr-jade-validate-trajectory branch from 5daede8 to 8c7e39c Compare September 16, 2016 21:18
@rhaschke
Copy link
Copy Markdown
Contributor

@davetcoleman I addressed your comments. According to #225 (comment) this could be cherry-picked to Indigo 1:1.

@davetcoleman
Copy link
Copy Markdown
Member Author

+1

@rhaschke
Copy link
Copy Markdown
Contributor

@davetcoleman Any reason to not merge yet?

@davetcoleman
Copy link
Copy Markdown
Member Author

feel free to merge (my pr) and cherry-pick to indigo

@rhaschke rhaschke merged commit 8c7e39c into jade-devel Sep 17, 2016
@rhaschke rhaschke deleted the pr-jade-validate-trajectory branch September 17, 2016 21:51
@rhaschke
Copy link
Copy Markdown
Contributor

Cherry-picked into Indigo.

JafarAbdi pushed a commit to JafarAbdi/moveit that referenced this pull request Mar 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants