This is an automated email from the ASF dual-hosted git repository. aherbert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit 563d896b2a5c435f66af6dc215290637c1498ba3 Author: aherbert <aherb...@apache.org> AuthorDate: Mon Dec 9 11:58:50 2019 +0000 Removed conjugate() method. --- .../java/org/apache/commons/numbers/complex/Complex.java | 13 +------------ .../org/apache/commons/numbers/complex/CStandardTest.java | 4 ++-- .../org/apache/commons/numbers/complex/ComplexTest.java | 10 +++++----- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java index b4f1e8b..4459dc4 100644 --- a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java +++ b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java @@ -357,19 +357,8 @@ public final class Complex implements Serializable { * * @return the conjugate (z̅) of this complex object. */ - public Complex conjugate() { - return new Complex(real, -imaginary); - } - - /** - * Returns the conjugate of this complex number - * (C++11 grammar). - * - * @return the conjugate of this complex object. - * @see #conjugate() - */ public Complex conj() { - return conjugate(); + return new Complex(real, -imaginary); } /** diff --git a/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/CStandardTest.java b/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/CStandardTest.java index 23321e2..11a0bc2 100644 --- a/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/CStandardTest.java +++ b/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/CStandardTest.java @@ -283,8 +283,8 @@ public class CStandardTest { */ private static void assertConjugateEquality(Complex z, UnaryOperator<Complex> operation, UnspecifiedSign sign) { - final Complex c1 = operation.apply(z.conjugate()); - final Complex c2 = operation.apply(z).conjugate(); + final Complex c1 = operation.apply(z.conj()); + final Complex c2 = operation.apply(z).conj(); final Complex t1 = sign.removeSign(c1); final Complex t2 = sign.removeSign(c2); diff --git a/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java b/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java index 13bd820..4647052 100644 --- a/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java +++ b/commons-numbers-complex/src/test/java/org/apache/commons/numbers/complex/ComplexTest.java @@ -248,23 +248,23 @@ public class ComplexTest { @Test public void testConjugate() { final Complex x = Complex.ofCartesian(3.0, 4.0); - final Complex z = x.conjugate(); + final Complex z = x.conj(); Assertions.assertEquals(3.0, z.getReal()); Assertions.assertEquals(-4.0, z.getImaginary()); } @Test public void testConjugateNaN() { - final Complex z = NAN.conjugate(); + final Complex z = NAN.conj(); Assertions.assertTrue(z.isNaN()); } @Test public void testConjugateInfiinite() { Complex z = Complex.ofCartesian(0, inf); - Assertions.assertEquals(neginf, z.conjugate().getImaginary(), 0); + Assertions.assertEquals(neginf, z.conj().getImaginary(), 0); z = Complex.ofCartesian(0, neginf); - Assertions.assertEquals(inf, z.conjugate().getImaginary(), 0); + Assertions.assertEquals(inf, z.conj().getImaginary(), 0); } @Test @@ -1285,7 +1285,7 @@ public class ComplexTest { final Complex z = Complex.ofCartesian(rng.nextDouble(), rng.nextDouble()); Assertions.assertEquals(z.getReal(), z.real(), "real"); Assertions.assertEquals(z.getImaginary(), z.imag(), "imag"); - Assertions.assertEquals(z.conjugate(), z.conj(), "conj"); + Assertions.assertEquals(z.conj(), z.conj(), "conj"); } }