Apache/commons-math
1
0
Fork 0
mirror of https://github.com/apache/commons-math.git synced 2025-03-06 00:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaced deprecated protected real/imaginary fields by private final fields

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_0@651228 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luc Maisonobe 2008-04-24 12:01:59 +00:00
parent 7025c49ef3
commit 5ae0852fe0
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/commons/math/complex/Complex.java
View File

@ -58,15 +58,13 @@ public class Complex implements Serializable {
/** /**
* The imaginary part * The imaginary part
* @deprecated to be made final and private in 2.0
*/ */
protected double imaginary; private final double imaginary;
/** /**
* The real part * The real part
* @deprecated to be made final and private in 2.0
*/ */
protected double real; private final double real;
/** /**
* Create a complex number given the real and imaginary parts. * Create a complex number given the real and imaginary parts.

50
src/test/org/apache/commons/math/complex/ComplexTest.java
View File

@ -100,19 +100,19 @@ public class ComplexTest extends TestCase {
assertTrue(z.isNaN()); assertTrue(z.isNaN());
z = new Complex(1, nan); z = new Complex(1, nan);
Complex w = x.add(z); Complex w = x.add(z);
assertEquals(w.real, 4.0, 0); assertEquals(w.getReal(), 4.0, 0);
assertTrue(Double.isNaN(w.imaginary)); assertTrue(Double.isNaN(w.getImaginary()));
} }
public void testAddInfinite() { public void testAddInfinite() {
Complex x = new Complex(1, 1); Complex x = new Complex(1, 1);
Complex z = new Complex(inf, 0); Complex z = new Complex(inf, 0);
Complex w = x.add(z); Complex w = x.add(z);
assertEquals(w.imaginary, 1, 0); assertEquals(w.getImaginary(), 1, 0);
assertEquals(inf, w.real, 0); assertEquals(inf, w.getReal(), 0);
x = new Complex(neginf, 0); x = new Complex(neginf, 0);
assertTrue(Double.isNaN(x.add(z).real)); assertTrue(Double.isNaN(x.add(z).getReal()));
} }
public void testConjugate() { public void testConjugate() {
@ -129,9 +129,9 @@ public class ComplexTest extends TestCase {
public void testConjugateInfiinite() { public void testConjugateInfiinite() {
Complex z = new Complex(0, inf); Complex z = new Complex(0, inf);
assertEquals(neginf, z.conjugate().imaginary, 0); assertEquals(neginf, z.conjugate().getImaginary(), 0);
z = new Complex(0, neginf); z = new Complex(0, neginf);
assertEquals(inf, z.conjugate().imaginary, 0); assertEquals(inf, z.conjugate().getImaginary(), 0);
} }
public void testDivide() { public void testDivide() {
@ -148,18 +148,18 @@ public class ComplexTest extends TestCase {
assertTrue(x.divide(w).equals(Complex.ZERO)); assertTrue(x.divide(w).equals(Complex.ZERO));
Complex z = w.divide(x); Complex z = w.divide(x);
assertTrue(Double.isNaN(z.real)); assertTrue(Double.isNaN(z.getReal()));
assertEquals(inf, z.imaginary, 0); assertEquals(inf, z.getImaginary(), 0);
w = new Complex(inf, inf); w = new Complex(inf, inf);
z = w.divide(x); z = w.divide(x);
assertTrue(Double.isNaN(z.imaginary)); assertTrue(Double.isNaN(z.getImaginary()));
assertEquals(inf, z.real, 0); assertEquals(inf, z.getReal(), 0);
w = new Complex(1, inf); w = new Complex(1, inf);
z = w.divide(w); z = w.divide(w);
assertTrue(Double.isNaN(z.real)); assertTrue(Double.isNaN(z.getReal()));
assertTrue(Double.isNaN(z.imaginary)); assertTrue(Double.isNaN(z.getImaginary()));
} }
public void testDivideNaN() { public void testDivideNaN() {
@ -170,16 +170,16 @@ public class ComplexTest extends TestCase {
public void testDivideNaNInf() { public void testDivideNaNInf() {
Complex z = oneInf.divide(Complex.ONE); Complex z = oneInf.divide(Complex.ONE);
assertTrue(Double.isNaN(z.real)); assertTrue(Double.isNaN(z.getReal()));
assertEquals(inf, z.imaginary, 0); assertEquals(inf, z.getImaginary(), 0);
z = negInfNegInf.divide(oneNaN); z = negInfNegInf.divide(oneNaN);
assertTrue(Double.isNaN(z.real)); assertTrue(Double.isNaN(z.getReal()));
assertTrue(Double.isNaN(z.imaginary)); assertTrue(Double.isNaN(z.getImaginary()));
z = negInfInf.divide(Complex.ONE); z = negInfInf.divide(Complex.ONE);
assertTrue(Double.isNaN(z.real)); assertTrue(Double.isNaN(z.getReal()));
assertTrue(Double.isNaN(z.imaginary)); assertTrue(Double.isNaN(z.getImaginary()));
} }
public void testMultiply() { public void testMultiply() {
@ -199,8 +199,8 @@ public class ComplexTest extends TestCase {
public void testMultiplyNaNInf() { public void testMultiplyNaNInf() {
Complex z = new Complex(1,1); Complex z = new Complex(1,1);
Complex w = z.multiply(infOne); Complex w = z.multiply(infOne);
assertEquals(w.real, inf, 0); assertEquals(w.getReal(), inf, 0);
assertEquals(w.imaginary, inf, 0); assertEquals(w.getImaginary(), inf, 0);
// [MATH-164] // [MATH-164]
assertTrue(new Complex( 1,0).multiply(infInf).equals(Complex.INF)); assertTrue(new Complex( 1,0).multiply(infInf).equals(Complex.INF));
@ -208,12 +208,12 @@ public class ComplexTest extends TestCase {
assertTrue(new Complex( 1,0).multiply(negInfZero).equals(Complex.INF)); assertTrue(new Complex( 1,0).multiply(negInfZero).equals(Complex.INF));
w = oneInf.multiply(oneNegInf); w = oneInf.multiply(oneNegInf);
assertEquals(w.real, inf, 0); assertEquals(w.getReal(), inf, 0);
assertEquals(w.imaginary, inf, 0); assertEquals(w.getImaginary(), inf, 0);
w = negInfNegInf.multiply(oneNaN); w = negInfNegInf.multiply(oneNaN);
assertTrue(Double.isNaN(w.real)); assertTrue(Double.isNaN(w.getReal()));
assertTrue(Double.isNaN(w.imaginary)); assertTrue(Double.isNaN(w.getImaginary()));
} }
public void testNegate() { public void testNegate() {