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 5326c6a95c2309a44645b6a185c3b8bafff39726 Author: aherbert <[email protected]> AuthorDate: Fri Nov 8 17:58:58 2019 +0000 Fixed checkstyle in quaternion. --- .../commons/numbers/quaternion/Quaternion.java | 12 ++--- .../commons/numbers/quaternion/QuaternionTest.java | 18 ++++---- .../commons/numbers/quaternion/SlerpTest.java | 54 +++++++++++----------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java b/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java index bb93755..020b746 100644 --- a/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java +++ b/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java @@ -38,11 +38,11 @@ public final class Quaternion implements Serializable { public static final Quaternion ZERO = of(0, 0, 0, 0); /** Identity quaternion. */ public static final Quaternion ONE = new Quaternion(Type.POSITIVE_POLAR_FORM, 1, 0, 0, 0); - /** i */ + /** i. */ public static final Quaternion I = new Quaternion(Type.POSITIVE_POLAR_FORM, 0, 1, 0, 0); - /** j */ + /** j. */ public static final Quaternion J = new Quaternion(Type.POSITIVE_POLAR_FORM, 0, 0, 1, 0); - /** k */ + /** k. */ public static final Quaternion K = new Quaternion(Type.POSITIVE_POLAR_FORM, 0, 0, 0, 1); /** Serializable version identifier. */ @@ -103,7 +103,7 @@ public final class Quaternion implements Serializable { private static final class Normalized { /** {@link Quaternion#norm()} returns 1. */ static final ToDoubleFunction<Quaternion> NORM = q -> 1; - /** {@link Quaternion#isUnit()} returns 1. */ + /** {@link Quaternion#isUnit(double)} returns 1. */ static final BiPredicate<Quaternion, Double> IS_UNIT = (q, eps) -> true; } @@ -432,7 +432,7 @@ public final class Quaternion implements Serializable { */ @Override public int hashCode() { - return Arrays.hashCode(new double[] { w, x, y, z }); + return Arrays.hashCode(new double[] {w, x, y, z}); } /** @@ -604,7 +604,7 @@ public final class Quaternion implements Serializable { * @see #getZ() */ public double[] getVectorPart() { - return new double[] { x, y, z }; + return new double[] {x, y, z}; } /** diff --git a/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java b/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java index 7a787dc..aede102 100644 --- a/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java +++ b/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/QuaternionTest.java @@ -84,7 +84,7 @@ public class QuaternionTest { final double q1 = 5.4; final double q2 = 17; final double q3 = 0.0005; - final Quaternion q = Quaternion.of(q0, new double[] { q1, q2, q3 }); + final Quaternion q = Quaternion.of(q0, new double[] {q1, q2, q3}); final double sP = q.getScalarPart(); final double[] vP = q.getVectorPart(); @@ -98,7 +98,7 @@ public class QuaternionTest { @Test public void testWrongDimension() { Assertions.assertThrows(IllegalArgumentException.class, - () -> Quaternion.of(new double[] { 1, 2 }) + () -> Quaternion.of(new double[] {1, 2}) ); } @@ -297,7 +297,7 @@ public class QuaternionTest { Assertions.assertEquals(x, qb.getX(), EPS); Assertions.assertEquals(y, qb.getY(), EPS); Assertions.assertEquals(z, qb.getZ(), EPS); -} + } @Test public final void testNorm() { @@ -692,42 +692,42 @@ public class QuaternionTest { @Test public final void testParseMissingEnd() { Assertions.assertThrows(IllegalArgumentException.class, - () -> Quaternion.parse("[1.0 2.0 3.0 4.0") + () -> Quaternion.parse("[1.0 2.0 3.0 4.0") ); } @Test public final void testParseMissingPart() { Assertions.assertThrows(IllegalArgumentException.class, - () -> Quaternion.parse("[1.0 2.0 3.0 ]") + () -> Quaternion.parse("[1.0 2.0 3.0 ]") ); } @Test public final void testParseInvalidScalar() { Assertions.assertThrows(IllegalArgumentException.class, - () -> Quaternion.parse("[1.x 2.0 3.0 4.0]") + () -> Quaternion.parse("[1.x 2.0 3.0 4.0]") ); } @Test public final void testParseInvalidI() { Assertions.assertThrows(IllegalArgumentException.class, - () -> Quaternion.parse("[1.0 2.0x 3.0 4.0]") + () -> Quaternion.parse("[1.0 2.0x 3.0 4.0]") ); } @Test public final void testParseInvalidJ() { Assertions.assertThrows(IllegalArgumentException.class, - () -> Quaternion.parse("[1.0 2.0 3.0x 4.0]") + () -> Quaternion.parse("[1.0 2.0 3.0x 4.0]") ); } @Test public final void testParseInvalidK() { Assertions.assertThrows(IllegalArgumentException.class, - () -> Quaternion.parse("[1.0 2.0 3.0 4.0x]") + () -> Quaternion.parse("[1.0 2.0 3.0 4.0x]") ); } diff --git a/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/SlerpTest.java b/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/SlerpTest.java index e6b7719..71ebb5e 100644 --- a/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/SlerpTest.java +++ b/commons-numbers-quaternion/src/test/java/org/apache/commons/numbers/quaternion/SlerpTest.java @@ -182,23 +182,23 @@ public class SlerpTest { Slerp slerp = new Slerp(q0, q1); - double[] vec = { 2, 0, 1 }; + double[] vec = {2, 0, 1}; // act/assert - Assertions.assertArrayEquals(new double[] { 2, 0, 1 }, - transformVector(slerp.apply(0), vec), EPS); + Assertions.assertArrayEquals(new double[] {2, 0, 1}, + transformVector(slerp.apply(0), vec), EPS); - Assertions.assertArrayEquals(new double[] { SQRT_2, SQRT_2, 1 }, - transformVector(slerp.apply(0.25), vec), EPS); + Assertions.assertArrayEquals(new double[] {SQRT_2, SQRT_2, 1}, + transformVector(slerp.apply(0.25), vec), EPS); - Assertions.assertArrayEquals(new double[] { 0, 2, 1 }, - transformVector(slerp.apply(0.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {0, 2, 1}, + transformVector(slerp.apply(0.5), vec), EPS); - Assertions.assertArrayEquals(new double[] { -SQRT_2, SQRT_2, 1 }, - transformVector(slerp.apply(0.75), vec), EPS); + Assertions.assertArrayEquals(new double[] {-SQRT_2, SQRT_2, 1}, + transformVector(slerp.apply(0.75), vec), EPS); - Assertions.assertArrayEquals(new double[] { -2, 0, 1 }, - transformVector(slerp.apply(1), vec), EPS); + Assertions.assertArrayEquals(new double[] {-2, 0, 1}, + transformVector(slerp.apply(1), vec), EPS); } @Test @@ -238,8 +238,8 @@ public class SlerpTest { // act/assert // test each quaternion against all of the others (including itself) - for (int i=0; i<quaternions.length; ++i) { - for (int j=0; j<quaternions.length; ++j) { + for (int i = 0; i < quaternions.length; ++i) { + for (int j = 0; j < quaternions.length; ++j) { checkSlerpCombination(quaternions[i], quaternions[j]); } } @@ -248,7 +248,7 @@ public class SlerpTest { private void checkSlerpCombination(Quaternion start, Quaternion end) { Slerp slerp = new Slerp(start, end); - double[] vec = { 1, 2, 3 }; + double[] vec = {1, 2, 3}; double vecNorm = norm(vec); double[] startVec = transformVector(start, vec); @@ -263,7 +263,7 @@ public class SlerpTest { final int numSteps = 100; final double delta = 1.0 / numSteps; for (int step = 0; step <= numSteps; ++step) { - final double t= step * delta; + final double t = step * delta; Quaternion result = slerp.apply(t); double[] slerpVec = transformVector(result, vec); @@ -291,20 +291,20 @@ public class SlerpTest { Quaternion q1 = Quaternion.of(Math.cos(halfAngle1), 0, 0, Math.sin(halfAngle1)); // pi/4 around +z Quaternion q2 = Quaternion.of(Math.cos(halfAngle2), 0, 0, Math.sin(halfAngle2)); // 3pi/4 around +z - double[] vec = new double[] { 1, 0, 0 }; + double[] vec = new double[] {1, 0, 0}; // act/assert Slerp slerp12 = new Slerp(q1, q2); - Assertions.assertArrayEquals(new double[] { 1, 0, 0 }, transformVector(slerp12.apply(-4.5), vec), EPS); - Assertions.assertArrayEquals(new double[] { 1, 0, 0 }, transformVector(slerp12.apply(-0.5), vec), EPS); - Assertions.assertArrayEquals(new double[] { -1, 0, 0 }, transformVector(slerp12.apply(1.5), vec), EPS); - Assertions.assertArrayEquals(new double[] { -1, 0, 0 }, transformVector(slerp12.apply(5.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {1, 0, 0}, transformVector(slerp12.apply(-4.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {1, 0, 0}, transformVector(slerp12.apply(-0.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {-1, 0, 0}, transformVector(slerp12.apply(1.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {-1, 0, 0}, transformVector(slerp12.apply(5.5), vec), EPS); Slerp slerp21 = new Slerp(q2, q1); - Assertions.assertArrayEquals(new double[] { -1, 0, 0 }, transformVector(slerp21.apply(-4.5), vec), EPS); - Assertions.assertArrayEquals(new double[] { -1, 0, 0 }, transformVector(slerp21.apply(-0.5), vec), EPS); - Assertions.assertArrayEquals(new double[] { 1, 0, 0 }, transformVector(slerp21.apply(1.5), vec), EPS); - Assertions.assertArrayEquals(new double[] { 1, 0, 0 }, transformVector(slerp21.apply(5.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {-1, 0, 0}, transformVector(slerp21.apply(-4.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {-1, 0, 0}, transformVector(slerp21.apply(-0.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {1, 0, 0}, transformVector(slerp21.apply(1.5), vec), EPS); + Assertions.assertArrayEquals(new double[] {1, 0, 0}, transformVector(slerp21.apply(5.5), vec), EPS); } /** @@ -325,7 +325,7 @@ public class SlerpTest { */ private static double norm(double[] vec) { double sum = 0.0; - for (int i=0; i<vec.length; ++i) { + for (int i = 0; i < vec.length; ++i) { sum += vec[i] * vec[i]; } return Math.sqrt(sum); @@ -351,7 +351,7 @@ public class SlerpTest { */ private static double dot(double[] a, double[] b) { double result = 0.0; - for (int i=0; i<a.length; ++i) { + for (int i = 0; i < a.length; ++i) { result += a[i] * b[i]; } return result; @@ -371,7 +371,7 @@ public class SlerpTest { Quaternion result = q.multiply(qVec).multiply(qConj); - return new double[] { result.getX(), result.getY(), result.getZ() }; + return new double[] {result.getX(), result.getY(), result.getZ()}; } /**
