Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MATH-493 FastMath min and max fail with (Infinity,-Infinity) 

(still to fix zero case)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1062040 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2011-01-21 21:46:13 +00:00
parent 517855fe74
commit e4caa054a0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/apache/commons/math/util/FastMath.java
View File

@ -3620,7 +3620,7 @@ public class FastMath {
* @return a if a is lesser or equal to b, b otherwise
*/
public static float min(final float a, final float b) {
return (a <= b) ? a : (Float.isNaN(a + b) ? Float.NaN : b);
return (a <= b) ? a : ((a!=a||b!=b) ? Float.NaN : b);
}
/** Compute the minimum of two values
@ -3629,7 +3629,7 @@ public class FastMath {
* @return a if a is lesser or equal to b, b otherwise
*/
public static double min(final double a, final double b) {
return (a <= b) ? a : (Double.isNaN(a + b) ? Double.NaN : b);
return (a <= b) ? a : ((a!=a||b!=b) ? Double.NaN : b);
}
/** Compute the maximum of two values
@ -3656,7 +3656,7 @@ public class FastMath {
* @return b if a is lesser or equal to b, a otherwise
*/
public static float max(final float a, final float b) {
return (a <= b) ? b : (Float.isNaN(a + b) ? Float.NaN : a);
return (a < b) ? b : ((a!=a||b!=b) ? Float.NaN : a);
}
/** Compute the maximum of two values
@ -3665,7 +3665,7 @@ public class FastMath {
* @return b if a is lesser or equal to b, a otherwise
*/
public static double max(final double a, final double b) {
return (a <= b) ? b : (Double.isNaN(a + b) ? Double.NaN : a);
return (a <= b) ? b : ((a!=a||b!=b) ? Double.NaN : a);
}
/**
@ -3685,6 +3685,7 @@ public class FastMath {
public static double hypot(double x, double y) {
return StrictMath.hypot(x, y); // TODO provide our own implementation
}
/**
* Computes the remainder as prescribed by the IEEE 754 standard.
* The remainder value is mathematically equal to {@code x - y*n}