Fix color_change, fusion, and match_ids #244
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This only fixes colour change method in editor_actions.py but not the one in basicrules.py. I don't know why there are two implementations of colour change and why they are implemented differently. I tried to copy the implementation of editor_actions.py to basicrules.py and it seems to work. |
|
I have pushed the color_change fix for basicrules.py. |
…between two vertices
merge master to fix-multigraph-rewrites
|
I have now fixed spider fusion in rules.py. I don't think fusion or color_change is defined anywhere else. So this PR should be good to merge. |
|
ah self loops are still broken |
|
Fixed! |
|
After the merge conflict is solved, this can probably be merged. |
|
I have resolved the conflict but I need to check if that broke anything |
|
This can be merged now! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the
color_change,fusion, andmatch_ids_parallelmethods that were broken with incident multi-edges.Changes:
incident_edgesnow iterates through all individual incident edges.match_ids_parallelreturns False if the degree of the given vertex is not 2. This stops the program from callingedge_typewhich is undefined for multi-edges.Related to zxcalc/zxlive#256