-
Notifications
You must be signed in to change notification settings - Fork 47
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
Add GridGraph #416
Add GridGraph #416
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, you just need documentation and to fix a few little things.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've made some suggestion, which I'll commit via the GitHub interface. I'm then going to make a few more changes locally and then push them to your branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've made some further changes and I think it's good to go. Have a look @finnbuck and if there's anything you want to complain about that I did, or any further changes you'd like to make, go ahead!
No complaints, thanks! The triangular grid graph really is just the square grid graph with extra edges so it makes complete sense for it to just call the square grid graph first... |
Also, is there anything in particular that needs to go in the merge message when the branch is merged? By default it just says 'Add GridGraph'. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No not really, I've just cleaned up the history and force-pushed to resolve the merge conflicts again (the branch couldn't be merged as it was) - sorry if I'm stepping on your toes.
I just called the one commit "Add SquareGridGraph and TriangularGridGraph (PR #416)" – you're still down in the git history as the author, don't worry 🙂
I'll merge if the tests pass, once again.
Ok, that sounds great. Thanks again for walking me through all the steps! |
You're welcome! |
Added two new operations, for constructing square and triangular grid graphs. Also added tests for these functions.