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

New EffBox task map. #624

Merged
merged 15 commits into from
Jul 20, 2019
Merged

New EffBox task map. #624

merged 15 commits into from
Jul 20, 2019

Conversation

cmower
Copy link
Collaborator

@cmower cmower commented Jul 5, 2019

[task_maps] New task map.
[core] Initializer support for Eigen::Vector2d.
[examples] New example for new task map.

@cmower cmower force-pushed the cem-eff-box branch 2 times, most recently from d68ddc7 to 484bb4e Compare July 15, 2019 14:04
Copy link
Collaborator

@wxmerkt wxmerkt left a comment

Choose a reason for hiding this comment

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

Thanks, a few minor including a twice committed file above then good to go

@cmower cmower changed the title New EffBoxConstraint task map. New EffBox task map. Jul 16, 2019
{
if (phi.rows() != TaskSpaceDim()) ThrowNamed("Wrong size of phi!");

Eigen::VectorXd e;
Copy link
Collaborator

Choose a reason for hiding this comment

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

This allocated at every iteration. This is not great. Also you could make line 40 and 41 be one. Directly operate on Phi

}
}

const Eigen::VectorXd EffBox::GetLowerLimit()
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is the other kind of const... I meant EffBox::GetLowerLimit() const

Copy link
Collaborator

@wxmerkt wxmerkt left a comment

Choose a reason for hiding this comment

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

Missing:

  • Unit test
  • issue to extend to cost, especially now that it's renamed

@cmower
Copy link
Collaborator Author

cmower commented Jul 17, 2019

  • Issue opened.
  • Re unit test, this requires a setup for an end-pose problem and none exist in tests. E.g. no test was ever made for GazeAtConstraint since it can only be an inequality constraint. When EffBox needs to be a cost term and inequality term #635 is resolved I will add a unit test.

I think all should be good to merge after travis ci goes green, builds and runs successfully as expected locally.

{
pub_markers_ = Server::Advertise<visualization_msgs::MarkerArray>("eff_box_objects", 1, true);
visualization_msgs::Marker md; // delete previous markers
md.action = visualization_msgs::Marker::DELETEALL;
Copy link
Collaborator

Choose a reason for hiding this comment

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

This won't compile on older versions, make it = 3; and add a comment it corresponds to deleteall

cmower added 11 commits July 19, 2019 10:08
* eff_upper -> eff_upper_ and similar for eff_lower
* New functions GetLowerLimit and GetUpperLimit, both exposed to python
* EffBoxConstraint -> EffBox
* Frame -> FrameWithBoxLimits
* EffBoxConstraint -> EFfBox
* added const as per review
* updated code to allow a different box constraint to be defined for every end-effector
* new FrameWithBoxLimits initializer to allow box constraint for every end-effector
* added todo
* code formatting
* push_back -> emplace_back + reserve in instantiate
* added assign scene function
* use GetRootFrameName rather than assume world_frame
@cmower
Copy link
Collaborator Author

cmower commented Jul 19, 2019

I'm not sure what the issue is with second Travis CI checks.. @wxmerkt any ideas?

@wxmerkt wxmerkt merged commit a2ba069 into master Jul 20, 2019
@wxmerkt wxmerkt deleted the cem-eff-box branch July 20, 2019 11:43
@wxmerkt
Copy link
Collaborator

wxmerkt commented Jul 20, 2019

The issue was one of the four tests had a transient issue. But our pre-release tests are now timing out (build times are too long). Likely need to ask for an extension in Travis...

wxmerkt added a commit that referenced this pull request Jun 22, 2020
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