This is an automated email from the ASF dual-hosted git repository. erans pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit b67f72e30d651304c4669122039770f88f814868 Author: Matt Juntunen <matt.juntu...@hotmail.com> AuthorDate: Sun Dec 23 08:25:16 2018 -0500 NUMBERS-89: changing dotProduct() to dot() to match convention in commons-geometry --- .../main/java/org/apache/commons/numbers/quaternion/Quaternion.java | 6 +++--- .../src/main/java/org/apache/commons/numbers/quaternion/Slerp.java | 2 +- .../java/org/apache/commons/numbers/quaternion/QuaternionTest.java | 4 ++-- .../test/java/org/apache/commons/numbers/quaternion/SlerpTest.java | 2 +- 4 files changed, 7 insertions(+), 7 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 6df0bb8..ffc414a 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 @@ -338,7 +338,7 @@ public final class Quaternion implements Serializable { * @param q2 Quaternion. * @return the dot product of {@code q1} and {@code q2}. */ - public static double dotProduct(final Quaternion q1, + public static double dot(final Quaternion q1, final Quaternion q2) { return q1.w * q2.w + q1.x * q2.x + @@ -352,8 +352,8 @@ public final class Quaternion implements Serializable { * @param q Quaternion. * @return the dot product of this instance and {@code q}. */ - public double dotProduct(final Quaternion q) { - return dotProduct(this, q); + public double dot(final Quaternion q) { + return dot(this, q); } /** diff --git a/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Slerp.java b/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Slerp.java index a7096ea..3332550 100644 --- a/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Slerp.java +++ b/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Slerp.java @@ -51,7 +51,7 @@ public class Slerp implements DoubleFunction<Quaternion> { this.start = start.positivePolarForm(); final Quaternion e = end.positivePolarForm(); - double dot = this.start.dotProduct(e); + double dot = this.start.dot(e); // If the dot product is negative, then the interpolation won't follow the shortest // angular path between the two quaterions. In this case, invert the end quaternion 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 5d5f99b..f1d96b8 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 @@ -221,8 +221,8 @@ public class QuaternionTest { final Quaternion q1 = Quaternion.of(1, 2, 2, 1); final Quaternion q2 = Quaternion.of(3, -2, -1, -3); - final double actual1 = Quaternion.dotProduct(q1, q2); - final double actual2 = q1.dotProduct(q2); + final double actual1 = Quaternion.dot(q1, q2); + final double actual2 = q1.dot(q2); Assert.assertEquals(expected, actual1, EPS); Assert.assertEquals(expected, actual2, EPS); 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 c966fe3..ef9e013 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 @@ -146,7 +146,7 @@ public class SlerpTest { Slerp slerp = new Slerp(q1, q2); // act/assert - Assert.assertEquals(-1.0, q1.dotProduct(q2), EPS); + Assert.assertEquals(-1.0, q1.dot(q2), EPS); Quaternion expected = q1.positivePolarForm();