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 TadpoleDigraph #423

Merged
merged 17 commits into from
Mar 17, 2021
Merged

Add TadpoleDigraph #423

merged 17 commits into from
Mar 17, 2021

Conversation

LRacine
Copy link
Contributor

@LRacine LRacine commented Mar 1, 2021

This creates a tadpole graph, which consists of a cycle graph and a path graph connected by a bridge (as described by https://en.wikipedia.org/wiki/Tadpole_graph).

@LRacine LRacine added the new-feature A label for new features. label Mar 1, 2021
doc/examples.xml Outdated Show resolved Hide resolved
@digraphs digraphs deleted a comment from codecov bot Mar 11, 2021
@wilfwilson wilfwilson mentioned this pull request Mar 11, 2021
@wilfwilson wilfwilson changed the title Tadpole Graph Add TadpoleDigraph 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.

Thanks for this @LRacine.

As I mentioned in https://github.com/digraphs/Digraphs/pull/424/files#r592302744 you'll need to link your manual entry into the manual.

tst/standard/examples.tst Outdated 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
gap/examples.gi Outdated Show resolved Hide resolved
gap/examples.gi Outdated Show resolved Hide resolved
doc/examples.xml Outdated Show resolved Hide resolved
gap/examples.gd Outdated Show resolved Hide resolved
@wilfwilson
Copy link
Collaborator

There are also merge conflicts now with the master branch. If you're confident enough with git to resolve them yourself, then please go ahead, otherwise let me know and I'll be happy to sort it out for you.

@LRacine
Copy link
Contributor Author

LRacine commented Mar 11, 2021

There are also merge conflicts now with the master branch. If you're confident enough with git to resolve them yourself, then please go ahead, otherwise let me know and I'll be happy to sort it out for you.

On it

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.

Thanks for this! Nice work.

@wilfwilson wilfwilson merged commit e27436b into digraphs:master Mar 17, 2021
@LRacine
Copy link
Contributor Author

LRacine commented Mar 18, 2021

Thanks for this! Nice work.
Thank you for all the help @wilfwilson !

@LRacine LRacine deleted the Tadpole-graph branch March 18, 2021 11:25
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.

3 participants