-
Notifications
You must be signed in to change notification settings - Fork 62
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
Add parametric generalizations for segments, trails, Located, etc. #92
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
Conflicts: src/Diagrams/TwoD/Combinators.hs
Conflicts: src/Diagrams/Segment.hs src/Diagrams/TwoD/Combinators.hs
In particular, some non-trivial merging had to be done to incorporate the major Trail refactoring (@705a9b28). Conflicts: src/Diagrams/Path.hs src/Diagrams/Segment.hs src/Diagrams/TwoD/Path.hs src/Diagrams/TwoD/Segment.hs
…and Trail' Redesign mostly has to do with arc length and accuracy of approximations.
Also, get rid of the 'TransInv' from the definition of Located. It was sort of questionable in the first place (e.g. what does it mean to apply TransInv to something which is already translation invariant?) and was making it very difficult to define the parametric instances.
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.
This is the continuation of the work started by @mgsloan in #53. (@mgsloan, if you have a chance, can you take a look at what I've done and see if it makes sense?) We had some functions for computing parametrizations and arc length of segments, splitting segments, and adjusting their length in various ways. This generalizes all these things via type classes and adds instances for trails and
Located
things (though notPath
s because that wouldn't really make sense---Path
s can have multiple components; their semantics is not a parametric function).Here's a demonstration that exercises quite a bit of the code:
The output can be found here: http://www.cis.upenn.edu/~byorgey/hosted/TrailParam.mp4
Closes #53.