[math] Add contains(Shape2D)

Signed-off-by: Stéphane Galland <galland@arakhne.org>

core/math/src/main/java/org/arakhne/afc/math/geometry/d2/Shape2D.java

@@ -132,6 +132,20 @@ default boolean equalsToPathIterator(PathIterator2D<?> pathIterator) {
     @Pure
     boolean contains(Point2D<?, ?> point);
 
+    /** Replies if this shape is inside the given shape.
+     *
+     * <p>You must use the containing functions with a specific parameter type in place of
+     * this general function. Indeed, the implementation of this function is unefficient due
+     * to the tests against the types of the given shape, and the cast operators.
+     *
+     * @param shape the shape to compare to.
+     * @return <code>true</code> if the given shape is inside this shape;
+     * <code>false</code> otherwise.
+     */
+    @Pure
+    @Unefficient
+    boolean contains(Shape2D<?, ?, ?, ?, ?, ?> shape);
+
     /** Replies the point on the shape that is closest to the given point.
      *
      * @param point the point.

core/math/src/main/java/org/arakhne/afc/math/geometry/d2/afp/Circle2afp.java

@@ -376,7 +376,7 @@ default boolean contains(double x, double y) {
 	}
 
 	@Override
-	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, B> rectangle) {
+	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, ?> rectangle) {
 		assert rectangle != null : "Rectangle must be not null"; //$NON-NLS-1$
 		return containsCircleRectangle(getX(), getY(), getRadius(),
 				rectangle.getMinX(), rectangle.getMinY(), rectangle.getMaxX(), rectangle.getMaxY());

core/math/src/main/java/org/arakhne/afc/math/geometry/d2/afp/Ellipse2afp.java

@@ -699,7 +699,7 @@ default boolean contains(double x, double y) {
 	}
 
 	@Override
-	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, B> rectangle) {
+	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, ?> rectangle) {
 		assert rectangle != null : "Rectangle must be not null"; //$NON-NLS-1$
 		return containsEllipseRectangle(
 				getMinX(), getMinY(), getWidth(), getHeight(),

core/math/src/main/java/org/arakhne/afc/math/geometry/d2/afp/GeomFactory2afp.java

@@ -22,8 +22,10 @@
 
 import org.arakhne.afc.math.geometry.PathWindingRule;
 import org.arakhne.afc.math.geometry.d2.GeomFactory;
+import org.arakhne.afc.math.geometry.d2.PathIterator2D;
 import org.arakhne.afc.math.geometry.d2.Point2D;
 import org.arakhne.afc.math.geometry.d2.Vector2D;
+import org.arakhne.afc.math.geometry.d2.ai.PathIterator2ai;
 
 /** Factory of geometrical elements.
  *
@@ -38,131 +40,146 @@
  * @since 13.0
  */
 public interface GeomFactory2afp<E extends PathElement2afp, P extends Point2D<? super P, ? super V>,
-		V extends Vector2D<? super V, ? super P>, B extends Rectangle2afp<?, ?, E, P, V, B>>
-		extends GeomFactory<V, P> {
-
-	/** Create an empty path with the given winding rule.
-	 *
-	 * @param rule the rule.
-	 * @return the new path.
-	 */
-	Path2afp<?, ?, E, P, V, B> newPath(PathWindingRule rule);
-
-	/** Create an empty multishape.
-	 *
-	 * @return the new multishape.
-	 */
-	MultiShape2afp<?, ?, ?, E, P, V, B> newMultiShape();
-
-	/** Create an empty bounding box.
-	 *
-	 * @return the box.
-	 */
-	B newBox();
-
-	/** Create a bounding box.
-	 *
-	 * @param x the x coordinate of the lower corner.
-	 * @param y the y coordinate of the lower corner.
-	 * @param width the width of the box.
-	 * @param height the height of the box.
-	 * @return the box.
-	 */
-	B newBox(double x, double y, double width, double height);
-
-	/** Create a move-to path element to the given point.
-	 *
-	 * @param x x coordinate of the target point.
-	 * @param y y coordinate of the target point.
-	 * @return the path element.
-	 */
-	E newMovePathElement(double x, double y);
-
-	/** Create a line-to path element to the given point.
-	 *
-	 * @param startX x coordinate of the start point.
-	 * @param startY y coordinate of the start point.
-	 * @param targetX x coordinate of the target point.
-	 * @param targetY y coordinate of the target point.
-	 * @return the path element.
-	 */
-	E newLinePathElement(double startX, double startY, double targetX, double targetY);
-
-	/** Create a close path element.
-	 *
-	 * @param lastPointX x coordinate of the last point on the path
-	 * @param lastPointy y coordinate of the last point on the path
-	 * @param firstPointX x coordinate of the first point on the path.
-	 * @param firstPointY y coordinate of the first point on the path.
-	 * @return the path element.
-	 */
-	E newClosePathElement(double lastPointX, double lastPointy, double firstPointX, double firstPointY);
-
-	/** Create a quadratic curve path element to the given point through the given control point.
-	 *
-	 * @param startX x coordinate of the start point.
-	 * @param startY y coordinate of the start point.
-	 * @param controlX x coordinate of the control point.
-	 * @param controlY y coordinate of the control  point.
-	 * @param targetX x coordinate of the target point.
-	 * @param targetY y coordinate of the target point.
-	 * @return the path element.
-	 */
-	E newCurvePathElement(double startX, double startY, double controlX, double controlY, double targetX, double targetY);
-
-	/** Create a curve path element to the given point through the two given control points.
-	 *
-	 * @param startX x coordinate of the start point.
-	 * @param startY y coordinate of the start point.
-	 * @param controlX1 x coordinate of the control point.
-	 * @param controlY1 y coordinate of the control  point.
-	 * @param controlX2 x coordinate of the control point.
-	 * @param controlY2 y coordinate of the control  point.
-	 * @param targetX x coordinate of the target point.
-	 * @param targetY y coordinate of the target point.
-	 * @return the path element.
-	 */
-	E newCurvePathElement(double startX, double startY, double controlX1, double controlY1,
-			double controlX2, double controlY2, double targetX, double targetY);
-
-	/** Create an arc-to path element to the given point by following an ellipse arc.
-	 *
-	 * @param startX x coordinate of the start point.
-	 * @param startY y coordinate of the start point.
-	 * @param targetX x coordinate of the target point.
-	 * @param targetY y coordinate of the target point.
-	 * @param radiusX the X radius of the tilted ellipse.
-	 * @param radiusY the Y radius of the tilted ellipse.
-	 * @param xAxisRotation the angle of tilt of the ellipse.
-	 * @param largeArcFlag <code>true</code> iff the path will sweep the long way around the ellipse.
-	 * @param sweepFlag <code>true</code> iff the path will sweep clockwise around the ellipse.
-	 * @return the path element.
-	 */
-	@SuppressWarnings("checkstyle:parameternumber")
-	E newArcPathElement(double startX, double startY, double targetX, double targetY,
-			double radiusX, double radiusY, double xAxisRotation,
-			boolean largeArcFlag, boolean sweepFlag);
-
-	/** Create a triangle.
-	 *
-	 * @param x1 the x coordinate of the first point of the triangle.
-	 * @param y1 the y coordinate of the first point of the triangle.
-	 * @param x2 the x coordinate of the second point of the triangle.
-	 * @param y2 the y coordinate of the second point of the triangle.
-	 * @param x3 the x coordinate of the third point of the triangle.
-	 * @param y3 the y coordinate of the third point of the triangle.
-	 * @return the new triangle.
-	 */
-	Triangle2afp<?, ?, E, P, V, B> newTriangle(double x1, double y1, double x2, double y2, double x3, double y3);
-
-	/** Create a segment.
-	 *
-	 * @param x1 the x coordinate of the first point of the segment.
-	 * @param y1 the y coordinate of the first point of the segment.
-	 * @param x2 the x coordinate of the second point of the segment.
-	 * @param y2 the y coordinate of the second point of the segment.
-	 * @return the new segment.
-	 */
-	Segment2afp<?, ?, E, P, V, B> newSegment(double x1, double y1, double x2, double y2);
+        V extends Vector2D<? super V, ? super P>, B extends Rectangle2afp<?, ?, E, P, V, B>>
+        extends GeomFactory<V, P> {
+
+    /** Create an empty path with the given winding rule.
+     *
+     * @param rule the rule.
+     * @return the new path.
+     */
+    Path2afp<?, ?, E, P, V, B> newPath(PathWindingRule rule);
+
+    /** Create an empty multishape.
+     *
+     * @return the new multishape.
+     */
+    MultiShape2afp<?, ?, ?, E, P, V, B> newMultiShape();
+
+    /** Create an empty bounding box.
+     *
+     * @return the box.
+     */
+    B newBox();
+
+    /** Create a bounding box.
+     *
+     * @param x the x coordinate of the lower corner.
+     * @param y the y coordinate of the lower corner.
+     * @param width the width of the box.
+     * @param height the height of the box.
+     * @return the box.
+     */
+    B newBox(double x, double y, double width, double height);
+
+    /** Create a move-to path element to the given point.
+     *
+     * @param x x coordinate of the target point.
+     * @param y y coordinate of the target point.
+     * @return the path element.
+     */
+    E newMovePathElement(double x, double y);
+
+    /** Create a line-to path element to the given point.
+     *
+     * @param startX x coordinate of the start point.
+     * @param startY y coordinate of the start point.
+     * @param targetX x coordinate of the target point.
+     * @param targetY y coordinate of the target point.
+     * @return the path element.
+     */
+    E newLinePathElement(double startX, double startY, double targetX, double targetY);
+
+    /** Create a close path element.
+     *
+     * @param lastPointX x coordinate of the last point on the path
+     * @param lastPointy y coordinate of the last point on the path
+     * @param firstPointX x coordinate of the first point on the path.
+     * @param firstPointY y coordinate of the first point on the path.
+     * @return the path element.
+     */
+    E newClosePathElement(double lastPointX, double lastPointy, double firstPointX, double firstPointY);
+
+    /** Create a quadratic curve path element to the given point through the given control point.
+     *
+     * @param startX x coordinate of the start point.
+     * @param startY y coordinate of the start point.
+     * @param controlX x coordinate of the control point.
+     * @param controlY y coordinate of the control  point.
+     * @param targetX x coordinate of the target point.
+     * @param targetY y coordinate of the target point.
+     * @return the path element.
+     */
+    E newCurvePathElement(double startX, double startY, double controlX, double controlY, double targetX, double targetY);
+
+    /** Create a curve path element to the given point through the two given control points.
+     *
+     * @param startX x coordinate of the start point.
+     * @param startY y coordinate of the start point.
+     * @param controlX1 x coordinate of the control point.
+     * @param controlY1 y coordinate of the control  point.
+     * @param controlX2 x coordinate of the control point.
+     * @param controlY2 y coordinate of the control  point.
+     * @param targetX x coordinate of the target point.
+     * @param targetY y coordinate of the target point.
+     * @return the path element.
+     */
+    E newCurvePathElement(double startX, double startY, double controlX1, double controlY1,
+            double controlX2, double controlY2, double targetX, double targetY);
+
+    /** Create an arc-to path element to the given point by following an ellipse arc.
+     *
+     * @param startX x coordinate of the start point.
+     * @param startY y coordinate of the start point.
+     * @param targetX x coordinate of the target point.
+     * @param targetY y coordinate of the target point.
+     * @param radiusX the X radius of the tilted ellipse.
+     * @param radiusY the Y radius of the tilted ellipse.
+     * @param xAxisRotation the angle of tilt of the ellipse.
+     * @param largeArcFlag <code>true</code> iff the path will sweep the long way around the ellipse.
+     * @param sweepFlag <code>true</code> iff the path will sweep clockwise around the ellipse.
+     * @return the path element.
+     */
+    @SuppressWarnings("checkstyle:parameternumber")
+    E newArcPathElement(double startX, double startY, double targetX, double targetY,
+            double radiusX, double radiusY, double xAxisRotation,
+            boolean largeArcFlag, boolean sweepFlag);
+
+    /** Create a triangle.
+     *
+     * @param x1 the x coordinate of the first point of the triangle.
+     * @param y1 the y coordinate of the first point of the triangle.
+     * @param x2 the x coordinate of the second point of the triangle.
+     * @param y2 the y coordinate of the second point of the triangle.
+     * @param x3 the x coordinate of the third point of the triangle.
+     * @param y3 the y coordinate of the third point of the triangle.
+     * @return the new triangle.
+     */
+    Triangle2afp<?, ?, E, P, V, B> newTriangle(double x1, double y1, double x2, double y2, double x3, double y3);
+
+    /** Create a segment.
+     *
+     * @param x1 the x coordinate of the first point of the segment.
+     * @param y1 the y coordinate of the first point of the segment.
+     * @param x2 the x coordinate of the second point of the segment.
+     * @param y2 the y coordinate of the second point of the segment.
+     * @return the new segment.
+     */
+    Segment2afp<?, ?, E, P, V, B> newSegment(double x1, double y1, double x2, double y2);
+
+    /** Replies the {@link PathIterator2afp} that is corresponding to the given element.
+     *
+     * <p>If the given element is already a {@link PathIterator2afp}, returns {@code this}.
+     *
+     * @param iterator the iterator.
+     * @return the iterator.
+     */
+    default PathIterator2afp<?> convert(PathIterator2D<?> iterator) {
+        if (iterator instanceof PathIterator2afp) {
+            return (PathIterator2afp<?>) iterator;
+        }
+        assert iterator instanceof PathIterator2ai;
+        return new PathIteratorWrapper(this, (PathIterator2ai<?>) iterator);
+    }
 
 }

core/math/src/main/java/org/arakhne/afc/math/geometry/d2/afp/MultiShape2afp.java

@@ -219,7 +219,7 @@ default boolean contains(double x, double y) {
 
 	@Pure
 	@Override
-	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, B> rectangle) {
+	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, ?> rectangle) {
 		assert rectangle != null : "Rectangle must be not null"; //$NON-NLS-1$
 		if (rectangle.intersects(toBoundingBox())) {
 			for (final CT shape : getBackendDataList()) {

core/math/src/main/java/org/arakhne/afc/math/geometry/d2/afp/OrientedRectangle2afp.java

@@ -1133,7 +1133,7 @@ default boolean contains(double x, double y) {
 
 	@Pure
 	@Override
-	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, B> rectangle) {
+	default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, ?> rectangle) {
 		assert rectangle != null : "Rectangle must be not null"; //$NON-NLS-1$
 		return containsOrientedRectangleRectangle(
 				getCenterX(), getCenterY(),

core/math/src/main/java/org/arakhne/afc/math/geometry/d2/afp/Parallelogram2afp.java

@@ -1582,7 +1582,7 @@ default boolean contains(double x, double y) {
 
     @Pure
     @Override
-    default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, B> rectangle) {
+    default boolean contains(Rectangle2afp<?, ?, ?, ?, ?, ?> rectangle) {
         assert rectangle != null : "Rectangle must be not null"; //$NON-NLS-1$
         return containsParallelogramRectangle(
                 getCenterX(), getCenterY(),