kill ExtraMath's hypot and log10 for their equivalents in Java 1.5's

pjenvey · pjenvey · commit ed8b31348736 · 2008-04-19T21:35:10.000Z
java.lang.Math
diff --git a/src/org/python/core/PyComplex.java b/src/org/python/core/PyComplex.java
@@ -1,7 +1,6 @@
 // Copyright (c) Corporation for National Research Initiatives
 package org.python.core;
 
-import org.python.core.util.ExtraMath;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
@@ -616,7 +615,7 @@ public static PyObject _pow(PyComplex value, PyComplex right) {
             return ipow(value, iexp);
         }
 
-        double abs = ExtraMath.hypot(xr, xi);
+        double abs = Math.hypot(xr, xi);
         double len = Math.pow(abs, yr);
 
         double at = Math.atan2(xi, xr);
@@ -656,7 +655,7 @@ public PyObject __abs__() {
 
     @ExposedMethod
     final PyObject complex___abs__() {
-        return new PyFloat(ExtraMath.hypot(real, imag));
+        return new PyFloat(Math.hypot(real, imag));
     }
 
     public PyObject __int__() {
diff --git a/src/org/python/core/PyString.java b/src/org/python/core/PyString.java
@@ -2287,7 +2287,7 @@ private String formatFloatExponential(PyObject arg, char e,
         }
         double power = 0.0;
         if (v > 0)
-            power = ExtraMath.closeFloor(ExtraMath.log10(v));
+            power = ExtraMath.closeFloor(Math.log10(v));
         //System.err.println("formatExp: "+v+", "+power);
         int savePrecision = precision;
         precision = 2;
@@ -2489,8 +2489,7 @@ else if (c == '(')
                 }
 
                 double v = arg.__float__().getValue();
-                int exponent = (int)ExtraMath.closeFloor(ExtraMath.log10(Math.abs(v == 0
-                                                                                  ? 1 : v)));
+                int exponent = (int)ExtraMath.closeFloor(Math.log10(Math.abs(v == 0 ? 1 : v)));
                 if (v == Double.POSITIVE_INFINITY) {
                     string = "inf";
                 } else if (v == Double.NEGATIVE_INFINITY) {
diff --git a/src/org/python/core/util/ExtraMath.java b/src/org/python/core/util/ExtraMath.java
@@ -1,37 +1,15 @@
 // Copyright (c) Corporation for National Research Initiatives
-
 package org.python.core.util;
 
 /**
  * A static utility class with two additional math functions.
  */
 public class ExtraMath {
-    public static double LOG10 = Math.log(10.0);
 
     public static double EPSILON = Math.pow(2.0, -52.0);
 
     public static double CLOSE = EPSILON * 2.0;
 
-    public static double log10(double v) {
-        return Math.log(v) / LOG10;
-    }
-
-    public static double hypot(double v, double w) {
-        v = Math.abs(v);
-        w = Math.abs(w);
-        if (v < w) {
-            double temp = v;
-            v = w;
-            w = temp;
-        }
-        if (v == 0.0) {
-            return 0.0;
-        } else {
-            double wv = w / v;
-            return v * Math.sqrt(1.0 + wv * wv);
-        }
-    }
-
     /**
      * Are v and w "close" to each other? Uses a scaled tolerance.
      */
diff --git a/src/org/python/modules/math.java b/src/org/python/modules/math.java
@@ -2,7 +2,6 @@
 package org.python.modules;
 
 import org.python.core.*;
-import org.python.core.util.ExtraMath;
 import java.lang.Math;
 
 public class math implements ClassDictInit {
@@ -129,7 +128,7 @@ public static double log10(PyObject v) {
     }
 
     private static double log10(double v) {
-        return check(ExtraMath.log10(v));
+        return check(Math.log10(v));
     }
 
     public static double sinh(double v) {
@@ -185,7 +184,7 @@ public static double ldexp(double v, int w) {
     }
 
     public static double hypot(double v, double w) {
-        return check(ExtraMath.hypot(v, w));
+        return check(Math.hypot(v, w));
     }
 
     public static double radians(double v) {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`package org.python.modules;`
`3`	`3`
`4`	`4`	`import org.python.core.*;`
`5`		`-import org.python.core.util.ExtraMath;`
`6`	`5`	`import java.lang.Math;`
`7`	`6`
`8`	`7`	`public class math implements ClassDictInit {`
`@@ -129,7 +128,7 @@ public static double log10(PyObject v) {`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`private static double log10(double v) {`
`132`		`- return check(ExtraMath.log10(v));`
	`131`	`+ return check(Math.log10(v));`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`public static double sinh(double v) {`
`@@ -185,7 +184,7 @@ public static double ldexp(double v, int w) {`
`185`	`184`	`}`
`186`	`185`
`187`	`186`	`public static double hypot(double v, double w) {`
`188`		`- return check(ExtraMath.hypot(v, w));`
	`187`	`+ return check(Math.hypot(v, w));`
`189`	`188`	`}`
`190`	`189`
`191`	`190`	`public static double radians(double v) {`