From c70f393f4a16bff440b89c571956f69f15cbb34c Mon Sep 17 00:00:00 2001 From: Luc Maisonobe Date: Thu, 19 May 2011 09:12:48 +0000 Subject: [PATCH] renamed packages oneD, twoD and threeD into oned, twod and threed git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1124619 13f79535-47bb-0310-9956-ffa450edef68 --- findbugs-exclude-filter.xml | 2 +- .../euclidean/{oneD => oned}/Interval.java | 2 +- .../euclidean/{oneD => oned}/IntervalsSet.java | 2 +- .../{oneD => oned}/OrientedPoint.java | 2 +- .../euclidean/{oneD => oned}/Point1D.java | 2 +- .../euclidean/{oneD => oned}/package.html | 0 .../CardanEulerSingularityException.java | 2 +- .../euclidean/{threeD => threed}/Line.java | 8 ++++---- .../NotARotationMatrixException.java | 2 +- .../{threeD => threed}/OutlineExtractor.java | 18 +++++++++--------- .../euclidean/{threeD => threed}/Plane.java | 18 +++++++++--------- .../euclidean/{threeD => threed}/Point3D.java | 2 +- .../{threeD => threed}/PolyhedronsSet.java | 8 ++++---- .../euclidean/{threeD => threed}/Rotation.java | 2 +- .../{threeD => threed}/RotationOrder.java | 2 +- .../euclidean/{threeD => threed}/Vector3D.java | 2 +- .../{threeD => threed}/Vector3DFormat.java | 2 +- .../euclidean/{threeD => threed}/package.html | 0 .../euclidean/{twoD => twod}/Line.java | 12 ++++++------ .../euclidean/{twoD => twod}/NestedLoops.java | 6 +++--- .../euclidean/{twoD => twod}/Point2D.java | 2 +- .../euclidean/{twoD => twod}/PolygonsSet.java | 4 ++-- .../euclidean/{twoD => twod}/Segment.java | 2 +- .../{twoD => twod}/SegmentBuilder.java | 8 ++++---- .../euclidean/{twoD => twod}/package.html | 0 src/site/xdoc/userguide/geometry.xml | 14 +++++++------- .../{oneD => oned}/IntervalsSetTest.java | 8 ++++---- .../FrenchVector3DFormatTest.java | 2 +- .../euclidean/{threeD => threed}/LineTest.java | 6 +++--- .../{threeD => threed}/PlaneTest.java | 12 ++++++------ .../{threeD => threed}/PolyhedronsSetTest.java | 16 ++++++++-------- .../{threeD => threed}/RotationOrderTest.java | 4 ++-- .../{threeD => threed}/RotationTest.java | 12 ++++++------ .../Vector3DFormatAbstractTest.java | 6 +++--- .../{threeD => threed}/Vector3DFormatTest.java | 2 +- .../{threeD => threed}/Vector3DTest.java | 4 ++-- .../euclidean/{twoD => twod}/LineTest.java | 8 ++++---- .../{twoD => twod}/PolygonsSetTest.java | 14 +++++++------- 38 files changed, 109 insertions(+), 109 deletions(-) rename src/main/java/org/apache/commons/math/geometry/euclidean/{oneD => oned}/Interval.java (97%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{oneD => oned}/IntervalsSet.java (99%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{oneD => oned}/OrientedPoint.java (99%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{oneD => oned}/Point1D.java (96%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{oneD => oned}/package.html (100%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/CardanEulerSingularityException.java (96%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Line.java (95%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/NotARotationMatrixException.java (96%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/OutlineExtractor.java (96%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Plane.java (97%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Point3D.java (98%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/PolyhedronsSet.java (98%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Rotation.java (99%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/RotationOrder.java (98%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Vector3D.java (99%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Vector3DFormat.java (99%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/package.html (100%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/Line.java (98%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/NestedLoops.java (97%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/Point2D.java (97%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/PolygonsSet.java (99%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/Segment.java (98%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/SegmentBuilder.java (92%) rename src/main/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/package.html (100%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{oneD => oned}/IntervalsSetTest.java (95%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/FrenchVector3DFormatTest.java (94%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/LineTest.java (94%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/PlaneTest.java (94%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/PolyhedronsSetTest.java (95%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/RotationOrderTest.java (93%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/RotationTest.java (97%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Vector3DFormatAbstractTest.java (98%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Vector3DFormatTest.java (94%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{threeD => threed}/Vector3DTest.java (98%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/LineTest.java (95%) rename src/test/java/org/apache/commons/math/geometry/euclidean/{twoD => twod}/PolygonsSetTest.java (98%) diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml index 63a83ec05..e7c573081 100644 --- a/findbugs-exclude-filter.xml +++ b/findbugs-exclude-filter.xml @@ -65,7 +65,7 @@ - + diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/Interval.java b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Interval.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oneD/Interval.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/oned/Interval.java index b8d8b924c..609d195a3 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/Interval.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Interval.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oneD; +package org.apache.commons.math.geometry.euclidean.oned; /** This class represents a 1D interval. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/IntervalsSet.java b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oneD/IntervalsSet.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java index bf77274cd..e76e9287c 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/IntervalsSet.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oneD; +package org.apache.commons.math.geometry.euclidean.oned; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/OrientedPoint.java b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/OrientedPoint.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oneD/OrientedPoint.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/oned/OrientedPoint.java index 0535c7e55..5ffa056a4 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/OrientedPoint.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/OrientedPoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oneD; +package org.apache.commons.math.geometry.euclidean.oned; import org.apache.commons.math.exception.MathUnsupportedOperationException; import org.apache.commons.math.exception.util.LocalizedFormats; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/Point1D.java b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Point1D.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oneD/Point1D.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/oned/Point1D.java index cb607ac6f..6db1a96b2 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/Point1D.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Point1D.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oneD; +package org.apache.commons.math.geometry.euclidean.oned; import org.apache.commons.math.geometry.partitioning.Point; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oneD/package.html b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/package.html similarity index 100% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oneD/package.html rename to src/main/java/org/apache/commons/math/geometry/euclidean/oned/package.html diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/CardanEulerSingularityException.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/CardanEulerSingularityException.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/CardanEulerSingularityException.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/CardanEulerSingularityException.java index c6498fb65..da32a0769 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/CardanEulerSingularityException.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/CardanEulerSingularityException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import org.apache.commons.math.MathException; import org.apache.commons.math.exception.util.LocalizedFormats; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Line.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Line.java similarity index 95% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Line.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/Line.java index 0604e5286..aecaf0e54 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Line.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Line.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; import org.apache.commons.math.geometry.partitioning.Point; import org.apache.commons.math.geometry.partitioning.SubSpace; import org.apache.commons.math.util.FastMath; @@ -83,7 +83,7 @@ public class Line implements SubSpace { * @param point point to check (must be a {@link Vector3D Vector3D} * instance) * @return abscissa of the point (really a - * {org.apache.commons.math.geometry.euclidean.oneD.Point1D Point1D} instance) + * {org.apache.commons.math.geometry.euclidean.oned.Point1D Point1D} instance) */ public Point toSubSpace(final Point point) { final double x = Vector3D.dotProduct(((Vector3D) point).subtract(zero), direction); @@ -92,7 +92,7 @@ public class Line implements SubSpace { /** Get one point from the line. * @param point desired abscissa for the point (must be a - * {org.apache.commons.math.geometry.euclidean.oneD.Point1D Point1D} instance) + * {org.apache.commons.math.geometry.euclidean.oned.Point1D Point1D} instance) * @return one point belonging to the line, at specified abscissa * (really a {@link Vector3D Vector3D} instance) */ diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/NotARotationMatrixException.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/NotARotationMatrixException.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/NotARotationMatrixException.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/NotARotationMatrixException.java index 2b5737b9f..5a1f9953b 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/NotARotationMatrixException.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/NotARotationMatrixException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import org.apache.commons.math.MathException; import org.apache.commons.math.exception.util.Localizable; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/OutlineExtractor.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/OutlineExtractor.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/OutlineExtractor.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/OutlineExtractor.java index 842945297..bb73e43d4 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/OutlineExtractor.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/OutlineExtractor.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.twoD.Point2D; -import org.apache.commons.math.geometry.euclidean.twoD.PolygonsSet; +import org.apache.commons.math.geometry.euclidean.twod.Point2D; +import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.BSPTreeVisitor; import org.apache.commons.math.geometry.partitioning.Region; @@ -200,16 +200,16 @@ public class OutlineExtractor { final Vector3D current3D = (Vector3D) plane.toSpace(loop[current]); final Point2D cPoint = new Point2D(Vector3D.dotProduct(current3D, u), Vector3D.dotProduct(current3D, v)); - final org.apache.commons.math.geometry.euclidean.twoD.Line line = - new org.apache.commons.math.geometry.euclidean.twoD.Line(pPoint, cPoint); + final org.apache.commons.math.geometry.euclidean.twod.Line line = + new org.apache.commons.math.geometry.euclidean.twod.Line(pPoint, cPoint); SubHyperplane edge = new SubHyperplane(line); if (closed || (previous != 1)) { // the previous point is a real vertex // it defines one bounding point of the edge final double angle = line.getAngle() + 0.5 * FastMath.PI; - final org.apache.commons.math.geometry.euclidean.twoD.Line l = - new org.apache.commons.math.geometry.euclidean.twoD.Line(pPoint, angle); + final org.apache.commons.math.geometry.euclidean.twod.Line l = + new org.apache.commons.math.geometry.euclidean.twod.Line(pPoint, angle); edge = l.split(edge).getPlus(); } @@ -217,8 +217,8 @@ public class OutlineExtractor { // the current point is a real vertex // it defines one bounding point of the edge final double angle = line.getAngle() + 0.5 * FastMath.PI; - final org.apache.commons.math.geometry.euclidean.twoD.Line l = - new org.apache.commons.math.geometry.euclidean.twoD.Line(cPoint, angle); + final org.apache.commons.math.geometry.euclidean.twod.Line l = + new org.apache.commons.math.geometry.euclidean.twod.Line(cPoint, angle); edge = l.split(edge).getMinus(); } diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Plane.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Plane.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Plane.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/Plane.java index eb6c77964..61bbe53de 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Plane.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Plane.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; -import org.apache.commons.math.geometry.euclidean.twoD.Point2D; -import org.apache.commons.math.geometry.euclidean.twoD.PolygonsSet; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; +import org.apache.commons.math.geometry.euclidean.twod.Point2D; +import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.Hyperplane; import org.apache.commons.math.geometry.partitioning.Point; @@ -217,7 +217,7 @@ public class Plane implements Hyperplane { * @param point point of the space (must be a {@link Vector3D * Vector3D} instance) * @return in-plane point (really a {@link - * org.apache.commons.math.geometry.euclidean.twoD.Point2D Point2D} instance) + * org.apache.commons.math.geometry.euclidean.twod.Point2D Point2D} instance) * @see #toSpace */ public Point toSubSpace(final Point point) { @@ -228,7 +228,7 @@ public class Plane implements Hyperplane { /** Transform an in-plane point into a 3D space point. * @param point in-plane point (must be a {@link - * org.apache.commons.math.geometry.euclidean.twoD.Point2D Point2D} instance) + * org.apache.commons.math.geometry.euclidean.twod.Point2D Point2D} instance) * @return 3D space point (really a {@link Vector3D Vector3D} instance) * @see #toSubSpace */ @@ -465,7 +465,7 @@ public class Plane implements Hyperplane { p = q; q = tmp; } - final Hyperplane line2D = new org.apache.commons.math.geometry.euclidean.twoD.Line(p, q); + final Hyperplane line2D = new org.apache.commons.math.geometry.euclidean.twod.Line(p, q); // check the side on the 2D plane return sub.getRemainingRegion().side(line2D); @@ -500,9 +500,9 @@ public class Plane implements Hyperplane { q = tmp; } final SubHyperplane l2DMinus = - new SubHyperplane(new org.apache.commons.math.geometry.euclidean.twoD.Line(p, q)); + new SubHyperplane(new org.apache.commons.math.geometry.euclidean.twod.Line(p, q)); final SubHyperplane l2DPlus = - new SubHyperplane(new org.apache.commons.math.geometry.euclidean.twoD.Line(q, p)); + new SubHyperplane(new org.apache.commons.math.geometry.euclidean.twod.Line(q, p)); final BSPTree splitTree = sub.getRemainingRegion().getTree(false).split(l2DMinus); diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Point3D.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Point3D.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Point3D.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/Point3D.java index 127ae8d9d..acdeb61e7 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Point3D.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Point3D.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import org.apache.commons.math.geometry.partitioning.Point; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/PolyhedronsSet.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSet.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/PolyhedronsSet.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSet.java index a3629397a..33664b655 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/PolyhedronsSet.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSet.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.awt.geom.AffineTransform; import java.util.Arrays; import java.util.Collection; -import org.apache.commons.math.geometry.euclidean.twoD.Point2D; +import org.apache.commons.math.geometry.euclidean.twod.Point2D; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.BSPTreeVisitor; import org.apache.commons.math.geometry.partitioning.Hyperplane; @@ -340,7 +340,7 @@ public class PolyhedronsSet extends Region { tP00.getX(), tP00.getY()); cachedOriginal = original; - cachedTransform = org.apache.commons.math.geometry.euclidean.twoD.Line.getTransform(at); + cachedTransform = org.apache.commons.math.geometry.euclidean.twod.Line.getTransform(at); } return sub.applyTransform(cachedTransform); @@ -400,7 +400,7 @@ public class PolyhedronsSet extends Region { cachedOriginal = original; cachedTransform = - org.apache.commons.math.geometry.euclidean.twoD.Line.getTransform(at); + org.apache.commons.math.geometry.euclidean.twod.Line.getTransform(at); } diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Rotation.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Rotation.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Rotation.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/Rotation.java index 7f4f443c9..8563f4ab6 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Rotation.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Rotation.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.io.Serializable; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/RotationOrder.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrder.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/RotationOrder.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrder.java index 844ddefd5..4fa645139 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/RotationOrder.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; /** * This class is a utility representing a rotation order specification diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3D.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3D.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3D.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3D.java index 5b50c2265..b85e49940 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3D.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3D.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.io.Serializable; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormat.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormat.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java index 2aff0925e..685aeb6e2 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormat.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.text.FieldPosition; import java.text.NumberFormat; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threeD/package.html b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/package.html similarity index 100% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threeD/package.html rename to src/main/java/org/apache/commons/math/geometry/euclidean/threed/package.html diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Line.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Line.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Line.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/twod/Line.java index 5e8754e10..c2c500373 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Line.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Line.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; import java.awt.geom.AffineTransform; import org.apache.commons.math.exception.MathIllegalArgumentException; import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.euclidean.oneD.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oneD.OrientedPoint; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; +import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math.geometry.euclidean.oned.OrientedPoint; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.Hyperplane; import org.apache.commons.math.geometry.partitioning.Point; @@ -180,7 +180,7 @@ public class Line implements Hyperplane { * @param point 2D point (must be a {@link Point2D Point2D} * instance) * @return line point corresponding to the 2D point (really a {@link - * org.apache.commons.math.geometry.euclidean.oneD.Point1D Point1D} instance) + * org.apache.commons.math.geometry.euclidean.oned.Point1D Point1D} instance) * @see #toSpace */ public Point toSubSpace(final Point point) { @@ -190,7 +190,7 @@ public class Line implements Hyperplane { /** Get one point from the line. * @param point desired abscissa for the point (must be a {@link - * org.apache.commons.math.geometry.euclidean.oneD.Point1D Point1D} instance) + * org.apache.commons.math.geometry.euclidean.oned.Point1D Point1D} instance) * @return line point at specified abscissa (really a {@link Point2D * Point2D} instance) */ diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/NestedLoops.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/NestedLoops.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twoD/NestedLoops.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/twod/NestedLoops.java index e9be044f2..687a7da96 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/NestedLoops.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/NestedLoops.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; import java.util.ArrayList; import java.util.Arrays; @@ -22,8 +22,8 @@ import java.util.Iterator; import org.apache.commons.math.exception.MathIllegalArgumentException; import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.euclidean.oneD.OrientedPoint; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; +import org.apache.commons.math.geometry.euclidean.oned.OrientedPoint; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; import org.apache.commons.math.geometry.partitioning.Hyperplane; import org.apache.commons.math.geometry.partitioning.Region; import org.apache.commons.math.geometry.partitioning.SubHyperplane; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Point2D.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Point2D.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Point2D.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/twod/Point2D.java index eb8fa2da9..bf94cedcf 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Point2D.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Point2D.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; import org.apache.commons.math.geometry.partitioning.Point; import org.apache.commons.math.geometry.partitioning.SubSpace; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/PolygonsSet.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSet.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twoD/PolygonsSet.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSet.java index 728a357bb..c8fdee73c 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/PolygonsSet.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSet.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.Hyperplane; import org.apache.commons.math.geometry.partitioning.Region; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Segment.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Segment.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Segment.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/twod/Segment.java index 42e6403bf..a631a2be2 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/Segment.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Segment.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; import org.apache.commons.math.geometry.partitioning.utilities.OrderedTuple; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/SegmentBuilder.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SegmentBuilder.java similarity index 92% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twoD/SegmentBuilder.java rename to src/main/java/org/apache/commons/math/geometry/euclidean/twod/SegmentBuilder.java index bf77c2448..622b3f881 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/SegmentBuilder.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SegmentBuilder.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; import java.util.List; -import org.apache.commons.math.geometry.euclidean.oneD.Interval; -import org.apache.commons.math.geometry.euclidean.oneD.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; +import org.apache.commons.math.geometry.euclidean.oned.Interval; +import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.BSPTreeVisitor; import org.apache.commons.math.geometry.partitioning.Region.BoundaryAttribute; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twoD/package.html b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/package.html similarity index 100% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twoD/package.html rename to src/main/java/org/apache/commons/math/geometry/euclidean/twod/package.html diff --git a/src/site/xdoc/userguide/geometry.xml b/src/site/xdoc/userguide/geometry.xml index cf0c6038e..d1b041edf 100644 --- a/src/site/xdoc/userguide/geometry.xml +++ b/src/site/xdoc/userguide/geometry.xml @@ -36,8 +36,8 @@

- - Interval and + + Interval and IntervalsSet represent one dimensional regions. All classical set operations are available for intervals sets: union, intersection, symmetric difference (exclusive or), difference, complement, as well as region predicates (point inside/outside/on boundary, emptiness, other region contained). @@ -46,7 +46,7 @@ representation.

- + PolygonsSet represent two dimensional regions. All classical set operations are available for polygons sets: union, intersection, symmetric difference (exclusive or), difference, complement, as well as region predicates (point inside/outside/on boundary, emptiness, other region contained). @@ -55,7 +55,7 @@ or from a boundary representation.

- + PolyhedronsSet represent three dimensional regions. All classical set operations are available for polyhedrons sets: union, intersection, symmetric difference (exclusive or), difference, complement, as well as region predicates (point inside/outside/on boundary, emptiness, other region contained). @@ -64,7 +64,7 @@ or from a boundary representation.

- + Vector3D provides a simple vector type. One important feature is that instances of this class are guaranteed to be immutable, this greatly simplifies modelling dynamical systems @@ -86,12 +86,12 @@ is of course also implemented.

- + Vector3DFormat is a specialized format for formatting output or parsing input with text representation of 3D vectors.

- + Rotation represents 3D rotations. Rotation instances are also immutable objects, as Vector3D instances.

diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/oneD/IntervalsSetTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSetTest.java similarity index 95% rename from src/test/java/org/apache/commons/math/geometry/euclidean/oneD/IntervalsSetTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSetTest.java index a68e5944d..1d8c63032 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/oneD/IntervalsSetTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSetTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oneD; +package org.apache.commons.math.geometry.euclidean.oned; import java.util.List; -import org.apache.commons.math.geometry.euclidean.oneD.Interval; -import org.apache.commons.math.geometry.euclidean.oneD.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; +import org.apache.commons.math.geometry.euclidean.oned.Interval; +import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; import org.apache.commons.math.geometry.partitioning.Region; import org.apache.commons.math.util.FastMath; import org.junit.Assert; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/FrenchVector3DFormatTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/FrenchVector3DFormatTest.java similarity index 94% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/FrenchVector3DFormatTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/FrenchVector3DFormatTest.java index 4ee5033f0..538090319 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/FrenchVector3DFormatTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/FrenchVector3DFormatTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.util.Locale; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/LineTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/LineTest.java similarity index 94% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/LineTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/LineTest.java index 2add00d03..3162045ba 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/LineTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/LineTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.threeD.Line; -import org.apache.commons.math.geometry.euclidean.threeD.Vector3D; +import org.apache.commons.math.geometry.euclidean.threed.Line; +import org.apache.commons.math.geometry.euclidean.threed.Vector3D; import org.apache.commons.math.util.FastMath; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/PlaneTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PlaneTest.java similarity index 94% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/PlaneTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/PlaneTest.java index b1339d5c2..3b4d35d06 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/PlaneTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PlaneTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.threeD.Line; -import org.apache.commons.math.geometry.euclidean.threeD.Plane; -import org.apache.commons.math.geometry.euclidean.threeD.Point3D; -import org.apache.commons.math.geometry.euclidean.threeD.Rotation; -import org.apache.commons.math.geometry.euclidean.threeD.Vector3D; +import org.apache.commons.math.geometry.euclidean.threed.Line; +import org.apache.commons.math.geometry.euclidean.threed.Plane; +import org.apache.commons.math.geometry.euclidean.threed.Point3D; +import org.apache.commons.math.geometry.euclidean.threed.Rotation; +import org.apache.commons.math.geometry.euclidean.threed.Vector3D; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/PolyhedronsSetTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSetTest.java similarity index 95% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/PolyhedronsSetTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSetTest.java index fa284189e..1197b7d90 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/PolyhedronsSetTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSetTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.util.Arrays; -import org.apache.commons.math.geometry.euclidean.threeD.Plane; -import org.apache.commons.math.geometry.euclidean.threeD.Point3D; -import org.apache.commons.math.geometry.euclidean.threeD.PolyhedronsSet; -import org.apache.commons.math.geometry.euclidean.threeD.Rotation; -import org.apache.commons.math.geometry.euclidean.threeD.Vector3D; -import org.apache.commons.math.geometry.euclidean.twoD.Point2D; -import org.apache.commons.math.geometry.euclidean.twoD.PolygonsSet; +import org.apache.commons.math.geometry.euclidean.threed.Plane; +import org.apache.commons.math.geometry.euclidean.threed.Point3D; +import org.apache.commons.math.geometry.euclidean.threed.PolyhedronsSet; +import org.apache.commons.math.geometry.euclidean.threed.Rotation; +import org.apache.commons.math.geometry.euclidean.threed.Vector3D; +import org.apache.commons.math.geometry.euclidean.twod.Point2D; +import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.BSPTreeVisitor; import org.apache.commons.math.geometry.partitioning.Hyperplane; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/RotationOrderTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrderTest.java similarity index 93% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/RotationOrderTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrderTest.java index 6d50e64a9..5e12a55c7 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/RotationOrderTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrderTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.lang.reflect.Field; -import org.apache.commons.math.geometry.euclidean.threeD.RotationOrder; +import org.apache.commons.math.geometry.euclidean.threed.RotationOrder; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/RotationTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationTest.java similarity index 97% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/RotationTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationTest.java index 9904353fc..b8c11c321 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/RotationTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.threeD.CardanEulerSingularityException; -import org.apache.commons.math.geometry.euclidean.threeD.NotARotationMatrixException; -import org.apache.commons.math.geometry.euclidean.threeD.Rotation; -import org.apache.commons.math.geometry.euclidean.threeD.RotationOrder; -import org.apache.commons.math.geometry.euclidean.threeD.Vector3D; +import org.apache.commons.math.geometry.euclidean.threed.CardanEulerSingularityException; +import org.apache.commons.math.geometry.euclidean.threed.NotARotationMatrixException; +import org.apache.commons.math.geometry.euclidean.threed.Rotation; +import org.apache.commons.math.geometry.euclidean.threed.RotationOrder; +import org.apache.commons.math.geometry.euclidean.threed.Vector3D; import org.apache.commons.math.util.FastMath; import org.apache.commons.math.util.MathUtils; import org.junit.Assert; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormatAbstractTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatAbstractTest.java similarity index 98% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormatAbstractTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatAbstractTest.java index 0d72642af..fa0040bee 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormatAbstractTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatAbstractTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.geometry.euclidean.threeD.Vector3D; -import org.apache.commons.math.geometry.euclidean.threeD.Vector3DFormat; +import org.apache.commons.math.geometry.euclidean.threed.Vector3D; +import org.apache.commons.math.geometry.euclidean.threed.Vector3DFormat; import org.junit.Test; import org.junit.Assert; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormatTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatTest.java similarity index 94% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormatTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatTest.java index de7bf7d9d..b4a672b81 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DFormatTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; import java.util.Locale; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DTest.java similarity index 98% rename from src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DTest.java index 12b23e4fb..99b511618 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/threeD/Vector3DTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threeD; +package org.apache.commons.math.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.threeD.Vector3D; +import org.apache.commons.math.geometry.euclidean.threed.Vector3D; import org.apache.commons.math.util.FastMath; import org.apache.commons.math.exception.MathArithmeticException; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/twoD/LineTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/twod/LineTest.java similarity index 95% rename from src/test/java/org/apache/commons/math/geometry/euclidean/twoD/LineTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/twod/LineTest.java index 2030fddac..62cfe97b9 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/twoD/LineTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/twod/LineTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; -import org.apache.commons.math.geometry.euclidean.twoD.Line; -import org.apache.commons.math.geometry.euclidean.twoD.Point2D; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; +import org.apache.commons.math.geometry.euclidean.twod.Line; +import org.apache.commons.math.geometry.euclidean.twod.Point2D; import org.apache.commons.math.geometry.partitioning.Transform; import org.apache.commons.math.util.FastMath; import org.junit.Assert; diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/twoD/PolygonsSetTest.java b/src/test/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSetTest.java similarity index 98% rename from src/test/java/org/apache/commons/math/geometry/euclidean/twoD/PolygonsSetTest.java rename to src/test/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSetTest.java index 16706178e..df2c704da 100644 --- a/src/test/java/org/apache/commons/math/geometry/euclidean/twoD/PolygonsSetTest.java +++ b/src/test/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSetTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twoD; +package org.apache.commons.math.geometry.euclidean.twod; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.geometry.euclidean.oneD.Interval; -import org.apache.commons.math.geometry.euclidean.oneD.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oneD.Point1D; -import org.apache.commons.math.geometry.euclidean.twoD.Line; -import org.apache.commons.math.geometry.euclidean.twoD.Point2D; -import org.apache.commons.math.geometry.euclidean.twoD.PolygonsSet; +import org.apache.commons.math.geometry.euclidean.oned.Interval; +import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math.geometry.euclidean.oned.Point1D; +import org.apache.commons.math.geometry.euclidean.twod.Line; +import org.apache.commons.math.geometry.euclidean.twod.Point2D; +import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet; import org.apache.commons.math.geometry.partitioning.BSPTree; import org.apache.commons.math.geometry.partitioning.Region; import org.apache.commons.math.geometry.partitioning.SubHyperplane;