Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

multi-seed RRT and RRT* planning #90

Merged
merged 60 commits into from
Oct 22, 2015

Conversation

mauricefallon
Copy link
Contributor

Adds RRT* planning and final/end pose search:
https://www.youtube.com/watch?v=ww2q2PvQ_mw

This reopens a month old pull request (#68)
which was reviewed back when updating drake was blocking things, but now this is resolved.

MarcoCar and others added 30 commits July 22, 2015 16:42
…arco-rrt-june

Conflicts:
	src/matlab/test_multiRRT_reach.m
	src/python/ddapp/ik.py
	src/python/ddapp/tabledemo.py
Conflicts:
	src/python/ddapp/tabledemo.py
Conflicts:
	src/python/ddapp/tabledemo.py
@patmarion
Copy link
Member

I just read through the changes here. Looks pretty good! I will test it on my computer and let you know. There are a few things I would like to change, but I think we can move ahead with the merge and open new issues to do the changes in the future. But let me test before merge.

@patmarion
Copy link
Member

I had some time to test this branch this morning. I'm mostly fine with merging this, even though I'm not sure how to test all the new features, I was able to test most features and everything still seems to be working fine, so that's good :) However, one bug: this branch has changed the ikParameters.useCollision variable from a boolean to a string. But, not all the code that uses the variable has been updated. For example, in ik.py and teleoppanel.py, there are still a few places testing: "if params.useCollision", well now that it is a string, this test is always true. The result is that collision planning is always enabled. Instead, it should best testing the string value of useCollision. But, maybe useCollision should become an integer variable with constants defined, so you could test like:

if params.useCollision == params.NO_COLLISION

something like that?

@mauricefallon
Copy link
Contributor Author

Ok, thanks for the suggestion. I agree - using a constant across the board would be preferred.

I can I follow this up after the branch is integrated?

@patmarion
Copy link
Member

Not quite yet. It doesn't have to be the full change I suggested (changing the variable from a string to an int) but the if conditions in ik.py and teleoppanel.py need to be updated. Basically, "grep useCollision" and update the if conditionals that are testing "if useCollision" to "if useCollision == 'none'"

@mauricefallon
Copy link
Contributor Author

Ok, I made those changes and it looks good with a little testing.

patmarion added a commit that referenced this pull request Oct 22, 2015
@patmarion patmarion merged commit 32efeef into RobotLocomotion:master Oct 22, 2015
@patmarion patmarion deleted the marco-rrt-june branch October 22, 2015 11:28
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.

None yet

3 participants