[MATH-22] [math][patch] Update Complex.java

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed

Environment

Operating System: All
Platform: All

• Bugzilla Id: 36205
• Assignee: Unassigned
• Reporter: Xiaogang Zhang
• Created: 17/Aug/05 02:21
• Updated: 23/Apr/09 02:26
• Resolved: 23/Apr/09 02:26

Description

Index: Complex.java
===================================================================
— Complex.java (revision 233018)
+++ Complex.java (working copy)
@@ -66,7 +66,19 @@
if (isNaN())

{ return Double.NaN; }

• return Math.sqrt(squareSum());
  + if (Math.abs(real) < Math.abs(imaginary))
  Unknown macro: {+ if (imaginary == 0.0) { + return Math.abs(real); + }+ double q = real / imaginary;+ return (Math.abs(imaginary) * Math.sqrt(1 + q*q));+ }

  else

  Unknown macro: {+ if (real == 0.0) { + return Math.abs(imaginary); + }+ double q = imaginary / real;+ return (Math.abs(real) * Math.sqrt(1 + q*q));+ }

  }

/**
@@ -108,17 +120,29 @@
if (isNaN() || rhs.isNaN())

{ return NaN; }

• if (Math.abs(rhs.getReal()) < Math.abs(rhs.getImaginary())) {
• double q = rhs.getReal() / rhs.getImaginary();
• double d = (rhs.getReal() * q) + rhs.getImaginary();
• return new Complex(((real * q) + imaginary) / d,
• ((imaginary * q) - real) / d);
  +
  + double c = rhs.getReal();
  + double d = rhs.getImaginary();
  + if (c == 0.0 && d == 0.0) { + throw new ArithmeticException("Error: division by zero."); + }

  +
  + if (Math.abs(c) < Math.abs(d))

  Unknown macro: {+ if (d == 0.0) { + return new Complex(real/c, imaginary/c); + }+ double q = c / d;+ double denominator = c * q + d;+ return new Complex((real * q + imaginary) / denominator,+ (imaginary * q - real) / denominator); }

  else {

• double q = rhs.getImaginary() / rhs.getReal();
• double d = (rhs.getImaginary() * q) + rhs.getReal();
• return new Complex(((imaginary * q) + real) / d,
• (imaginary - (real * q)) / d);
  + if (c == 0.0) { + return new Complex(imaginary/d, -real/c); + }

  + double q = d / c;
  + double denominator = d * q + c;
  + return new Complex((imaginary * q + real) / denominator,
  + (imaginary - real * q) / denominator);
  }
  }