Release 0.2.0 🚀

Over-Run · Jan 14, 2023 · 9ddccbc · 9ddccbc
1 parent 72b66b0
commit 9ddccbc
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 42 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,2 +1,6 @@
+0.2.0
+Changed: Packer::sort and ::fit now support to children type for generic
+
 0.1.0
-Added: Packer, GrowingPacker
+Added: Packer, FixedPacker, GrowingPacker
+Added: PackerFitPos, PackerRegionSize, PackerRegion
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8
 projGroupId=io.github.over-run
 projArtifactId=bin-packing
 projName=bin-packing
-projVersion=0.1.0
+projVersion=0.2.0
 projDesc=The Java port of jakesgordon/bin-packing.
 projVcs=Over-Run/bin-packing
 projBranch=0.x

diff --git a/settings.gradle b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
-        maven { url 'https://maven.aliyun.com/repository/public'}
+        maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
     }
 }

diff --git a/src/main/java/org/overrun/binpacking/FixedPacker.java b/src/main/java/org/overrun/binpacking/FixedPacker.java
@@ -74,7 +74,7 @@ public FixedPacker(int width, int height) {
     }
 
     @Override
-    public <T> void fit(List<PackerRegion<T>> regions) {
+    public void fit(List<? extends PackerRegion<?>> regions) {
         PackerNode node;
         for (var region : regions) {
             if ((node = findNode(root, region.width(), region.height())) != null) {
@@ -93,20 +93,6 @@ public int height() {
         return root.height();
     }
 
-    private PackerNode findNode(PackerNode root, int w, int h) {
-        if (root.used()) {
-            PackerNode node = findNode(root.right(), w, h);
-            if (node != null) {
-                return node;
-            }
-            return findNode(root.down(), w, h);
-        }
-        if (w <= root.width() && h <= root.height()) {
-            return root;
-        }
-        return null;
-    }
-
     private PackerNode splitNode(PackerNode node, int w, int h) {
         return node.markUsed()
             .setDown(new PackerNode()

diff --git a/src/main/java/org/overrun/binpacking/GrowingPacker.java b/src/main/java/org/overrun/binpacking/GrowingPacker.java
@@ -81,7 +81,7 @@ public GrowingPacker() {
     }
 
     @Override
-    public <T> void fit(List<PackerRegion<T>> regions) {
+    public void fit(List<? extends PackerRegion<?>> regions) {
         PackerNode node;
         boolean isNotEmpty = regions.size() > 0;
         int w = isNotEmpty ? regions.get(0).width() : 0;
@@ -108,20 +108,6 @@ public int height() {
         return root.height();
     }
 
-    private PackerNode findNode(PackerNode root, int w, int h) {
-        if (root.used()) {
-            PackerNode node = findNode(root.right(), w, h);
-            if (node != null) {
-                return node;
-            }
-            return findNode(root.down(), w, h);
-        }
-        if (w <= root.width() && h <= root.height()) {
-            return root;
-        }
-        return null;
-    }
-
     private PackerNode splitNode(PackerNode node, int w, int h) {
         return node.markUsed()
             .setDown(new PackerNode()

diff --git a/src/main/java/org/overrun/binpacking/Packer.java b/src/main/java/org/overrun/binpacking/Packer.java
@@ -24,6 +24,8 @@
 
 package org.overrun.binpacking;
 
+import org.overrun.binpacking.internal.PackerNode;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -40,11 +42,12 @@ public sealed abstract class Packer implements PackerRegionSize permits FixedPac
      * This method mutates the given regions.
      *
      * @param regions the regions.
-     * @param <T>     the type of the userdata.
+     * @param <U>     the type of the userdata.
+     * @param <E>     the type of elements in the list.
      * @return the sorted regions wrapped in List.
      */
     @SafeVarargs
-    public static <T> List<PackerRegion<T>> sort(PackerRegion<T>... regions) {
+    public static <U, E extends PackerRegion<? extends U>> List<E> sort(E... regions) {
         Arrays.sort(regions);
         return List.of(regions);
     }
@@ -55,21 +58,35 @@ public static <T> List<PackerRegion<T>> sort(PackerRegion<T>... regions) {
      * This method mutates the given regions.
      *
      * @param regions the regions.
-     * @param <T>     the type of the userdata.
+     * @param <U>     the type of the userdata.
+     * @param <E>     the type of elements in the list.
      * @return the sorted regions.
      */
-    public static <T> List<PackerRegion<T>> sort(List<PackerRegion<T>> regions) {
+    public static <U, E extends PackerRegion<? extends U>> List<E> sort(List<E> regions) {
         regions.sort(null);
         return regions;
     }
 
+    PackerNode findNode(PackerNode root, int w, int h) {
+        if (root.used()) {
+            PackerNode node = findNode(root.right(), w, h);
+            if (node != null) {
+                return node;
+            }
+            return findNode(root.down(), w, h);
+        }
+        if (w <= root.width() && h <= root.height()) {
+            return root;
+        }
+        return null;
+    }
+
     /**
      * Fits this packer with the given regions.
      *
      * @param regions the regions.
-     * @param <T>     the type of the userdata.
      */
-    public abstract <T> void fit(List<PackerRegion<T>> regions);
+    public abstract void fit(List<? extends PackerRegion<?>> regions);
 
     /**
      * Gets the width of the root node of this packer.

diff --git a/src/test/java/org/overrun/binpacking/test/PackerTest.java b/src/test/java/org/overrun/binpacking/test/PackerTest.java
@@ -38,7 +38,7 @@
  * @since 0.1.0
  */
 public final class PackerTest {
-    private static List<PackerRegion<Object>> generateData() {
+    private static List<PackerRegion<?>> generateData() {
         return Packer.sort(
             PackerRegion.sized(100, 300),
             PackerRegion.sized(300, 300),
@@ -47,7 +47,7 @@ private static List<PackerRegion<Object>> generateData() {
         );
     }
 
-    private static void testFixed(List<PackerRegion<Object>> testData) {
+    private static void testFixed(List<PackerRegion<?>> testData) {
         var packer = new FixedPacker(400, 500);
         packer.fit(testData);
         System.out.println(packer.width() + ", " + packer.height());
@@ -58,7 +58,7 @@ private static void testFixed(List<PackerRegion<Object>> testData) {
         );
     }
 
-    private static void testGrowing(List<PackerRegion<Object>> testData) {
+    private static void testGrowing(List<PackerRegion<?>> testData) {
         var packer = new GrowingPacker();
         packer.fit(testData);
         System.out.println(packer.width() + ", " + packer.height());