diskpack 0.4.0__tar.gz → 0.5.0__tar.gz

{diskpack-0.4.0/src/diskpack.egg-info → diskpack-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diskpack
-Version: 0.4.0
+Version: 0.5.0
 Summary: A high-performance vectorized circle packer with spatial hashing.
 Author-email: James Kelly <mrkellyjam@gmail.com>
 Requires-Python: >=3.8

{diskpack-0.4.0 → diskpack-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "diskpack"
-version = "0.4.0"
+version = "0.5.0"
 authors = [{ name="James Kelly", email="mrkellyjam@gmail.com" }]
 description = "A high-performance vectorized circle packer with spatial hashing."
 readme = "README.md"

{diskpack-0.4.0 → diskpack-0.5.0}/src/diskpack/packer.py

@@ -20,6 +20,7 @@ class PackingConfig:
     ray_cast_epsilon: float = 1e-10
     sample_batch_size: int = 50
     fixed_radius: Optional[float] = None
+    use_hex_grid: bool = True
     verbose: bool = False
 
 
@@ -329,22 +330,11 @@ class CirclePacker:
 
         return circles
 
-    def generate(self) -> Iterator[Circle]:
+    def _pack_random(self) -> Iterator[Circle]:
         """
-        Generate circles until no more can be placed.
-
-        For fixed_radius mode, uses optimized hex grid placement.
-        For variable radius mode, uses random sampling with best-fit selection.
-
-        Yields:
-            Tuples of (x, y, radius) for each placed circle.
+        Pack circles using random sampling.
+        Used for variable radius mode or when organic placement is desired.
         """
-        # Use hex grid for fixed radius - much faster and denser
-        if self.config.fixed_radius is not None:
-            yield from self._pack_hex_grid()
-            return
-
-        # Variable radius mode - use random sampling
         self.progress = PackingProgress(max_failed_attempts=self.config.max_failed_attempts)
 
         while self.progress.failed_attempts < self.config.max_failed_attempts:
@@ -370,6 +360,25 @@ class CirclePacker:
         if self.config.verbose:
             print(f"Done! {self.progress}")
 
+    def generate(self) -> Iterator[Circle]:
+        """
+        Generate circles until no more can be placed.
+
+        For fixed_radius mode with use_hex_grid=True (default), uses optimized hex grid.
+        For fixed_radius mode with use_hex_grid=False, uses random sampling for organic look.
+        For variable radius mode, uses random sampling with best-fit selection.
+
+        Yields:
+            Tuples of (x, y, radius) for each placed circle.
+        """
+        # Use hex grid for fixed radius (unless disabled)
+        if self.config.fixed_radius is not None and self.config.use_hex_grid:
+            yield from self._pack_hex_grid()
+            return
+
+        # Random sampling mode (variable radius OR fixed radius with organic placement)
+        yield from self._pack_random()
+
     def pack(self) -> List[Circle]:
         """Pack circles and return them as a list."""
         return list(self.generate())

{diskpack-0.4.0 → diskpack-0.5.0/src/diskpack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diskpack
-Version: 0.4.0
+Version: 0.5.0
 Summary: A high-performance vectorized circle packer with spatial hashing.
 Author-email: James Kelly <mrkellyjam@gmail.com>
 Requires-Python: >=3.8