Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Adds a curved polygon class to primal #844

Merged
merged 38 commits into from
Jun 22, 2022
Merged

Adds a curved polygon class to primal #844

merged 38 commits into from
Jun 22, 2022

Conversation

kennyweiss
Copy link
Member

@kennyweiss kennyweiss commented Jun 17, 2022 •
edited
Loading

Summary

  • This PR is a feature
  • It adds primal::CurvedPolygon representing a polygon with BezierCurves as edges
  • It also adds functions to compute the sector_area and sector_centroid of a BezierCurve. These are used to compute the area and centroid of a CurvedPolygon, respectively.
  • This branch was cherry picked from feature/kweiss/bezier-polygon-revamp which uses the above functionality to intersect two curved polygons.

Credits: Much of this code was developed by @davidgunderman

TODO:

  • Update RELEASE-NOTES

@kennyweiss kennyweiss added the Primal Issues related to Axom's 'primal component label Jun 17, 2022
@kennyweiss kennyweiss self-assigned this Jun 17, 2022
@kennyweiss kennyweiss force-pushed the feature/kweiss/curved-polygon branch 3 times, most recently from aa2f1fe to 206a837 Compare June 21, 2022 02:09
agcapps
agcapps approved these changes Jun 21, 2022
View reviewed changes
Copy link
Member

@agcapps agcapps left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @davidgunderman and @kennyweiss .

davidgunderman and others added 13 commits June 22, 2022 10:48
@davidgunderman @kennyweiss
Added sectorArea() to BezierCurve, CurvedPolygon class with area func…
13e007d 
…tion
@davidgunderman @kennyweiss
Added some helper functions in BezierCurve and CurvedPolygon
c2e5479
@davidgunderman @kennyweiss
Added more CurvedPolygon tests
20a135b
@davidgunderman @kennyweiss
More curved polygon tests
4bf7636
@davidgunderman @kennyweiss
Added tolerances to CurvedPolygon functions, unit tests for area, dt …
23fcc1c 
…function (tangent vector of BezierCurve), and stable orientation function for directional walking method
@kennyweiss
Improves documentation, error checking and testing of binomialCoeffic…
151835c 
…ient function
@kennyweiss
Makes Matrix's default constructor public
d4c3337 
Matrix can now be used as a value type for containers like std::map.
@kennyweiss
Refactors and tests the BezierCurve sectorArea() weights calculation
beab6f8
@kennyweiss
Reworks memoization of BezierCurve::sectorArea() matrices
13b1544 
axom::deallocate did not play nicely with destruction of static data
associated with the axom::Matrix class.
@davidgunderman @kennyweiss
Added sectorMoment() to BezierCurve, moment() to CurvedPolygon, tests…
e628052 
… for each

Adjusted sectorMoment for refactoried memoization by K. Weiss.
@kennyweiss
Build system: Adds missing openmp and/or mpi dependency to quest test…
f5daa38 
…s and examples
@davidgunderman @kennyweiss
Added reverseorientation functions to BezierCurve and CurvedPolygon c…
0b203fe 
…lasses
@davidgunderman @kennyweiss
Renamed sectorMoment to sectorCentroid in BezierCurve class and tweak…
55d8649 
…ed some tolerances
davidgunderman and others added 24 commits June 22, 2022 10:48
@davidgunderman @kennyweiss
More tolerance tweaking
0a456e0
@davidgunderman @kennyweiss
Reformatted tests for CurvedPolygon
35ff2a0
@davidgunderman @kennyweiss
Added/refactored some CurvedPolygon tests
feed77e
@kennyweiss
Bugfixes for curved polygon tests in MSVC
4611077
@kennyweiss
primal's BezierCurve::dt should return a Vector rather than a Point
6e1c302
@kennyweiss
Minor updates to CurvedPolygon
a73c6cd
@kennyweiss
Fixes warnings from clang compiler
638f85f
@kennyweiss
Minor cleanup for BezierCurve and CurvedPolygon classes and tests
6e84b7f
@kennyweiss
Use initializer lists to construct points and vectors for Bezier curv…
2d6cc60 
…e tests
@kennyweiss
Bugfix: Curved polygon with only two edges can be closed
eeec51e 
Fixes CurvedPolygon::isClosed() and adds unit test.
@kennyweiss
Adds empty() and boundingBox() to primal::CurvedPolygon
e680f86
@kennyweiss
Includes axom/config.hpp in primal's intersect header
62fc789
@kennyweiss
Renamed primal::Polygon::centroid() to primal::Polygon::vertexMean()
1446ba9 
The new name is more accurate: The function is computing the mean
of the vertex positions, not the centroid.
@kennyweiss
Use axom::Array in primal::Polygon instead of std::vector
ad93e45
@kennyweiss
Outsources moment computation (area and centroid) in BezierCurve and …
2c18c8e 
…CurvedPolygon

These are now provided as primal operators:
* BezierCurve: `sector_area()` / `sector_centroid()`
* CurvedPolygon: `area()` / `centroid()`

There operations only apply to 2D (polynomial) BezierCurves, so don't belong
in the dimension-templated classes.
@kennyweiss
Adds linear interpolation lerp function to axom utilities
c4ea106 
* Moved from C2CReader
* Adds unit tests
* Use in `BezierCurve` class
@kennyweiss
Outsources implementation details for compute_sector and compute_area…
b65b41b 
… on BezierCurve
@kennyweiss
Opt: perform in-place BezierCurve::reverseOrientation()
28cb69c
@kennyweiss
Opt: perform in-place CurvedPolygon::reverseOrientation()
8ea7ee5
@kennyweiss
Slight clean up of primal::CurvedPolygon::isClosed()
f9edc6e
@kennyweiss
BezierCurve intersection only works in 2D, so remove NDIMS template p…
a8850ac 
…aramter
@kennyweiss
Updates copyright year
312326b
@kennyweiss
Updates RELEASE-NOTES
c699374
@kennyweiss
Minor changes per PR suggestions
f59b94c
@kennyweiss kennyweiss force-pushed the feature/kweiss/curved-polygon branch from 206a837 to f59b94c Compare June 22, 2022 18:17
@kennyweiss kennyweiss merged commit 8398168 into develop Jun 22, 2022
@kennyweiss kennyweiss deleted the feature/kweiss/curved-polygon branch June 22, 2022 19:50
@kennyweiss kennyweiss mentioned this pull request Jun 22, 2022
Merged
@kennyweiss kennyweiss mentioned this pull request Sep 3, 2022
Open
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agcapps agcapps agcapps approved these changes

@jcs15c jcs15c jcs15c approved these changes

@white238 white238 Awaiting requested review from white238

@cyrush cyrush Awaiting requested review from cyrush

@rhornung67 rhornung67 Awaiting requested review from rhornung67

@publixsubfan publixsubfan Awaiting requested review from publixsubfan

@gunney1 gunney1 Awaiting requested review from gunney1

@bmhan12 bmhan12 Awaiting requested review from bmhan12

Assignees

@kennyweiss kennyweiss

Labels
Primal Issues related to Axom's 'primal component
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kennyweiss @jcs15c @agcapps @davidgunderman