Remove unused code, minor adjustments

skjolber · Nov 29, 2023 · fbc27ad · fbc27ad
1 parent b9a3db4
commit fbc27ad
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 106 deletions.
diff --git a/api/src/main/java/com/github/skjolber/packing/api/StackPlacement.java b/api/src/main/java/com/github/skjolber/packing/api/StackPlacement.java
@@ -13,20 +13,13 @@ public class StackPlacement implements Placement3D, Serializable {
 	protected int y; // depth coordinate
 	protected int z; // height coordinate
 
-	// TODO weight constraint
-	protected int maxSupportedPressure; // i.e.  
-	protected int maxSupportedWeight;
-
-	public StackPlacement(Stackable stackable, StackValue value, int x, int y, int z, int maxSupportedPressure,
-			int maxSupportedWeight) {
+	public StackPlacement(Stackable stackable, StackValue value, int x, int y, int z) {
 		super();
 		this.stackable = stackable;
 		this.value = value;
 		this.x = x;
 		this.y = y;
 		this.z = z;
-		this.maxSupportedPressure = maxSupportedPressure;
-		this.maxSupportedWeight = maxSupportedWeight;
 	}
 
 	public StackPlacement() {
@@ -147,14 +140,6 @@ public void setValue(StackValue value) {
 		this.value = value;
 	}
 
-	public void setMaxSupportedPressure(int maxSupportedPressure) {
-		this.maxSupportedPressure = maxSupportedPressure;
-	}
-
-	public void setMaxSupportedWeight(int maxSupportedWeight) {
-		this.maxSupportedWeight = maxSupportedWeight;
-	}
-
 	public int getWeight() {
 		return stackable.getWeight();
 	}

diff --git a/api/src/main/java/com/github/skjolber/packing/api/ep/Point3D.java b/api/src/main/java/com/github/skjolber/packing/api/ep/Point3D.java
@@ -271,30 +271,6 @@ public boolean intersects(Point3D<?> point) {
 		return !(point.getMaxX() < minX || point.getMinX() > maxX || point.getMaxY() < minY || point.getMinY() > maxY || point.getMaxZ() < minZ || point.getMinZ() > maxZ);
 	}
 
-	public boolean isYZPlaneEdgeZ(int z) {
-		return false;
-	}
-
-	public boolean isYZPlaneEdgeY(int z) {
-		return false;
-	}
-
-	public boolean isXYPlaneEdgeX(int x) {
-		return false;
-	}
-
-	public boolean isXYPlaneEdgeY(int y) {
-		return false;
-	}
-
-	public boolean isXZPlaneEdgeX(int x) {
-		return false;
-	}
-
-	public boolean isXZPlaneEdgeZ(int z) {
-		return false;
-	}
-
 	public boolean shadowedX(int min, int max) {
 		return minX < min && maxX > max;
 	}

diff --git a/...rc/main/java/com/github/skjolber/packing/packer/laff/FastLargestAreaFitFirstPackager.java b/...rc/main/java/com/github/skjolber/packing/packer/laff/FastLargestAreaFitFirstPackager.java
@@ -130,7 +130,7 @@ public DefaultPackResult pack(List<Stackable> stackables, Container targetContai
 			Stack levelStack = new DefaultStack();
 			stack.add(levelStack);
 
-			StackPlacement first = new StackPlacement(stackable, bestFirstStackValue, 0, 0, 0, -1, -1);
+			StackPlacement first = new StackPlacement(stackable, bestFirstStackValue, 0, 0, 0);
 
 			levelStack.add(first);
 
@@ -216,7 +216,7 @@ public DefaultPackResult pack(List<Stackable> stackables, Container targetContai
 
 				Point2D<StackPlacement> point = extremePoints2D.getValue(bestPointIndex);
 
-				StackPlacement stackPlacement = new StackPlacement(remove, bestStackValue, point.getMinX(), point.getMinY(), 0, -1, -1);
+				StackPlacement stackPlacement = new StackPlacement(remove, bestStackValue, point.getMinX(), point.getMinY(), 0);
 				levelStack.add(stackPlacement);
 				extremePoints2D.add(bestPointIndex, stackPlacement);
 

diff --git a/core/src/main/java/com/github/skjolber/packing/packer/laff/LargestAreaFitFirstPackager.java b/core/src/main/java/com/github/skjolber/packing/packer/laff/LargestAreaFitFirstPackager.java
@@ -126,7 +126,7 @@ public DefaultPackResult pack(List<Stackable> stackables, Container targetContai
 			Stack levelStack = new DefaultStack();
 			stack.add(levelStack);
 
-			StackPlacement first = new StackPlacement(stackable, firstStackValue, 0, 0, 0, -1, -1);
+			StackPlacement first = new StackPlacement(stackable, firstStackValue, 0, 0, 0);
 
 			levelStack.add(first);
 
@@ -197,7 +197,7 @@ public DefaultPackResult pack(List<Stackable> stackables, Container targetContai
 
 				Point3D<StackPlacement> point = extremePoints3D.getValue(bestPointIndex);
 
-				StackPlacement stackPlacement = new StackPlacement(remove, bestStackValue, point.getMinX(), point.getMinY(), point.getMinZ(), -1, -1);
+				StackPlacement stackPlacement = new StackPlacement(remove, bestStackValue, point.getMinX(), point.getMinY(), point.getMinZ());
 				levelStack.add(stackPlacement);
 				extremePoints3D.add(bestPointIndex, stackPlacement);
 

diff --git a/core/src/main/java/com/github/skjolber/packing/packer/plain/PlainPackager.java b/core/src/main/java/com/github/skjolber/packing/packer/plain/PlainPackager.java
@@ -166,7 +166,7 @@ public DefaultPackResult pack(List<Stackable> stackables, Container targetContai
 
 			Point3D<StackPlacement> point = extremePoints3D.getValue(bestPointIndex);
 
-			StackPlacement stackPlacement = new StackPlacement(bestStackable, bestStackValue, point.getMinX(), point.getMinY(), point.getMinZ(), -1, -1);
+			StackPlacement stackPlacement = new StackPlacement(bestStackable, bestStackValue, point.getMinX(), point.getMinY(), point.getMinZ());
 			stack.add(stackPlacement);
 			extremePoints3D.add(bestPointIndex, stackPlacement);
 

diff --git a/...-points/src/main/java/com/github/skjolber/packing/ep/points2d/DefaultXSupportPoint2D.java b/...-points/src/main/java/com/github/skjolber/packing/ep/points2d/DefaultXSupportPoint2D.java
@@ -40,10 +40,15 @@ public Point2D<P> clone(int maxX, int maxY) {
 	}
 
 	@Override
-	public Placement2D getXSupport() {
-		return xSupport;
+	public int getSupportedMaxX() {
+		return xSupport.getAbsoluteEndX();
 	}
-
+
+	@Override
+	public int getSupportedMinX() {
+		return xSupport.getAbsoluteX();
+	}
+
 	@Override
 	public SimplePoint2D<P> moveX(int x) {
 		if(x <= xSupport.getAbsoluteEndX()) {

diff --git a/...points/src/main/java/com/github/skjolber/packing/ep/points2d/DefaultXYSupportPoint2D.java b/...points/src/main/java/com/github/skjolber/packing/ep/points2d/DefaultXYSupportPoint2D.java
@@ -69,13 +69,23 @@ public SimplePoint2D<P> clone(int maxX, int maxY) {
 	}
 
 	@Override
-	public Placement2D getYSupport() {
-		return ySupport;
+	public int getSupportedMaxY() {
+		return ySupport.getAbsoluteEndY();
+	}
+
+	@Override
+	public int getSupportedMinY() {
+		return ySupport.getAbsoluteY();
 	}
 
 	@Override
-	public Placement2D getXSupport() {
-		return xSupport;
+	public int getSupportedMaxX() {
+		return xSupport.getAbsoluteEndX();
+	}
+
+	@Override
+	public int getSupportedMinX() {
+		return xSupport.getAbsoluteX();
 	}
 
 	@Override

diff --git a/...-points/src/main/java/com/github/skjolber/packing/ep/points2d/DefaultYSupportPoint2D.java b/...-points/src/main/java/com/github/skjolber/packing/ep/points2d/DefaultYSupportPoint2D.java
@@ -40,8 +40,13 @@ public Point2D<P> clone(int maxX, int maxY) {
 	}
 
 	@Override
-	public Placement2D getYSupport() {
-		return ySupport;
+	public int getSupportedMaxY() {
+		return ySupport.getAbsoluteEndY();
+	}
+
+	@Override
+	public int getSupportedMinY() {
+		return ySupport.getAbsoluteY();
 	}
 
 	@Override

diff --git a/extreme-points/src/main/java/com/github/skjolber/packing/ep/points2d/XSupportPoint2D.java b/extreme-points/src/main/java/com/github/skjolber/packing/ep/points2d/XSupportPoint2D.java
@@ -1,7 +1,5 @@
 package com.github.skjolber.packing.ep.points2d;
 
-import com.github.skjolber.packing.api.Placement2D;
-
 /**
  * 
  * Point supported by a line in the x direction, effectively enforcing a y coordinate.
@@ -10,6 +8,8 @@
 
 public interface XSupportPoint2D {
 
-	Placement2D getXSupport();
+	int getSupportedMinX();
 
+	int getSupportedMaxX();
+
 }
diff --git a/extreme-points/src/main/java/com/github/skjolber/packing/ep/points2d/YSupportPoint2D.java b/extreme-points/src/main/java/com/github/skjolber/packing/ep/points2d/YSupportPoint2D.java
@@ -1,7 +1,5 @@
 package com.github.skjolber.packing.ep.points2d;
 
-import com.github.skjolber.packing.api.Placement2D;
-
 /**
  * 
  * Point supported by a line in the y direction, effectively enforcing an x coordinate.
@@ -10,6 +8,9 @@
 
 public interface YSupportPoint2D {
 
-	Placement2D getYSupport();
+	int getSupportedMinY();
+
+	int getSupportedMaxY();
+
 
 }
diff --git a/...me-points/src/main/java/com/github/skjolber/packing/ep/points3d/CustomIntYComparator.java b/...me-points/src/main/java/com/github/skjolber/packing/ep/points3d/CustomIntYComparator.java
@@ -13,7 +13,6 @@ public class CustomIntYComparator implements IntComparator {
 
 	@Override
 	public int compare(int value1, int value2) {
-
 		Point3D<?> o1 = values.get(value1);
 		Point3D<?> o2 = values.get(value2);
 

diff --git a/...me-points/src/main/java/com/github/skjolber/packing/ep/points3d/CustomIntZComparator.java b/...me-points/src/main/java/com/github/skjolber/packing/ep/points3d/CustomIntZComparator.java
@@ -13,7 +13,6 @@ public class CustomIntZComparator implements IntComparator {
 
 	@Override
 	public int compare(int value1, int value2) {
-
 		Point3D<?> o1 = values.get(value1);
 		Point3D<?> o2 = values.get(value2);
 

diff --git a/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/Default3DPlanePoint3D.java b/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/Default3DPlanePoint3D.java
@@ -131,17 +131,14 @@ public Default3DPlanePoint3D<P> clone(int maxX, int maxY, int maxZ) {
 				yzPlane, xzPlane, xyPlane);
 	}
 
-	@Override
 	public Placement3D getXZPlane() {
 		return xzPlane;
 	}
 
-	@Override
 	public Placement3D getYZPlane() {
 		return yzPlane;
 	}
 
-	@Override
 	public Placement3D getXYPlane() {
 		return xyPlane;
 	}

diff --git a/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXYPlanePoint3D.java b/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXYPlanePoint3D.java
@@ -50,8 +50,7 @@ public boolean isXYPlaneEdgeX(int x) {
 	public boolean isXYPlaneEdgeY(int y) {
 		return xyPlane.getAbsoluteEndY() == y - 1;
 	}
-
-	@Override
+
 	public Placement3D getXYPlane() {
 		return xyPlane;
 	}

diff --git a/...s/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXYPlaneXZPlanePoint3D.java b/...s/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXYPlaneXZPlanePoint3D.java
@@ -93,12 +93,10 @@ public DefaultXYPlaneXZPlanePoint3D<P> clone(int maxX, int maxY, int maxZ) {
 		return new DefaultXYPlaneXZPlanePoint3D<>(minX, minY, minZ, maxX, maxY, maxZ, xzPlane, xyPlane);
 	}
 
-	@Override
 	public Placement3D getXZPlane() {
 		return xzPlane;
 	}
 
-	@Override
 	public Placement3D getXYPlane() {
 		return xyPlane;
 	}

diff --git a/...s/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXYPlaneYZPlanePoint3D.java b/...s/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXYPlaneYZPlanePoint3D.java
@@ -55,7 +55,6 @@ public boolean isYZPlaneEdgeY(int y) {
 		return yzPlane.getAbsoluteEndY() == y - 1;
 	}
 
-	@Override
 	public Placement3D getYZPlane() {
 		return yzPlane;
 	}
@@ -91,7 +90,6 @@ public boolean isXYPlaneEdgeY(int y) {
 		return xyPlane.getAbsoluteEndY() == y - 1;
 	}
 
-	@Override
 	public Placement3D getXYPlane() {
 		return xyPlane;
 	}

diff --git a/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXZPlanePoint3D.java b/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXZPlanePoint3D.java
@@ -61,7 +61,6 @@ public DefaultXZPlanePoint3D<P> clone(int maxX, int maxY, int maxZ) {
 				xzPlane);
 	}
 
-	@Override
 	public Placement3D getXZPlane() {
 		return xzPlane;
 	}

diff --git a/...s/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXZPlaneYZPlanePoint3D.java b/...s/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultXZPlaneYZPlanePoint3D.java
@@ -104,12 +104,10 @@ public DefaultXZPlaneYZPlanePoint3D<P> clone(int maxX, int maxY, int maxZ) {
 				xzPlane, yzPlane);
 	}
 
-	@Override
 	public Placement3D getXZPlane() {
 		return xzPlane;
 	}
 
-	@Override
 	public Placement3D getYZPlane() {
 		return yzPlane;
 	}

diff --git a/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultYZPlanePoint3D.java b/...e-points/src/main/java/com/github/skjolber/packing/ep/points3d/DefaultYZPlanePoint3D.java
@@ -52,7 +52,6 @@ public boolean isYZPlaneEdgeY(int y) {
 		return yzPlane.getAbsoluteEndY() == y - 1;
 	}
 
-	@Override
 	public Placement3D getYZPlane() {
 		return yzPlane;
 	}

diff --git a/extreme-points/src/main/java/com/github/skjolber/packing/ep/points3d/XYPlanePoint3D.java b/extreme-points/src/main/java/com/github/skjolber/packing/ep/points3d/XYPlanePoint3D.java
@@ -1,7 +1,5 @@
 package com.github.skjolber.packing.ep.points3d;
 
-import com.github.skjolber.packing.api.Placement3D;
-
 /**
  * 
  * Z is fixed within a X-Y plane.
@@ -18,5 +16,4 @@ public interface XYPlanePoint3D {
 
 	int getSupportedXYPlaneMaxY();
 
-	Placement3D getXYPlane();
 }
diff --git a/extreme-points/src/main/java/com/github/skjolber/packing/ep/points3d/XZPlanePoint3D.java b/extreme-points/src/main/java/com/github/skjolber/packing/ep/points3d/XZPlanePoint3D.java
@@ -1,7 +1,5 @@
 package com.github.skjolber.packing.ep.points3d;
 
-import com.github.skjolber.packing.api.Placement3D;
-
 /**
  * 
  * Y is fixed within an x-z plane
@@ -17,6 +15,4 @@ public interface XZPlanePoint3D {
 	int getSupportedXZPlaneMinZ();
 
 	int getSupportedXZPlaneMaxZ();
-
-	Placement3D getXZPlane();
 }
diff --git a/extreme-points/src/main/java/com/github/skjolber/packing/ep/points3d/YZPlanePoint3D.java b/extreme-points/src/main/java/com/github/skjolber/packing/ep/points3d/YZPlanePoint3D.java
@@ -1,7 +1,5 @@
 package com.github.skjolber.packing.ep.points3d;
 
-import com.github.skjolber.packing.api.Placement3D;
-
 /**
  * 
  * X is fixed within a Y-Z plane.
@@ -17,5 +15,4 @@ public interface YZPlanePoint3D {
 
 	int getSupportedYZPlaneMaxZ();
 
-	Placement3D getYZPlane();
 }