-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Ravil/multi constrains #5
Open
ThrudPrimrose
wants to merge
4
commits into
TUM-I5:master
Choose a base branch
from
ThrudPrimrose:ravil/multi-constrains
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
…of the mesh, allow partition() to take the vector fo edge weights as an additional argument
I don't see why we don't merge #3 first and then merge this directly into master? |
I think that will be better. (will be necessary for the seissol pull request too) |
I did exactly that. This PR now points to master into which I've merged #3. |
… adapt assertions and functions with the new names, and using tabs
m is not used indeed, I had copied from the previous implementation. Now the identation is tabs, I have updated member variables (private) to use the prefix m_ |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
It is the same pulll request as before, I think it is better if we merge ravil's multi constraint branches. As I have extended that implementation.
new method generateGraph generates the dual graph representation of the mesh, a getter method to get the graph representation which can be used to compute edge weights, and the partition function now takes edgeweights as an additional input argument.