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.

Sign up for GitHub

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

Jump to bottom

Integrate time param - term type switch #50

Merged
merged 5 commits into from
Dec 17, 2018
Merged

Integrate time param - term type switch #50

merged 5 commits into from
Dec 17, 2018

Conversation

mpowelson
Copy link
Contributor

@mpowelson mpowelson commented Dec 7, 2018 •
edited
Loading

Time param sections are still skeletons. But it doesn't appear to have broken anything without time.

@Levi-Armstrong
Copy link
Contributor

Ready to be rebased.

@mpowelson mpowelson force-pushed the integrate_time_param2 branch from 8a72931 to 3baf2ad Compare December 10, 2018 14:39
@mpowelson
Copy link
Contributor Author

@Levi-Armstrong Just rebased. Also, this would address #13 .

@mpowelson mpowelson force-pushed the integrate_time_param2 branch from 3baf2ad to 9e40188 Compare December 10, 2018 22:12
@mpowelson
Copy link
Contributor Author

@Levi-Armstrong Made those changes. use_time is now in basic_info, and added a check in construct problem to catch when it is not set when using the C++ interface.

I also added a unit test that checks that the initial trajectory is the right size, and also (while I was at it) that the joint_interpolated (formally straight_line) initialization is working as expected.

@mpowelson mpowelson force-pushed the integrate_time_param2 branch from 376ad4e to f40e4d0 Compare December 11, 2018 19:59
@mpowelson
Copy link
Contributor Author

@Levi-Armstrong I believe I have added all of things we discussed this morning.

@mpowelson
Copy link
Contributor Author

Also, do we need to update the plotting in Tesseract somehow? I had a branch that added a -1 in ros_basic_plotting.h, but that code has been removed now.

@mpowelson mpowelson force-pushed the integrate_time_param2 branch from f40e4d0 to 832d1c6 Compare December 12, 2018 13:45
@Levi-Armstrong
Copy link
Contributor

@mpowelson It looks like when I merged the PR to fix warning it created a few conflicts

@mpowelson mpowelson force-pushed the integrate_time_param2 branch from 17849aa to 38ad0ab Compare December 13, 2018 18:58
@mpowelson
Copy link
Contributor Author

@Levi-Armstrong Rebased. It should be fine now.

Levi-Armstrong
Levi-Armstrong requested changes Dec 14, 2018
View reviewed changes
@Levi-Armstrong
Copy link
Contributor

@mpowelson A few minor request then it is ready to be merged

@Levi-Armstrong
Copy link
Contributor

Is this ok to merge?

@mpowelson
Copy link
Contributor Author

It should be.

@Levi-Armstrong Levi-Armstrong merged commit f5e3025 into tesseract-robotics:kinetic-devel Dec 17, 2018
@Levi-Armstrong Levi-Armstrong mentioned this pull request Dec 17, 2018
Merged
@mpowelson mpowelson mentioned this pull request Jan 4, 2019
Closed
@mpowelson mpowelson deleted the integrate_time_param2 branch February 20, 2020 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Levi-Armstrong Levi-Armstrong Levi-Armstrong approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mpowelson @Levi-Armstrong