-
Notifications
You must be signed in to change notification settings - Fork 2
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
Feature/distance gradient #13
Merged
Merged
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
f09f2ee
➕ add SignedDistanceFields
tpoisot af4a767
Distance gradient
tpoisot 74d1b19
🚧 code for NN outside the function
tpoisot 333c630
✋ attempt with NN
tpoisot ccda362
set sources to 0
tpoisot a0060f4
Merge branch 'main' into feature/DistanceGradient
tpoisot 2697812
update
tpoisot 378fe46
🎨 gallery
tpoisot 44436bd
logo
tpoisot ac91ab6
check sources
tpoisot b44b1fd
change gallery
tpoisot 0904cf2
better logo ^^
tpoisot 20bc74f
cleaner distance code
mkborregaard 6e2d955
Merge pull request #20 from EcoJulia/mkb/clean_distance
tpoisot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ NoGradient | |
PlanarGradient | ||
EdgeGradient | ||
WaveSurface | ||
DistanceGradient | ||
RectangularCluster | ||
``` | ||
|
||
|
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
""" | ||
DistanceGradient | ||
|
||
The `sources` field is the *linear* indices of the matrix, from which the | ||
distance must be calculated. | ||
""" | ||
struct DistanceGradient <: NeutralLandscapeMaker | ||
sources::Vector{Integer} | ||
end | ||
|
||
DistanceGradient() = DistanceGradient([1]) | ||
|
||
function _landscape!(mat, alg::DistanceGradient) | ||
@assert maximum(alg.sources) <= length(mat) | ||
@assert minimum(alg.sources) > 0 | ||
indices = vcat(CartesianIndices(mat)...) | ||
coordinates = zeros(Float64, (2, length(indices))) | ||
coordinates[1,:] .= getindex.(indices, 1) | ||
coordinates[2,:] .= getindex.(indices, 2) | ||
guesses = coordinates[:,setdiff(eachindex(mat),alg.sources)] | ||
tree = KDTree(coordinates[:,alg.sources]) | ||
mat[setdiff(eachindex(mat),alg.sources)] .= nn(tree, guesses)[2] | ||
mat[alg.sources] .= 0.0 | ||
return mat | ||
end |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reduce(vcat, CartesianIndices(mat))
is a more performant version - the splatting will be very slow for matrices of any relevant size.