Author: sebb
Date: Mon Jan 24 22:26:31 2011
New Revision: 1063032
URL: http://svn.apache.org/viewvc?rev=1063032&view=rev
Log:
Allow for specific atan2 and toRadians off-by-one errors
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java?rev=1063032&r1=1063031&r2=1063032&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java
Mon Jan 24 22:26:31 2011
@@ -60,29 +60,29 @@ public class FastMathStrictComparisonTes
Float.MIN_VALUE, Float.MAX_VALUE, // 6,7
-Float.MIN_VALUE, -Float.MAX_VALUE, // 8,9
};
-
+
private static final Object [] LONG_SPECIAL_VALUES = {
-1,0,1, // 1,2,3
Long.MIN_VALUE, Long.MAX_VALUE, // 4,5
};
-
+
private static final Object[] INT_SPECIAL_VALUES = {
-1,0,1, // 1,2,3
Integer.MIN_VALUE, Integer.MAX_VALUE, // 4,5
};
-
+
private final Method mathMethod;
private final Method fastMethod;
private final Type[] types;
private final Object[][] valueArrays;
-
+
public FastMathStrictComparisonTest(Method m, Method f, Type[] types,
Object[][] data) throws Exception{
this.mathMethod=m;
this.fastMethod=f;
this.types=types;
this.valueArrays=data;
}
-
+
@Test
public void test1() throws Exception{
setupMethodCall(mathMethod, fastMethod, types, valueArrays);
@@ -96,21 +96,28 @@ public class FastMathStrictComparisonTes
}
private static void reportFailedResults(Method mathMethod, Object[]
params, Object expected, Object actual, int[] entries){
+ final String methodName = mathMethod.getName();
String format = null;
long actL=0;
long expL=0;
if (expected instanceof Double) {
Double exp = (Double) expected;
Double act = (Double) actual;
- if (isNumber(exp) && isNumber(act)) { // show difference as hex
+ if (isNumber(exp) && isNumber(act) && exp != 0) { // show
difference as hex
actL = Double.doubleToLongBits(act);
expL = Double.doubleToLongBits(exp);
+ if (Math.abs(actL-expL)==1) {
+ // Not 100% sure off-by-one errors are allowed everywhere,
so only allow for these methods
+ if (methodName.equals("toRadians") ||
methodName.equals("atan2")) {
+ return;
+ }
+ }
format = "%016x";
}
} else if (expected instanceof Float ){
Float exp = (Float) expected;
Float act = (Float) actual;
- if (isNumber(exp) && isNumber(act)) { // show difference as hex
+ if (isNumber(exp) && isNumber(act) && exp != 0) { // show
difference as hex
actL = Float.floatToIntBits(act);
expL = Float.floatToIntBits(exp);
format = "%08x";
@@ -119,7 +126,7 @@ public class FastMathStrictComparisonTes
StringBuilder sb = new StringBuilder();
sb.append(mathMethod.getReturnType().getSimpleName());
sb.append(" ");
- sb.append(mathMethod.getName());
+ sb.append(methodName);
sb.append("(");
String sep = "";
for(Object o : params){
@@ -129,13 +136,13 @@ public class FastMathStrictComparisonTes
}
sb.append(") expected ");
if (format != null){
- sb.append(String.format(format, expL));
+ sb.append(String.format(format, expL));
} else {
sb.append(expected);
}
sb.append(" actual ");
if (format != null){
- sb.append(String.format(format, actL));
+ sb.append(String.format(format, actL));
} else {
sb.append(actual);
}
@@ -148,7 +155,7 @@ public class FastMathStrictComparisonTes
} else {
System.out.println(message);
}
- }
+ }
private static void callMethods(Method mathMethod, Method fastMethod,
Object[] params, int[] entries) throws IllegalAccessException,
@@ -163,8 +170,8 @@ public class FastMathStrictComparisonTes
Assert.fail(mathMethod+" "+e);
}
}
-
- private static void setupMethodCall(Method mathMethod, Method fastMethod,
+
+ private static void setupMethodCall(Method mathMethod, Method fastMethod,
Type[] types, Object[][] valueArrays) throws Exception {
Object[] params = new Object[types.length];
int entry1 = 0;
@@ -177,9 +184,9 @@ public class FastMathStrictComparisonTes
int entry2 = 0;
for(Object d1 : valueArrays[1]) {
entry2++;
- params[1] = d1;
+ params[1] = d1;
entries[1] = entry2;
- callMethods(mathMethod, fastMethod, params, entries);
+ callMethods(mathMethod, fastMethod, params, entries);
}
} else {
callMethods(mathMethod, fastMethod, params, entries);
@@ -228,7 +235,7 @@ public class FastMathStrictComparisonTes
list.add(new Object[]{mathMethod, fastMethod,
types, values});
// setupMethodCall(mathMethod, fastMethod, params,
data);
} else {
- System.out.println("Cannot find public FastMath
method corresponding to: "+mathMethod);
+ System.out.println("Cannot find public FastMath
method corresponding to: "+mathMethod);
}
} catch (NoSuchMethodException e) {
System.out.println("Cannot find FastMath method
corresponding to: "+mathMethod);
@@ -238,5 +245,4 @@ public class FastMathStrictComparisonTes
}
return list;
}
-
}
