-
Notifications
You must be signed in to change notification settings - Fork 487
SuperEllipsoid Contact Geometry #271
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
base: master
Are you sure you want to change the base?
Conversation
|
I remember this from the workshop! It seems that you've introduced tab characters for indenting. Could you replace those tabs with 4 spaces? Most editors have a setting (e.g., retab in vim, untabify in visual studio). |
|
Thanks, Daniel! Looks like there may be a merge conflict, or maybe you just need to merge master into your branch. The automated build failed with the error below. the |
|
BTW, if you look on the conversation page for a PR you can see the Travis CI build status -- it gets built when you first submit the PR and then every time you add a commit to it. |
|
I'm a noob regarding github and travis CI. How do I merge my branch into the master? |
|
Ok! Apparently the integration went smoothly this time: "The pull request can be automatically merged by project collaborators" :) Let me know what other functions are required to integrate superellipsoids Cheers! Daniel Simões Lopes, PhD On Fri, Nov 28, 2014 at 10:47 PM, Christopher Dembia <
|
The general GitHub ethic is that no one merges their own PR into master. Instead, the idea is that other team members review the PR, and then after changes, someone (other than the author) does the merge. Occasionally this rule gets broken for minor changes, but that's the basic idea. I'm working on filling in the Unfortunately this creates some delays if other team members are swamped (as is the case at the moment). We are about to put out the Simbody 3.5 release (from the master branch) and wouldn't want to introduce substantial changes to it at the last minute anyway. |
|
Hey @danielsimoeslopes. We're working on improving our contributing guidelines to help make the contributing process smoother for contributors. We're working on some guidelines here); it'd be great if you could read through them. I'd also like to provide some helpful tips about GitHub. My apologies if you already understood some of this.
|
|
Thanks you for the feedback! |
|
Hi, Daniel. We just finished creating a set of contributor's instructions specifically for Simbody. Since you happen to have a nice big contribution pending, it would be great if you could take a look at it and give us some feedback on it. Is it helpful? Is it clear? What else would be helpful? The instructions are in the Thanks and regards, |
|
Hi Sherman, Just read the CONTRIBUTING.md I think it would be nice to briefly mention travis/appveyor as it gives the "Once you made your pull request (PR), it seems that your workflow was to Best regards, On Wed, Dec 10, 2014 at 5:12 AM, Michael Sherman [email protected]
|
|
Hi, Daniel. We just got the Simbody 3.5 release out today so I took a look at the superellipsoid code you submitted. Probably the biggest issue right now is that the code needs to be finished before it is ready to review. The current state appears to be that the code was copied from the existing Probably the best thing to do if you still want to do this is to go through the code line by line and method by method, treating it as kind of a things-to-do-list to complete the project. Also you will need to add a testSuperEllipsoid() subtest to the TestContactGeometry.cpp regression to make sure all the methods are working now and that someone doesn't break them in the future. If you want to bite off a smaller piece first, you might consider first submitting just the DecorativeGeometry and Visualizer changes in their own PR. My impression is that those could be done separately from the contact code -- is that right? That would provide a chance for you to go through the whole process once and get some code into the repo. Please let us know your thoughts and plans. It would be great to get superellipsoids as a contact type but it looks like quite a lot of work to complete the project. Unfortunately we don't have anyone here with time available at the moment, so it is up to you -- we need more volunteers! Regards, |
|
Hi Sherman! Well, my plan is to implement superellipsoids in Simbody, so count me in Best regards, On Fri, Dec 19, 2014 at 12:09 AM, Michael Sherman [email protected]
|
Great! Glad to hear that, Daniel. |
The code I edited is for creating a new contact geometry, the superellipsoid.
Please take a look and let me now what else is required to properly integrate this surface to the contact family.
This change is