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

Add GridGraph #416

Merged
merged 1 commit into from
Mar 11, 2021
Merged

Add GridGraph #416

merged 1 commit into from
Mar 11, 2021

Conversation

finnbuck
Copy link
Contributor

@finnbuck finnbuck commented Feb 24, 2021

Added two new operations, for constructing square and triangular grid graphs. Also added tests for these functions.

@samanthaharper samanthaharper self-requested a review February 24, 2021 15:51
Copy link
Contributor

@samanthaharper samanthaharper left a 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.

gap/examples.gd Outdated Show resolved Hide resolved
gap/examples.gi Outdated Show resolved Hide resolved
gap/examples.gi Outdated Show resolved Hide resolved
@james-d-mitchell james-d-mitchell added the new-feature A label for new features. label Feb 28, 2021
doc/examples.xml Outdated Show resolved Hide resolved
doc/examples.xml Outdated Show resolved Hide resolved
@digraphs digraphs deleted a comment from codecov bot Mar 4, 2021
gap/examples.gi Outdated Show resolved Hide resolved
@wilfwilson wilfwilson changed the title Gridgraph Add GridGraph Mar 11, 2021
Copy link
Collaborator

@wilfwilson wilfwilson left a 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.

doc/examples.xml Outdated Show resolved Hide resolved
doc/examples.xml Outdated Show resolved Hide resolved
gap/examples.gi Outdated Show resolved Hide resolved
gap/examples.gi Show resolved Hide resolved
doc/examples.xml Outdated Show resolved Hide resolved
tst/standard/examples.tst Outdated Show resolved Hide resolved
gap/examples.gi Outdated Show resolved Hide resolved
doc/examples.xml Outdated Show resolved Hide resolved
gap/examples.gi Show resolved Hide resolved
doc/examples.xml Outdated Show resolved Hide resolved
wilfwilson
wilfwilson previously approved these changes Mar 11, 2021
Copy link
Collaborator

@wilfwilson wilfwilson left a 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!

@finnbuck
Copy link
Contributor Author

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...

@finnbuck
Copy link
Contributor Author

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'.

Copy link
Collaborator

@wilfwilson wilfwilson left a 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.

@finnbuck
Copy link
Contributor Author

Ok, that sounds great. Thanks again for walking me through all the steps!

@wilfwilson wilfwilson merged commit d3680e3 into digraphs:master Mar 11, 2021
@wilfwilson
Copy link
Collaborator

You're welcome!

@wilfwilson wilfwilson mentioned this pull request Mar 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-feature A label for new features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants