-
Notifications
You must be signed in to change notification settings - Fork 4
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
faster area #36
Merged
Merged
faster area #36
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -120,18 +120,28 @@ to be closed. | |
=# | ||
function _signed_area(::Type{T}, geom) where T | ||
area = zero(T) | ||
# Close curve, even if last point isn't explicitly repeated | ||
np = GI.npoint(geom) | ||
np == 0 && return area | ||
first_last_equal = equals(GI.getpoint(geom, 1), GI.getpoint(geom, np)) | ||
np -= first_last_equal ? 1 : 0 | ||
|
||
first = true | ||
local pfirst, p1 | ||
# Integrate the area under the curve | ||
p1 = GI.getpoint(geom, np) | ||
for i in 1:np | ||
p2 = GI.getpoint(geom, i) | ||
for p2 in GI.getpoint(geom) | ||
# Skip the first and do it later | ||
# This lets us work within one iteration over geom, | ||
# which means on C call when using points from external libraries. | ||
if first | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah this is a pretty good way to do this. |
||
p1 = pfirst = p2 | ||
first = false | ||
continue | ||
end | ||
# Accumulate the area into `area` | ||
area += GI.x(p1) * GI.y(p2) - GI.y(p1) * GI.x(p2) | ||
p1 = p2 | ||
end | ||
# Complete the last edge. | ||
# If the first and last where the same this will be zero | ||
p2 = pfirst | ||
area += GI.x(p1) * GI.y(p2) - GI.y(p1) * GI.x(p2) | ||
return T(area / 2) | ||
end | ||
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
Oops, something went wrong.
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.
What does
local
do here? Just for my future knowledge?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.
It makes the variables available in the scope outside thep loop