-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Bar charts + box plots continued #863
Merged
Merged
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
de33739
Add bar charts and boxplots.
niladic fec3b8d
Merge branch 'master' into feature/barcharts; adjust to latest API
Bromeon 865c6bf
Add util for total ordering of f32
Bromeon 16a62c3
Boxplot/bar chart: clean up, document and remove code duplication
Bromeon 5ac60c6
Merge branch 'master' into feature/barcharts
Bromeon d045556
Use correct terminology (a box plot is a diagram and not an element)
Bromeon a8f05ef
Code organization and review suggestions
Bromeon a7e85d0
Merge branch 'master' into feature/barcharts
Bromeon f2e3149
Reorganize plot::items file structure
Bromeon 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
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,40 @@ | ||
//! Total order on floating point types, assuming absence of NaN. | ||
//! Can be used for sorting, min/max computation, and other collection algorithms. | ||
|
||
use std::cmp::Ordering; | ||
|
||
/// Totally orderable floating-point value | ||
/// For not `f32` is supported; could be made generic if necessary. | ||
pub(crate) struct OrderedFloat(f32); | ||
|
||
impl Eq for OrderedFloat {} | ||
|
||
impl PartialEq<Self> for OrderedFloat { | ||
fn eq(&self, other: &Self) -> bool { | ||
self.0 == other.0 | ||
Bromeon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
|
||
impl PartialOrd<Self> for OrderedFloat { | ||
fn partial_cmp(&self, other: &Self) -> Option<Ordering> { | ||
self.0.partial_cmp(&other.0) | ||
Bromeon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
|
||
impl Ord for OrderedFloat { | ||
fn cmp(&self, other: &Self) -> Ordering { | ||
self.partial_cmp(other).expect("NaN or Inf not permitted") | ||
Bromeon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
|
||
/// Extension trait to provide `ord` method | ||
pub(crate) trait FloatOrd { | ||
/// Type to provide total order, useful as key in sorted contexts. | ||
fn ord(self) -> OrderedFloat; | ||
} | ||
|
||
impl FloatOrd for f32 { | ||
fn ord(self) -> OrderedFloat { | ||
Bromeon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
OrderedFloat(self) | ||
} | ||
} |
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.
I like this idea of having our own
OrderedFloat
without having to pull in the much biggerordered-float
crate. There already is anepaint::f32_hash
function inepaint/src/lib.rs
. Perhaps we should implementHash
onOrderedFloat
and move it toepaint/src/util/ordered_float.rs
.But let's make it support
NaN
instead of panicing on them!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.
I can also help with this refactor after merge
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.
Thanks! I'll gladly open a new PR after this one, but probably makes sense to keep it out of this (already big) changeset.