Diamonds are not forever #247
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
|
Shirley Bassey will be so upset. |
Merged
# fixed Conflicts: # pacman/utilities/file_format_converters/convert_to_file_machine_graph.py # pacman/utilities/file_format_converters/convert_to_file_machine_graph_pure_multicast.py # pacman/utilities/file_format_converters/create_file_constraints.py
dkfellows
approved these changes
Aug 29, 2019
Die, zombie files. Die!
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.
AbstractVirtualVertex, AbstractSpiNNakerLinkVertex and AbstractFPGAVertex where only ever used to check the instance of an Object that due to context was KNOWN to be an AbstractVertex.
ApplicationSpiNNakerLinkVertex, ApplicationFPGAVertex, MachineSpiNNakerLinkVertex and MachineFPGAVertex had diamond inheritance to AbstractVertex through ApplicationVertex or MachineVertex
All other uses of AbstractVirtualVertex build through one of the Application/MaichineSpiNNaker/FPGALinkVertex classes so get AbstractVertex that way.
This PR removes the AbstractVertex from AbstractVirtualVertex super list and renames it AbstractVirtual to show the change.
Removing the Diamond inheritance allows a none empty slots to be used in AbstractVertex.
It also allows AbstractVertex to have ConstrainedObject as its super
This PR is farther developed in #246
Which moves the methods and slots down.