diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-16 14:27:46 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-01-20 18:40:56 +1000 |
commit | c8393fdf44862cf09fca6ef4bc7899e7c0386f79 (patch) | |
tree | 8d9e0caf096699c96f0ab6027b413827c1d0e520 /src/library | |
parent | 3d76836bc81c3ec183e83ee186e447ff212507d0 (diff) | |
download | scala-c8393fdf44862cf09fca6ef4bc7899e7c0386f79.tar.gz scala-c8393fdf44862cf09fca6ef4bc7899e7c0386f79.tar.bz2 scala-c8393fdf44862cf09fca6ef4bc7899e7c0386f79.zip |
SI-9087 Fix min/max of reversed Double/Float orderings
As diagnosed by the reporter, we needed additional overrides
due to the way these orderings are implemented.
I've added tests to show other methods and other orderings
are working correctly.
After writing that, I found a scalacheck test related to
NaN handling that also covers `Ordering`. I had to correct
the assertion in the tests of `reverse.{min,max}`.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/math/Ordering.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/library/scala/math/Ordering.scala b/src/library/scala/math/Ordering.scala index 0d7ea8bce2..827cccc77e 100644 --- a/src/library/scala/math/Ordering.scala +++ b/src/library/scala/math/Ordering.scala @@ -284,6 +284,9 @@ object Ordering extends LowPriorityOrderingImplicits { override def gteq(x: Float, y: Float): Boolean = outer.gteq(y, x) override def lt(x: Float, y: Float): Boolean = outer.lt(y, x) override def gt(x: Float, y: Float): Boolean = outer.gt(y, x) + override def min(x: Float, y: Float): Float = outer.max(x, y) + override def max(x: Float, y: Float): Float = outer.min(x, y) + } } implicit object Float extends FloatOrdering @@ -309,6 +312,8 @@ object Ordering extends LowPriorityOrderingImplicits { override def gteq(x: Double, y: Double): Boolean = outer.gteq(y, x) override def lt(x: Double, y: Double): Boolean = outer.lt(y, x) override def gt(x: Double, y: Double): Boolean = outer.gt(y, x) + override def min(x: Double, y: Double): Double = outer.max(x, y) + override def max(x: Double, y: Double): Double = outer.min(x, y) } } implicit object Double extends DoubleOrdering |