You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2018/07/20 10:33:31 UTC
[commons-geometry] branch master updated (afdd744 -> 8273d59)
This is an automated email from the ASF dual-hosted git repository.
erans pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-geometry.git.
from afdd744 Merge branch 'GEOMETRY-5__matt'
add e97c535 GEOMETRY-3: making euclidean point and vector constructors private
add f255ccc GEOMETRY-3: adding generic coordinate format and parsing classes
add aaf6960 GEOMETRY-3: adding euclidean parse methods; converting S1Point and S2Point to valjos; addressing some checkstyle issues
add 519a17a GEOMETRY-2: removing Serializable from top-level interface and placing at concrete class level, per issue comments
add 6ecc77d Merge branch 'master' into geometry-3
add 9cdec03 GEOMETRY-3: replacing class internal use of factory method with calls to constructor
add 7e50148 GEOMETRY-3: adding @FunctionalInterface to Coordinates.Factory?D interfaces
add 2331c8a GEOMETRY-3: simplifying parse and format functionality; renaming Coordinates.Factory?D interfaces to be more generic RealFunction interfaces
new 5cce171 GEOEMTRY-3: removing RealFunction interfaces from public API and renaming to DoubleFunction?N
new 666e3ac Merge branch 'master' into geometry-3
new 5c787bc GEOMETRY-4: addressing issues from CheckStyle and SpotBugs reports
new ebc752b GEOMETRY-4: updating CheckStyle fix in BSPTree.visit() to throw an exception in the default clause of the order switch statement instead of silently performing the last operation; the default clause should never be reached since all possibilities are handled in the switch statement
new 7b1e6ab GEOMETRY-4: fixing javadoc issues; mvn site now succeeds
new 8add8e4 Merge branch 'geometry-3' into cleanup
new 79fa306 Merge remote-tracking branch 'upstream/master' into cleanup
new 9a79891 Merge branch 'cleanup' into geometry-3-4
new 8273d59 Merge branch 'GEOMETRY-3_GEOMETRY-4__matt'
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/commons/geometry/core/Spatial.java | 4 +-
.../geometry/core/internal/DoubleFunction1N.java | 20 +-
.../geometry/core/internal/DoubleFunction2N.java | 24 +-
.../geometry/core/internal/DoubleFunction3N.java | 25 +-
.../geometry/core/internal/SimpleTupleFormat.java | 426 +++++++
.../geometry/core/internal}/package-info.java | 6 +-
.../core/partitioning/AbstractSubHyperplane.java | 2 +-
.../geometry/core/partitioning/BSPTree.java | 9 +-
.../geometry/core/partitioning/Embedding.java | 12 +-
.../geometry/core/partitioning/Hyperplane.java | 4 +-
.../geometry/core/partitioning/package-info.java | 6 +-
.../core/internal/SimpleTupleFormatTest.java | 465 +++++++
.../commons/geometry/enclosing/Encloser.java | 1 -
.../commons/geometry/enclosing/EnclosingBall.java | 2 -
.../geometry/enclosing/SupportBallGenerator.java | 1 -
.../commons/geometry/enclosing/WelzlEncloser.java | 1 -
.../threed/enclosing/SphereGenerator.java | 2 +-
.../euclidean/threed/enclosing}/package-info.java | 4 +-
.../euclidean/twod/enclosing/DiskGenerator.java | 2 +-
.../euclidean/twod/enclosing}/package-info.java | 4 +-
.../geometry/enclosing/WelzlEncloser2DTest.java | 4 +-
.../geometry/enclosing/WelzlEncloser3DTest.java | 58 +-
.../threed/enclosing/SphereGeneratorTest.java | 78 +-
.../twod/enclosing/DiskGeneratorTest.java | 32 +-
.../geometry/euclidean/oned/Cartesian1D.java | 13 +-
.../geometry/euclidean/oned/IntervalsSet.java | 10 +-
.../commons/geometry/euclidean/oned/Point1D.java | 41 +-
.../commons/geometry/euclidean/oned/Vector1D.java | 32 +-
.../geometry/euclidean/threed/Cartesian3D.java | 13 +-
.../commons/geometry/euclidean/threed/Line.java | 2 +-
.../euclidean/threed/OutlineExtractor.java | 4 +-
.../commons/geometry/euclidean/threed/Plane.java | 6 +-
.../commons/geometry/euclidean/threed/Point3D.java | 34 +-
.../geometry/euclidean/threed/PolyhedronsSet.java | 21 +-
.../geometry/euclidean/threed/Rotation.java | 12 +-
.../euclidean/threed/RotationConvention.java | 16 +-
.../commons/geometry/euclidean/threed/SubLine.java | 4 +-
.../geometry/euclidean/threed/Vector3D.java | 42 +-
.../geometry/euclidean/twod/Cartesian2D.java | 13 +-
.../commons/geometry/euclidean/twod/Line.java | 10 +-
.../commons/geometry/euclidean/twod/Point2D.java | 34 +-
.../geometry/euclidean/twod/PolygonsSet.java | 22 +-
.../commons/geometry/euclidean/twod/Segment.java | 2 +-
.../commons/geometry/euclidean/twod/SubLine.java | 4 +-
.../commons/geometry/euclidean/twod/Vector2D.java | 38 +-
.../core/partitioning/CharacterizationTest.java | 104 +-
.../geometry/euclidean/EuclideanTestUtils.java | 8 +-
.../geometry/euclidean/oned/Cartesian1DTest.java | 16 +
.../geometry/euclidean/oned/IntervalsSetTest.java | 68 +-
.../geometry/euclidean/oned/OrientedPointTest.java | 64 +-
.../geometry/euclidean/oned/Point1DTest.java | 35 +-
.../euclidean/oned/SubOrientedPointTest.java | 30 +-
.../geometry/euclidean/oned/Vector1DTest.java | 23 +-
.../geometry/euclidean/threed/Cartesian3DTest.java | 16 +
.../geometry/euclidean/threed/LineTest.java | 64 +-
.../geometry/euclidean/threed/PLYParser.java | 2 +-
.../geometry/euclidean/threed/PlaneTest.java | 68 +-
.../geometry/euclidean/threed/Point3DTest.java | 21 +-
.../euclidean/threed/PolyhedronsSetTest.java | 762 ++++++------
.../geometry/euclidean/threed/RotationTest.java | 118 +-
.../geometry/euclidean/threed/SubLineTest.java | 58 +-
.../geometry/euclidean/threed/Vector3DTest.java | 22 +-
.../geometry/euclidean/twod/Cartesian2DTest.java | 16 +
.../commons/geometry/euclidean/twod/LineTest.java | 56 +-
.../geometry/euclidean/twod/NestedLoopsTest.java | 10 +-
.../geometry/euclidean/twod/Point2DTest.java | 21 +-
.../geometry/euclidean/twod/PolygonsSetTest.java | 1312 ++++++++++----------
.../geometry/euclidean/twod/SegmentTest.java | 12 +-
.../geometry/euclidean/twod/SubLineTest.java | 58 +-
.../geometry/euclidean/twod/Vector2DTest.java | 23 +-
.../twod/hull/AbstractConvexHullGenerator2D.java | 2 +-
.../euclidean/twod/hull/AklToussaintHeuristic.java | 18 +-
.../geometry/euclidean/twod/hull/ConvexHull2D.java | 2 +-
.../euclidean/twod/hull/ConvexHullGenerator2D.java | 2 +-
.../euclidean/twod/hull/MonotoneChain.java | 2 +-
.../geometry/euclidean/twod/hull/package-info.java | 2 +-
.../apache/commons/geometry/hull/ConvexHull.java | 1 -
.../commons/geometry/hull/ConvexHullGenerator.java | 1 -
.../hull/ConvexHullGenerator2DAbstractTest.java | 160 +--
.../euclidean/twod/hull/MonotoneChainTest.java | 16 +-
.../geometry/spherical/SphericalCoordinates.java | 4 +-
.../commons/geometry/spherical/oned/ArcsSet.java | 39 +-
.../geometry/spherical/oned/LimitAngle.java | 4 +-
.../commons/geometry/spherical/oned/S1Point.java | 64 +-
.../commons/geometry/spherical}/package-info.java | 5 +-
.../commons/geometry/spherical/twod/Circle.java | 17 +-
.../commons/geometry/spherical/twod/Edge.java | 6 +-
.../geometry/spherical/twod/EdgesBuilder.java | 4 +-
.../spherical/twod/PropertiesComputer.java | 2 +-
.../commons/geometry/spherical/twod/S2Point.java | 129 +-
.../spherical/twod/SphericalPolygonsSet.java | 22 +-
.../spherical/SphericalCoordinatesTest.java | 24 +-
.../geometry/spherical/SphericalTestUtils.java | 4 +-
.../geometry/spherical/oned/ArcsSetTest.java | 130 +-
.../geometry/spherical/oned/LimitAngleTest.java | 2 +-
.../geometry/spherical/oned/S1PointTest.java | 44 +-
.../geometry/spherical/twod/CircleTest.java | 40 +-
.../geometry/spherical/twod/S2PointTest.java | 56 +-
.../spherical/twod/SphericalPolygonsSetTest.java | 108 +-
.../geometry/spherical/twod/SubCircleTest.java | 4 +-
100 files changed, 3378 insertions(+), 2088 deletions(-)
copy commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/package-info.java => commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction1N.java (67%)
copy commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java => commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction2N.java (65%)
copy commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java => commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction3N.java (62%)
create mode 100644 commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/SimpleTupleFormat.java
copy {commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed => commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal}/package-info.java (81%)
create mode 100644 commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/SimpleTupleFormatTest.java
copy {commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed => commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/threed/enclosing}/package-info.java (83%)
copy {commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed => commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/twod/enclosing}/package-info.java (83%)
copy {commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod => commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical}/package-info.java (88%)
[commons-geometry] 04/09: Merge branch 'geometry-3' into cleanup
Posted by er...@apache.org.
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-geometry.git
commit 8add8e4a82c2c1aea4b9dfb32eec8ee7f0fe9686
Merge: 7b1e6ab 7e50148
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Sat Jun 16 15:03:21 2018 -0400
Merge branch 'geometry-3' into cleanup
.../commons/geometry/core/util/Coordinates.java | 3 ++
.../commons/geometry/euclidean/oned/Point1D.java | 12 +++----
.../commons/geometry/euclidean/oned/Vector1D.java | 22 ++++++------
.../commons/geometry/euclidean/threed/Point3D.java | 10 +++---
.../geometry/euclidean/threed/Vector3D.java | 40 +++++++++++-----------
.../commons/geometry/euclidean/twod/Point2D.java | 10 +++---
.../commons/geometry/euclidean/twod/Vector2D.java | 28 +++++++--------
7 files changed, 64 insertions(+), 61 deletions(-)
[commons-geometry] 07/09: Merge remote-tracking branch
'upstream/master' into cleanup
Posted by er...@apache.org.
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-geometry.git
commit 79fa3067294931d6939ff817170e9ad7be98ed25
Merge: 8add8e4 afdd744
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Thu Jul 19 21:53:55 2018 -0400
Merge remote-tracking branch 'upstream/master' into cleanup
README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-core/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-enclosing/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-euclidean/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-hull/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-spherical/README.md | 105 +++++++++++++++++++++++++++++++++++
pom.xml | 2 +-
7 files changed, 631 insertions(+), 1 deletion(-)
[commons-geometry] 08/09: Merge branch 'cleanup' into geometry-3-4
Posted by er...@apache.org.
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-geometry.git
commit 9a79891c37accfa01b8b7772f422bc7966a3c410
Merge: 666e3ac 79fa306
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Thu Jul 19 21:54:20 2018 -0400
Merge branch 'cleanup' into geometry-3-4
.../core/partitioning/AbstractSubHyperplane.java | 2 +-
.../commons/geometry/core/partitioning/BSPTree.java | 9 +++++++--
.../commons/geometry/core/partitioning/Embedding.java | 12 ++++--------
.../commons/geometry/core/partitioning/Hyperplane.java | 4 ++--
.../geometry/core/partitioning/package-info.java | 6 +++---
.../apache/commons/geometry/enclosing/Encloser.java | 1 -
.../commons/geometry/enclosing/EnclosingBall.java | 2 --
.../geometry/enclosing/SupportBallGenerator.java | 1 -
.../commons/geometry/enclosing/WelzlEncloser.java | 1 -
.../euclidean/threed/enclosing}/package-info.java | 5 ++---
.../euclidean/twod/enclosing}/package-info.java | 5 ++---
.../commons/geometry/euclidean/oned/Point1D.java | 8 ++++----
.../commons/geometry/euclidean/threed/Plane.java | 2 +-
.../geometry/euclidean/threed/PolyhedronsSet.java | 5 +++--
.../commons/geometry/euclidean/threed/Rotation.java | 4 ++--
.../geometry/euclidean/threed/RotationConvention.java | 16 ++++++++--------
.../commons/geometry/euclidean/threed/Vector3D.java | 8 +++-----
.../commons/geometry/euclidean/twod/Vector2D.java | 4 ++--
.../twod/hull/AbstractConvexHullGenerator2D.java | 2 +-
.../euclidean/twod/hull/AklToussaintHeuristic.java | 18 +++++++++---------
.../geometry/euclidean/twod/hull/ConvexHull2D.java | 2 +-
.../euclidean/twod/hull/ConvexHullGenerator2D.java | 2 +-
.../geometry/euclidean/twod/hull/MonotoneChain.java | 2 +-
.../geometry/euclidean/twod/hull/package-info.java | 2 +-
.../org/apache/commons/geometry/hull/ConvexHull.java | 1 -
.../commons/geometry/hull/ConvexHullGenerator.java | 1 -
.../commons/geometry/spherical/oned/ArcsSet.java | 6 +++---
.../commons/geometry/spherical/oned/LimitAngle.java | 4 ++--
.../commons/geometry/spherical/oned/S1Point.java | 4 ++--
.../apache/commons/geometry/spherical/twod/Circle.java | 10 +++++-----
.../commons/geometry/spherical/twod/S2Point.java | 6 +++---
.../geometry/spherical/twod/SphericalPolygonsSet.java | 6 +++---
32 files changed, 76 insertions(+), 85 deletions(-)
[commons-geometry] 02/09: GEOMETRY-4: updating CheckStyle fix in
BSPTree.visit() to throw an exception in the default clause of the order
switch statement instead of silently performing the last operation;
the default clause should never be reached since all possibilities are
handled in the switch statement
Posted by er...@apache.org.
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-geometry.git
commit ebc752bba877bf8df69fdea7772e549993cb98ab
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Sun Jun 3 15:35:48 2018 -0400
GEOMETRY-4: updating CheckStyle fix in BSPTree.visit() to throw an exception in the default clause of the order switch statement instead of silently performing the last operation; the default clause should never be reached since all possibilities are handled in the switch statement
---
.../org/apache/commons/geometry/core/partitioning/BSPTree.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java
index 7e2ddde..e74614b 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.geometry.core.Point;
+import org.apache.commons.geometry.core.partitioning.BSPTreeVisitor.Order;
/** This class represent a Binary Space Partition tree.
@@ -239,7 +240,8 @@ public class BSPTree<P extends Point<P>> {
if (cut == null) {
visitor.visitLeafNode(this);
} else {
- switch (visitor.visitOrder(this)) {
+ Order order = visitor.visitOrder(this);
+ switch (order) {
case PLUS_MINUS_SUB:
plus.visit(visitor);
minus.visit(visitor);
@@ -266,13 +268,15 @@ public class BSPTree<P extends Point<P>> {
minus.visit(visitor);
break;
case SUB_MINUS_PLUS:
- default:
visitor.visitInternalNode(this);
minus.visit(visitor);
plus.visit(visitor);
break;
+ default:
+ // we shouldn't end up here since all possibilities are
+ // covered above
+ throw new IllegalStateException("Invalid node visit order: " + order);
}
-
}
}
[commons-geometry] 03/09: GEOMETRY-4: fixing javadoc issues;
mvn site now succeeds
Posted by er...@apache.org.
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-geometry.git
commit 7b1e6ab4da8aac329d28045846722b6cbca1888e
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Mon Jun 4 22:22:07 2018 -0400
GEOMETRY-4: fixing javadoc issues; mvn site now succeeds
---
.../core/partitioning/AbstractSubHyperplane.java | 2 +-
.../commons/geometry/core/partitioning/Embedding.java | 12 ++++--------
.../commons/geometry/core/partitioning/Hyperplane.java | 4 ++--
.../commons/geometry/core/partitioning/package-info.java | 6 +++---
.../apache/commons/geometry/enclosing/EnclosingBall.java | 1 -
.../apache/commons/geometry/euclidean/oned/Point1D.java | 8 ++++----
.../commons/geometry/euclidean/threed/Rotation.java | 4 ++--
.../geometry/euclidean/threed/RotationConvention.java | 16 ++++++++--------
.../commons/geometry/euclidean/threed/Vector3D.java | 8 +++-----
.../apache/commons/geometry/euclidean/twod/Vector2D.java | 4 ++--
.../twod/hull/AbstractConvexHullGenerator2D.java | 2 +-
.../geometry/euclidean/twod/hull/ConvexHull2D.java | 2 +-
.../euclidean/twod/hull/ConvexHullGenerator2D.java | 2 +-
.../geometry/euclidean/twod/hull/MonotoneChain.java | 2 +-
.../geometry/euclidean/twod/hull/package-info.java | 2 +-
.../apache/commons/geometry/spherical/oned/ArcsSet.java | 6 +++---
.../commons/geometry/spherical/oned/LimitAngle.java | 4 ++--
.../apache/commons/geometry/spherical/oned/S1Point.java | 4 ++--
.../apache/commons/geometry/spherical/twod/Circle.java | 10 +++++-----
.../apache/commons/geometry/spherical/twod/S2Point.java | 6 +++---
.../geometry/spherical/twod/SphericalPolygonsSet.java | 6 +++---
21 files changed, 52 insertions(+), 59 deletions(-)
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/AbstractSubHyperplane.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/AbstractSubHyperplane.java
index 6c07722..c8dfad1 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/AbstractSubHyperplane.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/AbstractSubHyperplane.java
@@ -77,7 +77,7 @@ public abstract class AbstractSubHyperplane<P extends Point<P>, S extends Point<
/** Get the remaining region of the hyperplane.
* <p>The returned region is expressed in the canonical hyperplane
* frame and has the hyperplane dimension. For example a chopped
- * hyperplane in the 3D euclidean is a 2D plane and the
+ * hyperplane in the 3D Euclidean is a 2D plane and the
* corresponding region is a convex 2D polygon.</p>
* @return remaining region of the hyperplane
*/
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Embedding.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Embedding.java
index f4ebd50..dfc40bf 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Embedding.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Embedding.java
@@ -23,19 +23,15 @@ import org.apache.commons.geometry.core.Point;
* <p>Sub-spaces are the lower dimensions subsets of a n-dimensions
* space. The (n-1)-dimension sub-spaces are specific sub-spaces known
* as {@link Hyperplane hyperplanes}. This interface can be used regardless
- * of the dimensions differences. As an example, {@link
- * org.apache.commons.geometry.euclidean.threed.Line Line} in 3D
- * implements Embedding<{@link
- * org.apache.commons.geometry.euclidean.threed.Point3D Point3D}, {@link
- * org.apache.commons.geometry.euclidean.oned.Point1D Point1D}>, i.e. it
- * maps directly dimensions 3 and 1.</p>
+ * of the dimensions differences. For example, a line in 3D Euclidean space
+ * can map directly from 3 dimensions to 1.</p>
- * <p>In the 3D euclidean space, hyperplanes are 2D planes, and the 1D
+ * <p>In the 3D Euclidean space, hyperplanes are 2D planes, and the 1D
* sub-spaces are lines.</p>
* <p>
* Note that this interface is <em>not</em> intended to be implemented
- * by Apache Commons Math users, it is only intended to be implemented
+ * by Apache Commons Geometry users, it is only intended to be implemented
* within the library itself. New methods may be added even for minor
* versions, which breaks compatibility for external implementations.
* </p>
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Hyperplane.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Hyperplane.java
index 9a29432..a8b0151 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Hyperplane.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/Hyperplane.java
@@ -24,8 +24,8 @@ import org.apache.commons.geometry.core.Point;
* partitioning is as cutters. Each partitioning node in a {@link
* BSPTree BSP tree} has a cut {@link SubHyperplane sub-hyperplane}
* which is either an hyperplane or a part of an hyperplane. In an
- * n-dimensions euclidean space, an hyperplane is an (n-1)-dimensions
- * hyperplane (for example a traditional plane in the 3D euclidean
+ * n-dimensions Euclidean space, an hyperplane is an (n-1)-dimensions
+ * hyperplane (for example a traditional plane in the 3D Euclidean
* space). They can be more exotic objects in specific fields, for
* example a circle on the surface of the unit sphere.</p>
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/package-info.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/package-info.java
index c1a1208..cfb55c0 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/package-info.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/package-info.java
@@ -19,7 +19,7 @@
* This package provides classes to implement Binary Space Partition trees.
*
* <p>
- * {@link org.apache.commons.geometry.partitioning.BSPTree BSP trees}
+ * {@link org.apache.commons.geometry.core.partitioning.BSPTree BSP trees}
* are an efficient way to represent parts of space and in particular
* polytopes (line segments in 1D, polygons in 2D and polyhedrons in 3D)
* and to operate on them. The main principle is to recursively subdivide
@@ -52,9 +52,9 @@
* single part, but by several convex ones. This is the property that
* allows BSP-trees to represent non-convex polytopes despites all parts
* are convex. The {@link
- * org.apache.commons.geometry.partitioning.Region Region} class is
+ * org.apache.commons.geometry.core.partitioning.Region Region} class is
* devoted to this representation, it is build on top of the {@link
- * org.apache.commons.geometry.partitioning.BSPTree BSPTree} class using
+ * org.apache.commons.geometry.core.partitioning.BSPTree BSPTree} class using
* boolean objects as the leaf nodes attributes to represent the
* inside/outside property of each leaf part, and also adds various
* methods dealing with boundaries (i.e. the separation between the
diff --git a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java
index b7b4c99..0fb9224 100644
--- a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java
+++ b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java
@@ -22,7 +22,6 @@ import org.apache.commons.geometry.core.Point;
/** This class represents a ball enclosing some points.
* @param <P> Point type.
- * @see Space
* @see Point
* @see Encloser
*/
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java
index c6e6910..0d15c69 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java
@@ -201,7 +201,7 @@ public final class Point1D extends Cartesian1D implements EuclideanPoint<Point1D
* @param a scale factor for first coordinate
* @param c first coordinate
* @return point with coordinates calculated by {@code a * c}
- * @see {@link Vector1D#linearCombination(double, Vector1D)}
+ * @see Vector1D#linearCombination(double, Cartesian1D)
*/
public static Point1D vectorCombination(double a, Cartesian1D c) {
return new Point1D(a * c.getX());
@@ -226,7 +226,7 @@ public final class Point1D extends Cartesian1D implements EuclideanPoint<Point1D
* @param a2 scale factor for second coordinate
* @param c2 second coordinate
* @return point with coordinates calculated by {@code (a1 * c1) + (a2 * c2)}
- * @see {@link Vector1D#linearCombination(double, Cartesian1D, double, Cartesian1D)}
+ * @see Vector1D#linearCombination(double, Cartesian1D, double, Cartesian1D)
*/
public static Point1D vectorCombination(double a1, Cartesian1D c1, double a2, Cartesian1D c2) {
return new Point1D(
@@ -254,7 +254,7 @@ public final class Point1D extends Cartesian1D implements EuclideanPoint<Point1D
* @param a3 scale factor for third coordinate
* @param c3 third coordinate
* @return point with coordinates calculated by {@code (a1 * c1) + (a2 * c2) + (a3 * c3)}
- * @see {@link Vector1D#linearCombination(double, Cartesian1D, double, Cartesian1D, double, Cartesian1D)}
+ * @see Vector1D#linearCombination(double, Cartesian1D, double, Cartesian1D, double, Cartesian1D)
*/
public static Point1D vectorCombination(double a1, Cartesian1D c1, double a2, Cartesian1D c2,
double a3, Cartesian1D c3) {
@@ -285,7 +285,7 @@ public final class Point1D extends Cartesian1D implements EuclideanPoint<Point1D
* @param a4 scale factor for fourth coordinate
* @param c4 fourth coordinate
* @return point with coordinates calculated by {@code (a1 * c1) + (a2 * c2) + (a3 * c3) + (a4 * c4)}
- * @see {@link Vector1D#linearCombination(double, Cartesian1D, double, Cartesian1D, double, Cartesian1D, double, Cartesian1D)}
+ * @see Vector1D#linearCombination(double, Cartesian1D, double, Cartesian1D, double, Cartesian1D, double, Cartesian1D)
*/
public static Point1D vectorCombination(double a1, Cartesian1D c1, double a2, Cartesian1D c2,
double a3, Cartesian1D c3, double a4, Cartesian1D c4) {
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Rotation.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Rotation.java
index 931be75..a24129c 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Rotation.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Rotation.java
@@ -68,8 +68,8 @@ import org.apache.commons.numbers.arrays.LinearCombination;
* class does not push the user towards one specific definition and hence does not
* provide methods like <code>projectVectorIntoDestinationFrame</code> or
* <code>computeTransformedDirection</code>. It provides simpler and more generic
- * methods: {@link #applyTo(Vector3D) applyTo(Cartesian3D)} and {@link
- * #applyInverseTo(Vector3D) applyInverseTo(Cartesian3D)}.</p>
+ * methods: {@link #applyTo(Vector3D) applyTo(Vector3D)} and {@link
+ * #applyInverseTo(Vector3D) applyInverseTo(Vector3D)}.</p>
*
* <p>Since a rotation is basically a vectorial operator, several rotations can be
* composed together and the composite operation <code>r = r<sub>1</sub> o
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/RotationConvention.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/RotationConvention.java
index 53766ce..25abc95 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/RotationConvention.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/RotationConvention.java
@@ -30,10 +30,10 @@ public enum RotationConvention {
* </p>
* <p>
* This means that if we define rotation r is a 90 degrees rotation around
- * the Z axis, the image of vector {@link Cartesian3D#PLUS_I} would be
- * {@link Cartesian3D#PLUS_J}, the image of vector {@link Cartesian3D#PLUS_J}
- * would be {@link Cartesian3D#MINUS_I}, the image of vector {@link Cartesian3D#PLUS_K}
- * would be {@link Cartesian3D#PLUS_K}, and the image of vector with coordinates (1, 2, 3)
+ * the Z axis, the image of vector {@link Vector3D#PLUS_X} would be
+ * {@link Vector3D#PLUS_Y}, the image of vector {@link Vector3D#PLUS_Y}
+ * would be {@link Vector3D#MINUS_X}, the image of vector {@link Vector3D#PLUS_Z}
+ * would be {@link Vector3D#PLUS_Z}, and the image of vector with coordinates (1, 2, 3)
* would be vector (-2, 1, 3). This means that the vector rotates counterclockwise.
* </p>
* <p>
@@ -57,10 +57,10 @@ public enum RotationConvention {
* </p>
* <p>
* This means that if we define rotation r is a 90 degrees rotation around
- * the Z axis, the image of vector {@link Cartesian3D#PLUS_I} would be
- * {@link Cartesian3D#MINUS_J}, the image of vector {@link Cartesian3D#PLUS_J}
- * would be {@link Cartesian3D#PLUS_I}, the image of vector {@link Cartesian3D#PLUS_K}
- * would be {@link Cartesian3D#PLUS_K}, and the image of vector with coordinates (1, 2, 3)
+ * the Z axis, the image of vector {@link Vector3D#PLUS_X} would be
+ * {@link Vector3D#MINUS_Y}, the image of vector {@link Vector3D#PLUS_Y}
+ * would be {@link Vector3D#PLUS_X}, the image of vector {@link Vector3D#PLUS_Z}
+ * would be {@link Vector3D#PLUS_Z}, and the image of vector with coordinates (1, 2, 3)
* would be vector (2, -1, 3). This means that the coordinates of the vector rotates
* clockwise, because they are expressed with respect to a destination frame that is rotated
* counterclockwise.
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java
index 85246ab..8e8e152 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java
@@ -393,7 +393,7 @@ public final class Vector3D extends Cartesian3D implements EuclideanVector<Point
* @param v1 first vector
* @param v2 second vector
* @return the dot product
- * @see {@link #dotProduct(Vector3D)}
+ * @see #dotProduct(Vector3D)
*/
public static double dotProduct(Vector3D v1, Vector3D v2) {
return v1.dotProduct(v2);
@@ -404,7 +404,7 @@ public final class Vector3D extends Cartesian3D implements EuclideanVector<Point
* @param v1 first vector
* @param v2 second vector
* @return the angle between the vectors in radians
- * @see {@link #angle(Vector3D)}
+ * @see #angle(Vector3D)
*/
public static double angle(Vector3D v1, Vector3D v2) {
return v1.angle(v2);
@@ -415,7 +415,7 @@ public final class Vector3D extends Cartesian3D implements EuclideanVector<Point
* @param v1 first vector
* @param v2 second vector
* @return the computed cross product vector
- * @see {@link #crossProduct(Vector3D)}
+ * @see #crossProduct(Vector3D)
*/
public static Vector3D crossProduct(Vector3D v1, Vector3D v2) {
return v1.crossProduct(v2);
@@ -457,8 +457,6 @@ public final class Vector3D extends Cartesian3D implements EuclideanVector<Point
* @param delta elevation (δ) above (XY) plane, from -π/2 to +π/2
* @see #getAlpha()
* @see #getDelta()
- * @param alpha
- * @param delta
* @return new vector instance with the given azimuthal coordinates
*/
public static Vector3D fromSpherical(double alpha, double delta) {
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java
index e6285b1..c07155d 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java
@@ -331,7 +331,7 @@ public final class Vector2D extends Cartesian2D implements EuclideanVector<Point
* @param v1 first vector
* @param v2 second vector
* @return the dot product
- * @see {@link #dotProduct(Vector2D)}
+ * @see #dotProduct(Vector2D)
*/
public static double dotProduct(Vector2D v1, Vector2D v2) {
return v1.dotProduct(v2);
@@ -342,7 +342,7 @@ public final class Vector2D extends Cartesian2D implements EuclideanVector<Point
* @param v1 first vector
* @param v2 second vector
* @return the angle between the vectors in radians
- * @see {@link #angle(Vector2D)}
+ * @see #angle(Vector2D)
*/
public static double angle(Vector2D v1, Vector2D v2) {
return v1.angle(v2);
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AbstractConvexHullGenerator2D.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AbstractConvexHullGenerator2D.java
index 14b8548..3678bf0 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AbstractConvexHullGenerator2D.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AbstractConvexHullGenerator2D.java
@@ -21,7 +21,7 @@ import java.util.Collection;
import org.apache.commons.geometry.euclidean.twod.Point2D;
/**
- * Abstract base class for convex hull generators in the two-dimensional euclidean space.
+ * Abstract base class for convex hull generators in the two-dimensional Euclidean space.
*/
abstract class AbstractConvexHullGenerator2D implements ConvexHullGenerator2D {
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHull2D.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHull2D.java
index ce0230e..242de67 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHull2D.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHull2D.java
@@ -29,7 +29,7 @@ import org.apache.commons.numbers.arrays.LinearCombination;
import org.apache.commons.numbers.core.Precision;
/**
- * This class represents a convex hull in an two-dimensional euclidean space.
+ * This class represents a convex hull in an two-dimensional Euclidean space.
*/
public class ConvexHull2D implements ConvexHull<Point2D>, Serializable {
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHullGenerator2D.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHullGenerator2D.java
index 43a45b6..8c3dde4 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHullGenerator2D.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/ConvexHullGenerator2D.java
@@ -22,7 +22,7 @@ import org.apache.commons.geometry.euclidean.twod.Point2D;
import org.apache.commons.geometry.hull.ConvexHullGenerator;
/**
- * Interface for convex hull generators in the two-dimensional euclidean space.
+ * Interface for convex hull generators in the two-dimensional Euclidean space.
*/
public interface ConvexHullGenerator2D extends ConvexHullGenerator<Point2D> {
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/MonotoneChain.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/MonotoneChain.java
index a47cb1f..b480350 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/MonotoneChain.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/MonotoneChain.java
@@ -28,7 +28,7 @@ import org.apache.commons.numbers.core.Precision;
/**
* Implements Andrew's monotone chain method to generate the convex hull of a finite set of
- * points in the two-dimensional euclidean space.
+ * points in the two-dimensional Euclidean space.
* <p>
* The runtime complexity is O(n log n), with n being the number of input points. If the
* point set is already sorted (by x-coordinate), the runtime complexity is O(n).
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/package-info.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/package-info.java
index 0139107..86b304c 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/package-info.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/package-info.java
@@ -18,7 +18,7 @@
*
* <p>
* This package provides algorithms to generate the convex hull
- * for a set of points in an two-dimensional euclidean space.
+ * for a set of points in an two-dimensional Euclidean space.
* </p>
*
*/
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/ArcsSet.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/ArcsSet.java
index 676a88b..813dae9 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/ArcsSet.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/ArcsSet.java
@@ -36,7 +36,7 @@ import org.apache.commons.numbers.core.Precision;
* Note that due to the wrapping around \(2 \pi\), barycenter is
* ill-defined here. It was defined only in order to fulfill
* the requirements of the {@link
- * org.apache.commons.geometry.partitioning.Region Region}
+ * org.apache.commons.geometry.core.partitioning.Region Region}
* interface, but its use is discouraged.
* </p>
*/
@@ -101,7 +101,7 @@ public class ArcsSet extends AbstractRegion<S1Point, S1Point> implements Iterabl
* boundary does not really separate an inside open from an outside
* open (open having here its topological meaning), then subsequent
* calls to the {@link
- * org.apache.commons.geometry.partitioning.Region#checkPoint(org.apache.commons.geometry.Point)
+ * org.apache.commons.geometry.core.partitioning.Region#checkPoint(org.apache.commons.geometry.core.Point)
* checkPoint} method will not be meaningful anymore.</p>
* <p>If the boundary is empty, the region will represent the whole
* space.</p>
@@ -932,7 +932,7 @@ public class ArcsSet extends AbstractRegion<S1Point, S1Point> implements Iterabl
/** Specialized exception for inconsistent BSP tree state inconsistency.
* <p>
* This exception is thrown at {@link ArcsSet} construction time when the
- * {@link org.apache.commons.geometry.partitioning.Region.Location inside/outside}
+ * {@link org.apache.commons.geometry.core.partitioning.Region.Location inside/outside}
* state is not consistent at the 0, \(2 \pi \) crossing.
* </p>
*/
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/LimitAngle.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/LimitAngle.java
index fd488c7..bc80a21 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/LimitAngle.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/LimitAngle.java
@@ -83,9 +83,9 @@ public class LimitAngle implements Hyperplane<S1Point> {
* <p>Since this class represent zero dimension spaces which does
* not have lower dimension sub-spaces, this method returns a dummy
* implementation of a {@link
- * org.apache.commons.geometry.partitioning.SubHyperplane SubHyperplane}.
+ * org.apache.commons.geometry.core.partitioning.SubHyperplane SubHyperplane}.
* This implementation is only used to allow the {@link
- * org.apache.commons.geometry.partitioning.SubHyperplane
+ * org.apache.commons.geometry.core.partitioning.SubHyperplane
* SubHyperplane} class implementation to work properly, it should
* <em>not</em> be used otherwise.</p>
* @return a dummy sub hyperplane
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java
index 7cced20..fdabb13 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java
@@ -64,13 +64,13 @@ public final class S1Point implements Point<S1Point>, Serializable {
/** Get the azimuthal angle in radians \( \alpha \).
* @return azimuthal angle \( \alpha \)
- * @see #S1Point(double)
+ * @see S1Point#of(double)
*/
public double getAlpha() {
return alpha;
}
- /** Get the corresponding normalized vector in the 2D euclidean space.
+ /** Get the corresponding normalized vector in the 2D Euclidean space.
* @return normalized vector
*/
public Vector2D getVector() {
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/Circle.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/Circle.java
index 3b017ca..31cc5c9 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/Circle.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/Circle.java
@@ -142,7 +142,7 @@ public class Circle implements Hyperplane<S2Point>, Embedding<S2Point, S1Point>
}
/** {@inheritDoc}
- * @see #getPhase(Cartesian3D)
+ * @see #getPhase(Vector3D)
*/
@Override
public S1Point toSubSpace(final S2Point point) {
@@ -251,7 +251,7 @@ public class Circle implements Hyperplane<S2Point>, Embedding<S2Point, S1Point>
}
/** {@inheritDoc}
- * @see #getOffset(Cartesian3D)
+ * @see #getOffset(Vector3D)
*/
@Override
public double getOffset(final S2Point point) {
@@ -278,12 +278,12 @@ public class Circle implements Hyperplane<S2Point>, Embedding<S2Point, S1Point>
return pole.dotProduct(otherC.pole) >= 0.0;
}
- /** Get a {@link org.apache.commons.geometry.partitioning.Transform
+ /** Get a {@link org.apache.commons.geometry.core.partitioning.Transform
* Transform} embedding a 3D rotation.
* @param rotation rotation to use
* @return a new transform that can be applied to either {@link
- * Point Point}, {@link Circle Line} or {@link
- * org.apache.commons.geometry.partitioning.SubHyperplane
+ * S2Point Point}, {@link Circle Line} or {@link
+ * org.apache.commons.geometry.core.partitioning.SubHyperplane
* SubHyperplane} instances
*/
public static Transform<S2Point, S1Point> getTransform(final Rotation rotation) {
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java
index f8d3f4e..93cec93 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java
@@ -93,7 +93,7 @@ public final class S2Point implements Point<S2Point>, Serializable {
/** Get the azimuthal angle \( \theta \) in the x-y plane.
* @return azimuthal angle \( \theta \) in the x-y plane
- * @see #S2Point(double, double)
+ * @see S2Point#of(double, double)
*/
public double getTheta() {
return theta;
@@ -101,13 +101,13 @@ public final class S2Point implements Point<S2Point>, Serializable {
/** Get the polar angle \( \varphi \).
* @return polar angle \( \varphi \)
- * @see #S2Point(double, double)
+ * @see S2Point#of(double, double)
*/
public double getPhi() {
return phi;
}
- /** Get the corresponding normalized vector in the 3D euclidean space.
+ /** Get the corresponding normalized vector in the 3D Euclidean space.
* @return normalized vector
*/
public Vector3D getVector() {
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/SphericalPolygonsSet.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/SphericalPolygonsSet.java
index d9e3eeb..b1b6b50 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/SphericalPolygonsSet.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/SphericalPolygonsSet.java
@@ -103,7 +103,7 @@ public class SphericalPolygonsSet extends AbstractRegion<S2Point, S1Point> {
* boundary does not really separate an inside open from an outside
* open (open having here its topological meaning), then subsequent
* calls to the {@link
- * org.apache.commons.geometry.partitioning.Region#checkPoint(org.apache.commons.geometry.Point)
+ * org.apache.commons.geometry.core.partitioning.Region#checkPoint(org.apache.commons.geometry.core.Point)
* checkPoint} method will not be meaningful anymore.</p>
* <p>If the boundary is empty, the region will represent the whole
* space.</p>
@@ -420,7 +420,7 @@ public class SphericalPolygonsSet extends AbstractRegion<S2Point, S1Point> {
* <p>
* This method is intended as a first test to quickly identify points
* that are guaranteed to be outside of the region, hence performing a full
- * {@link #checkPoint(org.apache.commons.geometry.Point) checkPoint}
+ * {@link #checkPoint(org.apache.commons.geometry.core.Point) checkPoint}
* only if the point status remains undecided after the quick check. It is
* is therefore mostly useful to speed up computation for small polygons with
* complex shapes (say a country boundary on Earth), as the spherical cap will
@@ -455,7 +455,7 @@ public class SphericalPolygonsSet extends AbstractRegion<S2Point, S1Point> {
* In the special cases of empty or whole sphere polygons, special
* spherical caps are returned, with angular radius set to negative
* or positive infinity so the {@link
- * EnclosingBall#contains(org.apache.commons.geometry.Point) ball.contains(point)}
+ * EnclosingBall#contains(org.apache.commons.geometry.core.Point) ball.contains(point)}
* method return always false or true.
* </p>
* <p>
[commons-geometry] 01/09: GEOMETRY-4: addressing issues from
CheckStyle and SpotBugs reports
Posted by er...@apache.org.
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-geometry.git
commit 5c787bcffdc0ff0a9cfcf69c7a04fed6a72e3c0d
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Sun Jun 3 00:44:13 2018 -0400
GEOMETRY-4: addressing issues from CheckStyle and SpotBugs reports
---
.../geometry/core/partitioning/BSPTree.java | 1 +
.../commons/geometry/enclosing/Encloser.java | 1 -
.../commons/geometry/enclosing/EnclosingBall.java | 1 -
.../geometry/enclosing/SupportBallGenerator.java | 1 -
.../commons/geometry/enclosing/WelzlEncloser.java | 1 -
.../threed/enclosing/package-info.java} | 24 +++++++---------------
.../twod/enclosing/package-info.java} | 24 +++++++---------------
.../commons/geometry/euclidean/threed/Plane.java | 2 +-
.../geometry/euclidean/threed/PolyhedronsSet.java | 5 +++--
.../euclidean/twod/hull/AklToussaintHeuristic.java | 18 ++++++++--------
.../apache/commons/geometry/hull/ConvexHull.java | 1 -
.../commons/geometry/hull/ConvexHullGenerator.java | 1 -
12 files changed, 28 insertions(+), 52 deletions(-)
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java
index 4a6a407..7e2ddde 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/partitioning/BSPTree.java
@@ -266,6 +266,7 @@ public class BSPTree<P extends Point<P>> {
minus.visit(visitor);
break;
case SUB_MINUS_PLUS:
+ default:
visitor.visitInternalNode(this);
minus.visit(visitor);
plus.visit(visitor);
diff --git a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java
index 7fd1f18..a5fb1fb 100644
--- a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java
+++ b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java
@@ -19,7 +19,6 @@ package org.apache.commons.geometry.enclosing;
import org.apache.commons.geometry.core.Point;
/** Interface for algorithms computing enclosing balls.
- * @param <S> Space type.
* @param <P> Point type.
* @see EnclosingBall
*/
diff --git a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java
index 7ed537b..b7b4c99 100644
--- a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java
+++ b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/EnclosingBall.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
import org.apache.commons.geometry.core.Point;
/** This class represents a ball enclosing some points.
- * @param <S> Space type.
* @param <P> Point type.
* @see Space
* @see Point
diff --git a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/SupportBallGenerator.java b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/SupportBallGenerator.java
index 6d0e603..ad2631a 100644
--- a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/SupportBallGenerator.java
+++ b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/SupportBallGenerator.java
@@ -25,7 +25,6 @@ import org.apache.commons.geometry.core.Point;
* This generator is used in the {@link WelzlEncloser Emo Welzl} algorithm
* and its derivatives.
* </p>
- * @param <S> Space type.
* @param <P> Point type.
* @see EnclosingBall
*/
diff --git a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/WelzlEncloser.java b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/WelzlEncloser.java
index f825ade..4ec5ad5 100644
--- a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/WelzlEncloser.java
+++ b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/WelzlEncloser.java
@@ -34,7 +34,6 @@ import org.apache.commons.geometry.core.Point;
* Efficient Computation of Smallest Enclosing Balls in Three Dimensions</a> by Linus Källberg
* to avoid performing local copies of data have been included.
* </p>
- * @param <S> Space type.
* @param <P> Point type.
*/
public class WelzlEncloser<P extends Point<P>> implements Encloser<P> {
diff --git a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/threed/enclosing/package-info.java
similarity index 64%
copy from commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java
copy to commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/threed/enclosing/package-info.java
index 7fd1f18..3c6d277 100644
--- a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java
+++ b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/threed/enclosing/package-info.java
@@ -14,21 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.geometry.enclosing;
-
-import org.apache.commons.geometry.core.Point;
-
-/** Interface for algorithms computing enclosing balls.
- * @param <S> Space type.
- * @param <P> Point type.
- * @see EnclosingBall
+/**
+ *
+ * <p>
+ * This package provides classes related to the smallest enclosing ball problem in three dimensions.
+ * </p>
+ *
*/
-public interface Encloser<P extends Point<P>> {
-
- /** Find a ball enclosing a list of points.
- * @param points points to enclose
- * @return enclosing ball
- */
- EnclosingBall<P> enclose(Iterable<P> points);
-
-}
+package org.apache.commons.geometry.euclidean.threed.enclosing;
diff --git a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/twod/enclosing/package-info.java
similarity index 64%
copy from commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java
copy to commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/twod/enclosing/package-info.java
index 7fd1f18..6e58960 100644
--- a/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/enclosing/Encloser.java
+++ b/commons-geometry-enclosing/src/main/java/org/apache/commons/geometry/euclidean/twod/enclosing/package-info.java
@@ -14,21 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.geometry.enclosing;
-
-import org.apache.commons.geometry.core.Point;
-
-/** Interface for algorithms computing enclosing balls.
- * @param <S> Space type.
- * @param <P> Point type.
- * @see EnclosingBall
+/**
+ *
+ * <p>
+ * This package provides classes related to the smallest enclosing ball problem in two dimensions.
+ * </p>
+ *
*/
-public interface Encloser<P extends Point<P>> {
-
- /** Find a ball enclosing a list of points.
- * @param points points to enclose
- * @return enclosing ball
- */
- EnclosingBall<P> enclose(Iterable<P> points);
-
-}
+package org.apache.commons.geometry.euclidean.twod.enclosing;
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Plane.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Plane.java
index 23fc6cd..639b4ae 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Plane.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Plane.java
@@ -275,7 +275,7 @@ public class Plane implements Hyperplane<Point3D>, Embedding<Point3D, Point2D> {
public boolean isSimilarTo(final Plane plane) {
final double angle = w.angle(plane.w);
return ((angle < 1.0e-10) && (Math.abs(originOffset - plane.originOffset) < tolerance)) ||
- ((angle > (Math.PI - 1.0e-10)) && (Math.abs(originOffset + plane.originOffset) < tolerance));
+ (((angle + 1.0e-10) > Math.PI) && (Math.abs(originOffset + plane.originOffset) < tolerance));
}
/** Rotate the plane around the specified point.
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/PolyhedronsSet.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/PolyhedronsSet.java
index 114eb51..5c283ac 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/PolyhedronsSet.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/PolyhedronsSet.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.geometry.euclidean.threed;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -204,7 +205,7 @@ public class PolyhedronsSet extends AbstractRegion<Point3D, Point2D> {
if (!found) {
final Point3D start = vertices.get(vA);
final Point3D end = vertices.get(vB);
- throw new IllegalArgumentException("Edge joining points " + start + " and " + end + " is connected to one facet only");
+ throw new IllegalArgumentException(MessageFormat.format("Edge joining points {0} and {1} is connected to one facet only", start, end));
}
}
}
@@ -312,7 +313,7 @@ public class PolyhedronsSet extends AbstractRegion<Point3D, Point2D> {
if (successors[v][l] == successors[v][k]) {
final Point3D start = vertices.get(v);
final Point3D end = vertices.get(successors[v][k]);
- throw new IllegalArgumentException("Facet orientation mismatch around edge joining points " + start + " and " + end);
+ throw new IllegalArgumentException(MessageFormat.format("Facet orientation mismatch around edge joining points {0} and {1}", start, end));
}
}
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AklToussaintHeuristic.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AklToussaintHeuristic.java
index cd72e68..d8b3f05 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AklToussaintHeuristic.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/euclidean/twod/hull/AklToussaintHeuristic.java
@@ -121,30 +121,30 @@ public final class AklToussaintHeuristic {
private static boolean insideQuadrilateral(final Point2D point,
final List<Point2D> quadrilateralPoints) {
- Vector2D p0 = point.asVector();
- Vector2D p1 = quadrilateralPoints.get(0).asVector();
- Vector2D p2 = quadrilateralPoints.get(1).asVector();
+ Vector2D v0 = point.asVector();
+ Vector2D v1 = quadrilateralPoints.get(0).asVector();
+ Vector2D v2 = quadrilateralPoints.get(1).asVector();
- if (point.equals(p1) || point.equals(p2)) {
+ if (v0.equals(v1) || v0.equals(v2)) {
return true;
}
// get the location of the point relative to the first two vertices
- final double last = p0.crossProduct(p1, p2);
+ final double last = v0.crossProduct(v1, v2);
final int size = quadrilateralPoints.size();
// loop through the rest of the vertices
for (int i = 1; i < size; i++) {
- p1 = p2;
- p2 = quadrilateralPoints.get((i + 1) == size ? 0 : i + 1).asVector();
+ v1 = v2;
+ v2 = quadrilateralPoints.get((i + 1) == size ? 0 : i + 1).asVector();
- if (p0.equals(p1) || p0.equals(p2)) {
+ if (v0.equals(v1) || v0.equals(v2)) {
return true;
}
// do side of line test: multiply the last location with this location
// if they are the same sign then the operation will yield a positive result
// -x * -y = +xy, x * y = +xy, -x * y = -xy, x * -y = -xy
- if (last * p0.crossProduct(p1, p2) < 0) {
+ if (last * v0.crossProduct(v1, v2) < 0) {
return false;
}
}
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHull.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHull.java
index 3560c07..118a640 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHull.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHull.java
@@ -24,7 +24,6 @@ import org.apache.commons.geometry.core.partitioning.Region;
/**
* This class represents a convex hull.
*
- * @param <S> Space type.
* @param <P> Point type.
*/
public interface ConvexHull<P extends Point<P>> extends Serializable {
diff --git a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHullGenerator.java b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHullGenerator.java
index 278d792..f3c013a 100644
--- a/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHullGenerator.java
+++ b/commons-geometry-hull/src/main/java/org/apache/commons/geometry/hull/ConvexHullGenerator.java
@@ -23,7 +23,6 @@ import org.apache.commons.geometry.core.Point;
/**
* Interface for convex hull generators.
*
- * @param <S> Type of the {@link Space}
* @param <P> Type of the {@link Point}
*
* @see <a href="http://en.wikipedia.org/wiki/Convex_hull">Convex Hull (Wikipedia)</a>
[commons-geometry] 05/09: GEOEMTRY-3: removing RealFunction
interfaces from public API and renaming to DoubleFunction?N
Posted by er...@apache.org.
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-geometry.git
commit 5cce17145097bb598b6db546437366d7b2474e53
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Tue Jul 10 21:56:05 2018 -0400
GEOEMTRY-3: removing RealFunction interfaces from public API and renaming to DoubleFunction?N
---
.../DoubleFunction1N.java} | 6 +++---
.../DoubleFunction2N.java} | 6 +++---
.../DoubleFunction3N.java} | 6 +++---
.../{util => }/internal/SimpleTupleFormat.java | 16 ++++++---------
.../core/{util => }/internal/package-info.java | 2 +-
.../commons/geometry/core/util/package-info.java | 23 ----------------------
.../{util => }/internal/SimpleTupleFormatTest.java | 11 ++++-------
.../geometry/euclidean/oned/Cartesian1D.java | 4 ++--
.../commons/geometry/euclidean/oned/Point1D.java | 15 ++++----------
.../commons/geometry/euclidean/oned/Vector1D.java | 15 ++++----------
.../geometry/euclidean/threed/Cartesian3D.java | 4 ++--
.../commons/geometry/euclidean/threed/Point3D.java | 15 ++++----------
.../geometry/euclidean/threed/Vector3D.java | 15 ++++----------
.../geometry/euclidean/twod/Cartesian2D.java | 4 ++--
.../commons/geometry/euclidean/twod/Point2D.java | 15 ++++----------
.../commons/geometry/euclidean/twod/Vector2D.java | 15 ++++----------
.../geometry/euclidean/oned/Point1DTest.java | 11 -----------
.../geometry/euclidean/oned/Vector1DTest.java | 11 -----------
.../geometry/euclidean/threed/Point3DTest.java | 11 -----------
.../geometry/euclidean/threed/Vector3DTest.java | 11 -----------
.../geometry/euclidean/twod/Point2DTest.java | 11 -----------
.../geometry/euclidean/twod/Vector2DTest.java | 12 -----------
.../commons/geometry/spherical/oned/S1Point.java | 15 ++++----------
.../commons/geometry/spherical/twod/S2Point.java | 15 ++++----------
.../geometry/spherical/oned/S1PointTest.java | 12 -----------
.../geometry/spherical/twod/S2PointTest.java | 11 -----------
26 files changed, 58 insertions(+), 234 deletions(-)
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction1N.java
similarity index 86%
rename from commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction.java
rename to commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction1N.java
index 1b9acb6..6396bbb 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction1N.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.geometry.core.util;
+package org.apache.commons.geometry.core.internal;
-/** Represents a function that accepts a single real number and returns
+/** Represents a function that accepts a single double value and returns
* a result.
* @param <T> The function return type.
*/
@FunctionalInterface
-public interface RealFunction<T> {
+public interface DoubleFunction1N<T> {
/** Apply the function and return the result.
* @param n the function argument
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction2N.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction2N.java
similarity index 87%
rename from commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction2N.java
rename to commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction2N.java
index 20df7c7..36cbf7a 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction2N.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction2N.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.geometry.core.util;
+package org.apache.commons.geometry.core.internal;
-/** Represents a function that accepts two real numbers and returns
+/** Represents a function that accepts two double values and returns
* a result.
* @param <T> The function return type.
*/
@FunctionalInterface
-public interface RealFunction2N<T> {
+public interface DoubleFunction2N<T> {
/** Apply the function and return the result.
* @param n1 first function argument
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction3N.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction3N.java
similarity index 87%
rename from commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction3N.java
rename to commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction3N.java
index 08e22e2..086f003 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/RealFunction3N.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/DoubleFunction3N.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.geometry.core.util;
+package org.apache.commons.geometry.core.internal;
-/** Represents a function that accepts three real numbers and returns
+/** Represents a function that accepts three double values and returns
* a result.
* @param <T> The function return type.
*/
@FunctionalInterface
-public interface RealFunction3N<T> {
+public interface DoubleFunction3N<T> {
/** Apply the function and return the result.
* @param n1 first function argument
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/internal/SimpleTupleFormat.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/SimpleTupleFormat.java
similarity index 96%
rename from commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/internal/SimpleTupleFormat.java
rename to commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/SimpleTupleFormat.java
index 84641cb..041380f 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/internal/SimpleTupleFormat.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/SimpleTupleFormat.java
@@ -14,14 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.geometry.core.util.internal;
+package org.apache.commons.geometry.core.internal;
import java.text.ParsePosition;
-import org.apache.commons.geometry.core.util.RealFunction;
-import org.apache.commons.geometry.core.util.RealFunction2N;
-import org.apache.commons.geometry.core.util.RealFunction3N;
-
/** Class for performing simple formatting and parsing of real number tuples.
*/
public class SimpleTupleFormat {
@@ -172,7 +168,7 @@ public class SimpleTupleFormat {
* @return object returned by {@code fn}
* @throws IllegalArgumentException if the input string format is invalid
*/
- public <T> T parse(String str, RealFunction<T> factory) throws IllegalArgumentException {
+ public <T> T parse(String str, DoubleFunction1N<T> fn) throws IllegalArgumentException {
final ParsePosition pos = new ParsePosition(0);
readPrefix(str, pos);
@@ -180,7 +176,7 @@ public class SimpleTupleFormat {
readSuffix(str, pos);
endParse(str, pos);
- return factory.apply(v);
+ return fn.apply(v);
}
/** Parse the given string as a 2-tuple and passes the tuple values to the
@@ -191,7 +187,7 @@ public class SimpleTupleFormat {
* @return object returned by {@code fn}
* @throws IllegalArgumentException if the input string format is invalid
*/
- public <T> T parse(String str, RealFunction2N<T> factory) throws IllegalArgumentException {
+ public <T> T parse(String str, DoubleFunction2N<T> fn) throws IllegalArgumentException {
final ParsePosition pos = new ParsePosition(0);
readPrefix(str, pos);
@@ -200,7 +196,7 @@ public class SimpleTupleFormat {
readSuffix(str, pos);
endParse(str, pos);
- return factory.apply(v1, v2);
+ return fn.apply(v1, v2);
}
/** Parse the given string as a 3-tuple and passes the parsed values to the
@@ -211,7 +207,7 @@ public class SimpleTupleFormat {
* @return object returned by {@code fn}
* @throws IllegalArgumentException if the input string format is invalid
*/
- public <T> T parse(String str, RealFunction3N<T> fn) throws IllegalArgumentException {
+ public <T> T parse(String str, DoubleFunction3N<T> fn) throws IllegalArgumentException {
ParsePosition pos = new ParsePosition(0);
readPrefix(str, pos);
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/internal/package-info.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/package-info.java
similarity index 94%
rename from commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/internal/package-info.java
rename to commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/package-info.java
index 547fc6b..1e4be0a 100644
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/internal/package-info.java
+++ b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/internal/package-info.java
@@ -21,4 +21,4 @@
* No guarantees are made for the stability of the contained APIs.
* </p>
*/
-package org.apache.commons.geometry.core.util.internal;
+package org.apache.commons.geometry.core.internal;
diff --git a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/package-info.java b/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/package-info.java
deleted file mode 100644
index 526cca0..0000000
--- a/commons-geometry-core/src/main/java/org/apache/commons/geometry/core/util/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *
- * <p>
- * This package contains common geometry utilities.
- * </p>
- */
-package org.apache.commons.geometry.core.util;
diff --git a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/util/internal/SimpleTupleFormatTest.java b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/SimpleTupleFormatTest.java
similarity index 97%
rename from commons-geometry-core/src/test/java/org/apache/commons/geometry/core/util/internal/SimpleTupleFormatTest.java
rename to commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/SimpleTupleFormatTest.java
index a3e554b..6f1467d 100644
--- a/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/util/internal/SimpleTupleFormatTest.java
+++ b/commons-geometry-core/src/test/java/org/apache/commons/geometry/core/internal/SimpleTupleFormatTest.java
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.geometry.core.util.internal;
+package org.apache.commons.geometry.core.internal;
-import org.apache.commons.geometry.core.util.RealFunction;
-import org.apache.commons.geometry.core.util.RealFunction2N;
-import org.apache.commons.geometry.core.util.RealFunction3N;
import org.junit.Assert;
import org.junit.Test;
@@ -29,7 +26,7 @@ public class SimpleTupleFormatTest {
private static final String OPEN_PAREN = "(";
private static final String CLOSE_PAREN = ")";
- private static RealFunction<Stub1D> FACTORY_1D = new RealFunction<Stub1D>() {
+ private static DoubleFunction1N<Stub1D> FACTORY_1D = new DoubleFunction1N<Stub1D>() {
@Override
public Stub1D apply(double v) {
@@ -40,7 +37,7 @@ public class SimpleTupleFormatTest {
}
};
- private static RealFunction2N<Stub2D> FACTORY_2D = new RealFunction2N<Stub2D>() {
+ private static DoubleFunction2N<Stub2D> FACTORY_2D = new DoubleFunction2N<Stub2D>() {
@Override
public Stub2D apply(double v1, double v2) {
@@ -52,7 +49,7 @@ public class SimpleTupleFormatTest {
}
};
- private static RealFunction3N<Stub3D> FACTORY_3D = new RealFunction3N<Stub3D>() {
+ private static DoubleFunction3N<Stub3D> FACTORY_3D = new DoubleFunction3N<Stub3D>() {
@Override
public Stub3D apply(double v1, double v2, double v3) {
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Cartesian1D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Cartesian1D.java
index 19ea67f..047a0ff 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Cartesian1D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Cartesian1D.java
@@ -19,7 +19,7 @@ package org.apache.commons.geometry.euclidean.oned;
import java.io.Serializable;
import org.apache.commons.geometry.core.Spatial;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
/** This class represents a Cartesian coordinate value in
* one-dimensional Euclidean space.
@@ -27,7 +27,7 @@ import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
public abstract class Cartesian1D implements Spatial, Serializable {
/** Serializable UID. */
- private static final long serialVersionUID = -1178039568877797126L;
+ private static final long serialVersionUID = 20180710L;
/** Abscissa (coordinate value). */
private final double x;
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java
index 870ac6e..acc12f8 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Point1D.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.geometry.euclidean.oned;
-import org.apache.commons.geometry.core.util.RealFunction;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction1N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.EuclideanPoint;
import org.apache.commons.numbers.arrays.LinearCombination;
@@ -46,10 +46,10 @@ public final class Point1D extends Cartesian1D implements EuclideanPoint<Point1D
new Point1D(Double.NEGATIVE_INFINITY);
/** Serializable UID. */
- private static final long serialVersionUID = 7556674948671647925L;
+ private static final long serialVersionUID = 20180710L;
/** Factory for delegating instance creation. */
- private static RealFunction<Point1D> FACTORY = new RealFunction<Point1D>() {
+ private static DoubleFunction1N<Point1D> FACTORY = new DoubleFunction1N<Point1D>() {
/** {@inheritDoc} */
@Override
@@ -171,13 +171,6 @@ public final class Point1D extends Cartesian1D implements EuclideanPoint<Point1D
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
- /** Returns a factory object that can be used to created new point instances.
- * @return point factory instance
- */
- public static RealFunction<Point1D> getFactory() {
- return FACTORY;
- }
-
/** Returns a point with coordinates calculated by multiplying each input coordinate
* with its corresponding factor and adding the results.
*
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Vector1D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Vector1D.java
index d9fd0c2..1a915f6 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Vector1D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/oned/Vector1D.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.geometry.euclidean.oned;
-import org.apache.commons.geometry.core.util.RealFunction;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction1N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.EuclideanVector;
import org.apache.commons.numbers.arrays.LinearCombination;
@@ -46,10 +46,10 @@ public final class Vector1D extends Cartesian1D implements EuclideanVector<Point
new Vector1D(Double.NEGATIVE_INFINITY);
/** Serializable UID. */
- private static final long serialVersionUID = 1582116020164328846L;
+ private static final long serialVersionUID = 20180710L;
/** Factory for delegating instance creation. */
- private static RealFunction<Vector1D> FACTORY = new RealFunction<Vector1D>() {
+ private static DoubleFunction1N<Vector1D> FACTORY = new DoubleFunction1N<Vector1D>() {
/** {@inheritDoc} */
@Override
@@ -255,13 +255,6 @@ public final class Vector1D extends Cartesian1D implements EuclideanVector<Point
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
- /** Returns a factory object that can be used to created new vector instances.
- * @return vector factory instance
- */
- public static RealFunction<Vector1D> getFactory() {
- return FACTORY;
- }
-
/** Returns a vector consisting of the linear combination of the inputs.
* <p>
* A linear combination is the sum of all of the inputs multiplied by their
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Cartesian3D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Cartesian3D.java
index 8d680e9..6dbe753 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Cartesian3D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Cartesian3D.java
@@ -20,7 +20,7 @@ package org.apache.commons.geometry.euclidean.threed;
import java.io.Serializable;
import org.apache.commons.geometry.core.Spatial;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
/** This class represents a Cartesian coordinate value in
* three-dimensional Euclidean space.
@@ -28,7 +28,7 @@ import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
public abstract class Cartesian3D implements Spatial, Serializable {
/** Serializable UID. */
- private static final long serialVersionUID = 6249091865814886817L;
+ private static final long serialVersionUID = 20180710L;
/** Abscissa (first coordinate value) */
private final double x;
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Point3D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Point3D.java
index c9841ac..7c2b3f7 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Point3D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Point3D.java
@@ -17,8 +17,8 @@
package org.apache.commons.geometry.euclidean.threed;
-import org.apache.commons.geometry.core.util.RealFunction3N;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction3N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.EuclideanPoint;
import org.apache.commons.numbers.arrays.LinearCombination;
@@ -44,10 +44,10 @@ public final class Point3D extends Cartesian3D implements EuclideanPoint<Point3D
new Point3D(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
/** Serializable version identifier. */
- private static final long serialVersionUID = 1313493323784566947L;
+ private static final long serialVersionUID = 20180710L;
/** Factory for delegating instance creation. */
- private static RealFunction3N<Point3D> FACTORY = new RealFunction3N<Point3D>() {
+ private static DoubleFunction3N<Point3D> FACTORY = new DoubleFunction3N<Point3D>() {
/** {@inheritDoc} */
@Override
@@ -194,13 +194,6 @@ public final class Point3D extends Cartesian3D implements EuclideanPoint<Point3D
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
- /** Returns a factory object that can be used to created new point instances.
- * @return point factory instance
- */
- public static RealFunction3N<Point3D> getFactory() {
- return FACTORY;
- }
-
/** Returns a point with coordinates calculated by multiplying each input coordinate
* with its corresponding factor and adding the results.
*
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java
index 5e9d952..a96dffd 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/threed/Vector3D.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.geometry.euclidean.threed;
-import org.apache.commons.geometry.core.util.RealFunction3N;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction3N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.EuclideanVector;
import org.apache.commons.numbers.arrays.LinearCombination;
@@ -61,13 +61,13 @@ public final class Vector3D extends Cartesian3D implements EuclideanVector<Point
new Vector3D(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
/** Serializable UID */
- private static final long serialVersionUID = 3695385854431542858L;
+ private static final long serialVersionUID = 20180710L;
/** Error message when norms are zero. */
private static final String ZERO_NORM_MSG = "Norm is zero";
/** Factory for delegating instance creation. */
- private static RealFunction3N<Vector3D> FACTORY = new RealFunction3N<Vector3D>() {
+ private static DoubleFunction3N<Vector3D> FACTORY = new DoubleFunction3N<Vector3D>() {
/** {@inheritDoc} */
@Override
@@ -474,13 +474,6 @@ public final class Vector3D extends Cartesian3D implements EuclideanVector<Point
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
- /** Returns a factory object that can be used to created new vector instances.
- * @return vector factory instance
- */
- public static RealFunction3N<Vector3D> getFactory() {
- return FACTORY;
- }
-
/** Returns a vector consisting of the linear combination of the inputs.
* <p>
* A linear combination is the sum of all of the inputs multiplied by their
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Cartesian2D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Cartesian2D.java
index 8ddb6a0..8d35fed 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Cartesian2D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Cartesian2D.java
@@ -20,7 +20,7 @@ package org.apache.commons.geometry.euclidean.twod;
import java.io.Serializable;
import org.apache.commons.geometry.core.Spatial;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
/** This class represents a set of Cartesian coordinates in
* two-dimensional Euclidean space.
@@ -28,7 +28,7 @@ import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
public abstract class Cartesian2D implements Spatial, Serializable {
/** Serializable UID */
- private static final long serialVersionUID = 2918583078965478552L;
+ private static final long serialVersionUID = 20180710L;
/** Abscissa (first coordinate) */
private final double x;
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Point2D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Point2D.java
index 0d2af49..c9fde1f 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Point2D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Point2D.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.geometry.euclidean.twod;
-import org.apache.commons.geometry.core.util.RealFunction2N;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction2N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.EuclideanPoint;
import org.apache.commons.numbers.arrays.LinearCombination;
@@ -43,10 +43,10 @@ public final class Point2D extends Cartesian2D implements EuclideanPoint<Point2D
new Point2D(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
/** Serializable UID. */
- private static final long serialVersionUID = 266938651998679754L;
+ private static final long serialVersionUID = 20180710L;
/** Factory for delegating instance creation. */
- private static RealFunction2N<Point2D> FACTORY = new RealFunction2N<Point2D>() {
+ private static DoubleFunction2N<Point2D> FACTORY = new DoubleFunction2N<Point2D>() {
/** {@inheritDoc} */
@Override
@@ -182,13 +182,6 @@ public final class Point2D extends Cartesian2D implements EuclideanPoint<Point2D
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
- /** Returns a factory object that can be used to created new point instances.
- * @return point factory instance
- */
- public static RealFunction2N<Point2D> getFactory() {
- return FACTORY;
- }
-
/** Returns a point with coordinates calculated by multiplying each input coordinate
* with its corresponding factor and adding the results.
*
diff --git a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java
index 42dc10d..e682b77 100644
--- a/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java
+++ b/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean/twod/Vector2D.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.geometry.euclidean.twod;
-import org.apache.commons.geometry.core.util.RealFunction2N;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction2N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.EuclideanVector;
import org.apache.commons.numbers.arrays.LinearCombination;
@@ -55,13 +55,13 @@ public final class Vector2D extends Cartesian2D implements EuclideanVector<Point
new Vector2D(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
/** Serializable UID */
- private static final long serialVersionUID = 1746839897232305304L;
+ private static final long serialVersionUID = 20180710L;
/** Error message when norms are zero. */
private static final String ZERO_NORM_MSG = "Norm is zero";
/** Factory for delegating instance creation. */
- private static RealFunction2N<Vector2D> FACTORY = new RealFunction2N<Vector2D>() {
+ private static DoubleFunction2N<Vector2D> FACTORY = new DoubleFunction2N<Vector2D>() {
/** {@inheritDoc} */
@Override
@@ -381,13 +381,6 @@ public final class Vector2D extends Cartesian2D implements EuclideanVector<Point
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
- /** Returns a factory object that can be used to created new vector instances.
- * @return vector factory instance
- */
- public static RealFunction2N<Vector2D> getFactory() {
- return FACTORY;
- }
-
/** Returns a vector consisting of the linear combination of the inputs.
* <p>
* A linear combination is the sum of all of the inputs multiplied by their
diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Point1DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Point1DTest.java
index 2ac7379..4b65983 100644
--- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Point1DTest.java
+++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Point1DTest.java
@@ -19,7 +19,6 @@ package org.apache.commons.geometry.euclidean.oned;
import java.util.regex.Pattern;
-import org.apache.commons.geometry.core.util.RealFunction;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
import org.junit.Test;
@@ -229,16 +228,6 @@ public class Point1DTest {
}
@Test
- public void testGetFactory() {
- // act
- RealFunction<Point1D> factory = Point1D.getFactory();
-
- // assert
- checkPoint(factory.apply(1), 1);
- checkPoint(factory.apply(-1), -1);
- }
-
- @Test
public void testVectorCombination() {
// act/assert
checkPoint(Point1D.vectorCombination(2, Point1D.of(3)), 6);
diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java
index 9e81737..15c864f 100644
--- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java
+++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/oned/Vector1DTest.java
@@ -2,7 +2,6 @@ package org.apache.commons.geometry.euclidean.oned;
import java.util.regex.Pattern;
-import org.apache.commons.geometry.core.util.RealFunction;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
import org.junit.Test;
@@ -337,16 +336,6 @@ public class Vector1DTest {
}
@Test
- public void testGetFactory() {
- // act
- RealFunction<Vector1D> factory = Vector1D.getFactory();
-
- // assert
- checkVector(factory.apply(1), 1);
- checkVector(factory.apply(-1), -1);
- }
-
- @Test
public void testLinearCombination() {
// act/assert
checkVector(Vector1D.linearCombination(2, Vector1D.of(3)), 6);
diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Point3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Point3DTest.java
index d2959dc..62218a6 100644
--- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Point3DTest.java
+++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Point3DTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.geometry.euclidean.threed;
import java.util.regex.Pattern;
-import org.apache.commons.geometry.core.util.RealFunction3N;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
import org.junit.Test;
@@ -243,16 +242,6 @@ public class Point3DTest {
}
@Test
- public void testGetFactory() {
- // act
- RealFunction3N<Point3D> factory = Point3D.getFactory();
-
- // assert
- checkPoint(factory.apply(1, 2, 3), 1, 2, 3);
- checkPoint(factory.apply(-1, -2, -3), -1, -2, -3);
- }
-
- @Test
public void testVectorCombination1() {
// arrange
Point3D p1 = Point3D.of(1, 2, 3);
diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java
index 17e6a36..c4017bd 100644
--- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java
+++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/threed/Vector3DTest.java
@@ -20,7 +20,6 @@ package org.apache.commons.geometry.euclidean.threed;
import java.util.regex.Pattern;
import org.apache.commons.geometry.core.Geometry;
-import org.apache.commons.geometry.core.util.RealFunction3N;
import org.apache.commons.numbers.core.Precision;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.simple.RandomSource;
@@ -689,16 +688,6 @@ public class Vector3DTest {
}
@Test
- public void testGetFactory() {
- // act
- RealFunction3N<Vector3D> factory = Vector3D.getFactory();
-
- // assert
- checkVector(factory.apply(1, 2, 3), 1, 2, 3);
- checkVector(factory.apply(-1, -2, -3), -1, -2, -3);
- }
-
- @Test
public void testLinearCombination1() {
// arrange
Vector3D p1 = Vector3D.of(1, 2, 3);
diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Point2DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Point2DTest.java
index d26f002..e6cf422 100644
--- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Point2DTest.java
+++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Point2DTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.geometry.euclidean.twod;
import java.util.regex.Pattern;
-import org.apache.commons.geometry.core.util.RealFunction2N;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
import org.junit.Test;
@@ -220,16 +219,6 @@ public class Point2DTest {
}
@Test
- public void testGetFactory() {
- // act
- RealFunction2N<Point2D> factory = Point2D.getFactory();
-
- // assert
- checkPoint(factory.apply(1, 2), 1, 2);
- checkPoint(factory.apply(-1, -2), -1, -2);
- }
-
- @Test
public void testVectorCombination1() {
// arrange
Point2D p1 = Point2D.of(1, 2);
diff --git a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java
index fa130e8..83d56a1 100644
--- a/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java
+++ b/commons-geometry-euclidean/src/test/java/org/apache/commons/geometry/euclidean/twod/Vector2DTest.java
@@ -3,7 +3,6 @@ package org.apache.commons.geometry.euclidean.twod;
import java.util.regex.Pattern;
import org.apache.commons.geometry.core.Geometry;
-import org.apache.commons.geometry.core.util.RealFunction2N;
import org.apache.commons.numbers.core.Precision;
import org.junit.Assert;
import org.junit.Test;
@@ -483,17 +482,6 @@ public class Vector2DTest {
// act/assert
Vector2D.of(new double[] {0.0 });
}
-
- @Test
- public void testGetFactory() {
- // act
- RealFunction2N<Vector2D> factory = Vector2D.getFactory();
-
- // assert
- checkVector(factory.apply(1, 2), 1, 2);
- checkVector(factory.apply(-1, -2), -1, -2);
- }
-
@Test
public void testLinearCombination1() {
// arrange
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java
index 9dd2d32..915e7a3 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/oned/S1Point.java
@@ -19,8 +19,8 @@ package org.apache.commons.geometry.spherical.oned;
import java.io.Serializable;
import org.apache.commons.geometry.core.Point;
-import org.apache.commons.geometry.core.util.RealFunction;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction1N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.twod.Vector2D;
import org.apache.commons.numbers.angle.PlaneAngleRadians;
@@ -35,10 +35,10 @@ public final class S1Point implements Point<S1Point>, Serializable {
// CHECKSTYLE: resume ConstantName
/** Serializable UID. */
- private static final long serialVersionUID = 20131218L;
+ private static final long serialVersionUID = 20180710L;
/** Factory for delegating instance creation. */
- private static RealFunction<S1Point> FACTORY = new RealFunction<S1Point>() {
+ private static DoubleFunction1N<S1Point> FACTORY = new DoubleFunction1N<S1Point>() {
/** {@inheritDoc} */
@Override
@@ -191,11 +191,4 @@ public final class S1Point implements Point<S1Point>, Serializable {
public static S1Point parse(String str) throws IllegalArgumentException {
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
-
- /** Returns a factory object that can be used to created new point instances.
- * @return point factory instance
- */
- public static RealFunction<S1Point> getFactory() {
- return FACTORY;
- }
}
diff --git a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java
index e5b2fbb..274552b 100644
--- a/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java
+++ b/commons-geometry-spherical/src/main/java/org/apache/commons/geometry/spherical/twod/S2Point.java
@@ -19,8 +19,8 @@ package org.apache.commons.geometry.spherical.twod;
import java.io.Serializable;
import org.apache.commons.geometry.core.Point;
-import org.apache.commons.geometry.core.util.RealFunction2N;
-import org.apache.commons.geometry.core.util.internal.SimpleTupleFormat;
+import org.apache.commons.geometry.core.internal.DoubleFunction2N;
+import org.apache.commons.geometry.core.internal.SimpleTupleFormat;
import org.apache.commons.geometry.euclidean.threed.Vector3D;
/** This class represents a point on the 2-sphere.
@@ -59,10 +59,10 @@ public final class S2Point implements Point<S2Point>, Serializable {
// CHECKSTYLE: resume ConstantName
/** Serializable UID. */
- private static final long serialVersionUID = 20131218L;
+ private static final long serialVersionUID = 20180710L;
/** Factory for delegating instance creation. */
- private static RealFunction2N<S2Point> FACTORY = new RealFunction2N<S2Point>() {
+ private static DoubleFunction2N<S2Point> FACTORY = new DoubleFunction2N<S2Point>() {
/** {@inheritDoc} */
@Override
@@ -265,11 +265,4 @@ public final class S2Point implements Point<S2Point>, Serializable {
public static S2Point parse(String str) throws IllegalArgumentException {
return SimpleTupleFormat.getDefault().parse(str, FACTORY);
}
-
- /** Returns a factory object that can be used to created new point instances.
- * @return point factory instance
- */
- public static RealFunction2N<S2Point> getFactory() {
- return FACTORY;
- }
}
diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/S1PointTest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/S1PointTest.java
index e4f8b08..ba81963 100644
--- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/S1PointTest.java
+++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/oned/S1PointTest.java
@@ -17,7 +17,6 @@
package org.apache.commons.geometry.spherical.oned;
import org.apache.commons.geometry.core.Geometry;
-import org.apache.commons.geometry.core.util.RealFunction;
import org.junit.Assert;
import org.junit.Test;
@@ -80,17 +79,6 @@ public class S1PointTest {
S1Point.parse("abc");
}
- @Test
- public void testGetFactory() {
- // act
- RealFunction<S1Point> factory = S1Point.getFactory();
-
- // assert
- checkPoint(factory.apply(0), 0);
- checkPoint(factory.apply(1), 1);
- checkPoint(factory.apply(Geometry.TWO_PI), 0);
- }
-
private void checkPoint(S1Point p, double alpha) {
Assert.assertEquals(alpha, p.getAlpha(), EPS);
}
diff --git a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/S2PointTest.java b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/S2PointTest.java
index 1a04010..2e15d09 100644
--- a/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/S2PointTest.java
+++ b/commons-geometry-spherical/src/test/java/org/apache/commons/geometry/spherical/twod/S2PointTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.geometry.spherical.twod;
import org.apache.commons.geometry.core.Geometry;
-import org.apache.commons.geometry.core.util.RealFunction2N;
import org.junit.Assert;
import org.junit.Test;
@@ -97,16 +96,6 @@ public class S2PointTest {
S2Point.parse("abc");
}
- @Test
- public void testGetFactory() {
- // act
- RealFunction2N<S2Point> factory = S2Point.getFactory();
-
- // assert
- checkPoint(factory.apply(0, 0), 0, 0);
- checkPoint(factory.apply(1, 2), 1, 2);
- }
-
private void checkPoint(S2Point p, double theta, double phi) {
Assert.assertEquals(theta, p.getTheta(), EPS);
Assert.assertEquals(phi, p.getPhi(), EPS);
[commons-geometry] 09/09: Merge branch 'GEOMETRY-3_GEOMETRY-4__matt'
Posted by er...@apache.org.
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-geometry.git
commit 8273d592baad3558ef05a8a04752a2c3af6e9ffe
Merge: afdd744 9a79891
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Fri Jul 20 12:23:45 2018 +0200
Merge branch 'GEOMETRY-3_GEOMETRY-4__matt'
Closes #6
.../org/apache/commons/geometry/core/Spatial.java | 4 +-
.../geometry/core/internal/DoubleFunction1N.java | 22 +-
.../geometry/core/internal/DoubleFunction2N.java | 24 +-
.../geometry/core/internal/DoubleFunction3N.java | 25 +-
.../geometry/core/internal/SimpleTupleFormat.java | 426 +++++++
.../geometry/core/internal}/package-info.java | 7 +-
.../core/partitioning/AbstractSubHyperplane.java | 2 +-
.../geometry/core/partitioning/BSPTree.java | 9 +-
.../geometry/core/partitioning/Embedding.java | 12 +-
.../geometry/core/partitioning/Hyperplane.java | 4 +-
.../geometry/core/partitioning/package-info.java | 6 +-
.../core/internal/SimpleTupleFormatTest.java | 465 +++++++
.../commons/geometry/enclosing/Encloser.java | 1 -
.../commons/geometry/enclosing/EnclosingBall.java | 2 -
.../geometry/enclosing/SupportBallGenerator.java | 1 -
.../commons/geometry/enclosing/WelzlEncloser.java | 1 -
.../threed/enclosing/SphereGenerator.java | 2 +-
.../euclidean/threed/enclosing}/package-info.java | 5 +-
.../euclidean/twod/enclosing/DiskGenerator.java | 2 +-
.../euclidean/twod/enclosing}/package-info.java | 5 +-
.../geometry/enclosing/WelzlEncloser2DTest.java | 4 +-
.../geometry/enclosing/WelzlEncloser3DTest.java | 58 +-
.../threed/enclosing/SphereGeneratorTest.java | 78 +-
.../twod/enclosing/DiskGeneratorTest.java | 32 +-
.../geometry/euclidean/oned/Cartesian1D.java | 13 +-
.../geometry/euclidean/oned/IntervalsSet.java | 10 +-
.../commons/geometry/euclidean/oned/Point1D.java | 41 +-
.../commons/geometry/euclidean/oned/Vector1D.java | 32 +-
.../geometry/euclidean/threed/Cartesian3D.java | 13 +-
.../commons/geometry/euclidean/threed/Line.java | 2 +-
.../euclidean/threed/OutlineExtractor.java | 4 +-
.../commons/geometry/euclidean/threed/Plane.java | 6 +-
.../commons/geometry/euclidean/threed/Point3D.java | 34 +-
.../geometry/euclidean/threed/PolyhedronsSet.java | 21 +-
.../geometry/euclidean/threed/Rotation.java | 12 +-
.../euclidean/threed/RotationConvention.java | 16 +-
.../commons/geometry/euclidean/threed/SubLine.java | 4 +-
.../geometry/euclidean/threed/Vector3D.java | 42 +-
.../geometry/euclidean/twod/Cartesian2D.java | 13 +-
.../commons/geometry/euclidean/twod/Line.java | 10 +-
.../commons/geometry/euclidean/twod/Point2D.java | 34 +-
.../geometry/euclidean/twod/PolygonsSet.java | 22 +-
.../commons/geometry/euclidean/twod/Segment.java | 2 +-
.../commons/geometry/euclidean/twod/SubLine.java | 4 +-
.../commons/geometry/euclidean/twod/Vector2D.java | 38 +-
.../core/partitioning/CharacterizationTest.java | 104 +-
.../geometry/euclidean/EuclideanTestUtils.java | 8 +-
.../geometry/euclidean/oned/Cartesian1DTest.java | 16 +
.../geometry/euclidean/oned/IntervalsSetTest.java | 68 +-
.../geometry/euclidean/oned/OrientedPointTest.java | 64 +-
.../geometry/euclidean/oned/Point1DTest.java | 35 +-
.../euclidean/oned/SubOrientedPointTest.java | 30 +-
.../geometry/euclidean/oned/Vector1DTest.java | 23 +-
.../geometry/euclidean/threed/Cartesian3DTest.java | 16 +
.../geometry/euclidean/threed/LineTest.java | 64 +-
.../geometry/euclidean/threed/PLYParser.java | 2 +-
.../geometry/euclidean/threed/PlaneTest.java | 68 +-
.../geometry/euclidean/threed/Point3DTest.java | 21 +-
.../euclidean/threed/PolyhedronsSetTest.java | 762 ++++++------
.../geometry/euclidean/threed/RotationTest.java | 118 +-
.../geometry/euclidean/threed/SubLineTest.java | 58 +-
.../geometry/euclidean/threed/Vector3DTest.java | 22 +-
.../geometry/euclidean/twod/Cartesian2DTest.java | 16 +
.../commons/geometry/euclidean/twod/LineTest.java | 56 +-
.../geometry/euclidean/twod/NestedLoopsTest.java | 10 +-
.../geometry/euclidean/twod/Point2DTest.java | 21 +-
.../geometry/euclidean/twod/PolygonsSetTest.java | 1312 ++++++++++----------
.../geometry/euclidean/twod/SegmentTest.java | 12 +-
.../geometry/euclidean/twod/SubLineTest.java | 58 +-
.../geometry/euclidean/twod/Vector2DTest.java | 23 +-
.../twod/hull/AbstractConvexHullGenerator2D.java | 2 +-
.../euclidean/twod/hull/AklToussaintHeuristic.java | 18 +-
.../geometry/euclidean/twod/hull/ConvexHull2D.java | 2 +-
.../euclidean/twod/hull/ConvexHullGenerator2D.java | 2 +-
.../euclidean/twod/hull/MonotoneChain.java | 2 +-
.../geometry/euclidean/twod/hull/package-info.java | 2 +-
.../apache/commons/geometry/hull/ConvexHull.java | 1 -
.../commons/geometry/hull/ConvexHullGenerator.java | 1 -
.../hull/ConvexHullGenerator2DAbstractTest.java | 160 +--
.../euclidean/twod/hull/MonotoneChainTest.java | 16 +-
.../geometry/spherical/SphericalCoordinates.java | 4 +-
.../commons/geometry/spherical/oned/ArcsSet.java | 39 +-
.../geometry/spherical/oned/LimitAngle.java | 4 +-
.../commons/geometry/spherical/oned/S1Point.java | 64 +-
.../commons/geometry/spherical}/package-info.java | 6 +-
.../commons/geometry/spherical/twod/Circle.java | 17 +-
.../commons/geometry/spherical/twod/Edge.java | 6 +-
.../geometry/spherical/twod/EdgesBuilder.java | 4 +-
.../spherical/twod/PropertiesComputer.java | 2 +-
.../commons/geometry/spherical/twod/S2Point.java | 129 +-
.../spherical/twod/SphericalPolygonsSet.java | 22 +-
.../spherical/SphericalCoordinatesTest.java | 24 +-
.../geometry/spherical/SphericalTestUtils.java | 4 +-
.../geometry/spherical/oned/ArcsSetTest.java | 130 +-
.../geometry/spherical/oned/LimitAngleTest.java | 2 +-
.../geometry/spherical/oned/S1PointTest.java | 44 +-
.../geometry/spherical/twod/CircleTest.java | 40 +-
.../geometry/spherical/twod/S2PointTest.java | 56 +-
.../spherical/twod/SphericalPolygonsSetTest.java | 108 +-
.../geometry/spherical/twod/SubCircleTest.java | 4 +-
100 files changed, 3378 insertions(+), 2094 deletions(-)
[commons-geometry] 06/09: Merge branch 'master' into geometry-3
Posted by er...@apache.org.
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-geometry.git
commit 666e3ac0dd5c1a37beaf9f8f4b25e49dcdcbe594
Merge: 5cce171 afdd744
Author: Matt Juntunen <ma...@hotmail.com>
AuthorDate: Thu Jul 19 21:47:33 2018 -0400
Merge branch 'master' into geometry-3
README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-core/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-enclosing/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-euclidean/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-hull/README.md | 105 +++++++++++++++++++++++++++++++++++
commons-geometry-spherical/README.md | 105 +++++++++++++++++++++++++++++++++++
pom.xml | 2 +-
7 files changed, 631 insertions(+), 1 deletion(-)