Changeset 12940

Timestamp:

10/02/10 21:39:52 (12 years ago)

Author:

ehuelsmann

Message:

Fix loss of precision in (expt <non-double> <complex-double>),
fixes last Maxima failure.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Complex.java (modified) (1 diff)
• MathFunctions.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Complex.java

@@ -79 +79 @@
   {
     return imagpart;
+  }
+
+  /** Coerces the complex parts into DoubleFloats
+   *
+   * @return a new complex with double-float real and imaginary parts
+   */
+  public LispObject coerceToDoubleFloat() {
+      return getInstance(DoubleFloat.coerceToFloat(realpart),
+                         DoubleFloat.coerceToFloat(imagpart));
   }
 

trunk/abcl/src/org/armedbear/lisp/MathFunctions.java

@@ -624 +624 @@
             // for anything not a rational or complex rational, use
             // float approximation.
+            boolean wantDoubleFloat = false;
+            if (base instanceof DoubleFloat)
+                wantDoubleFloat = true;
+            else if (power instanceof DoubleFloat)
+                wantDoubleFloat = true;
+            else if (base instanceof Complex
+                     && (((Complex)base).getRealPart() instanceof DoubleFloat
+                         || ((Complex)base).getImaginaryPart() instanceof DoubleFloat))
+                wantDoubleFloat = true;
+            else if (power instanceof Complex
+                    && (((Complex)power).getRealPart() instanceof DoubleFloat
+                         || ((Complex)power).getImaginaryPart() instanceof DoubleFloat))
+                wantDoubleFloat = true;
+
+            if (wantDoubleFloat) {
+                if (power instanceof Complex)
+                    power = ((Complex)power).coerceToDoubleFloat();
+                else
+                    power = DoubleFloat.coerceToFloat(power);
+
+                if (base instanceof Complex)
+                    base = ((Complex)base).coerceToDoubleFloat();
+                else
+                    base = DoubleFloat.coerceToFloat(base);
+            }
+
+
+
             if (base instanceof Complex || power instanceof Complex)
                 return exp(power.multiplyBy(log(base)));