polycubetools 1.1.1__tar.gz → 1.1.2__tar.gz

{polycubetools-1.1.1/src/polycubetools.egg-info → polycubetools-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polycubetools
-Version: 1.1.1
+Version: 1.1.2
 Summary: Basic framework for working with polycubes in a 3-dimensional grid.
 Author: Team Polycube
 Classifier: Development Status :: 3 - Alpha

{polycubetools-1.1.1 → polycubetools-1.1.2}/src/polycubetools/__init__.py

@@ -10,7 +10,7 @@ Basic framework for working with polycubes in a 3-dimensional grid.
 __author__ = "Team Polycube"
 __title__ = "polycubetools"
 __license__ = "MIT"
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 
 from . import utils as utils
 from .errors import *

{polycubetools-1.1.1 → polycubetools-1.1.2}/src/polycubetools/hull.py

@@ -134,3 +134,43 @@ class CuboidHull(AbstractHull):
         minc, maxc = self.min_coord, self.max_coord
         px, py, pz = pos.x, pos.y, pos.z
         return minc.x < px < maxc.x and minc.y < py < maxc.y and minc.z < pz < maxc.z
+
+
+class CoordinateSetHull(AbstractHull):
+    def __init__(
+        self,
+        coords: frozenset[Coordinate],
+        inner_coords: frozenset[Coordinate],
+        frontier: set[Coordinate] | None = None,
+    ) -> None:
+        super().__init__()
+        self.coords = coords
+        self.inner_coords = inner_coords
+        if frontier is None:
+            self.frontier = set(coords)
+        else:
+            self.frontier = frontier
+
+    @classmethod
+    def from_snapshot(cls, snapshot: SNAPSHOT) -> Self:
+        coords = frozenset(Coordinate.from_tuple(t) for t in snapshot["coords"])
+        frontier = {Coordinate.from_tuple(t) for t in snapshot["frontier"]}
+        inner_coords = frozenset(Coordinate.from_tuple(t) for t in snapshot["inner_coords"])
+
+        return cls(coords, inner_coords, frontier)
+
+    def to_snapshot(self) -> SNAPSHOT:
+        return {
+            "coords": tuple(c.to_tuple() for c in self.coords),
+            "frontier": tuple(c.to_tuple() for c in self.frontier),
+            "inner_coords": tuple(c.to_tuple() for c in self.inner_coords),
+        }
+
+    def in_hull(self, pos: Coordinate) -> bool:
+        return pos in self.coords
+
+    def inside_hull(self, pos: Coordinate) -> bool:
+        return pos in self.coords or self.in_inner_part(pos)
+
+    def in_inner_part(self, pos: Coordinate) -> bool:
+        return pos in self.inner_coords

{polycubetools-1.1.1 → polycubetools-1.1.2}/src/polycubetools/utils.py

@@ -100,13 +100,22 @@ def collect_volume(coords: set[Coordinate]) -> set[Coordinate]:
     }
 
     # the here popped coordinate is always outside the hull; this is because we added this outside new layer!
-    find_connected_component(visible_coords)
+    first_component = find_connected_component(visible_coords)
 
     if not visible_coords:
         _logger.warning("No volume found! Only one component detected.")
         return set()
 
-    volume_cubes = find_connected_component(visible_coords)
+    second_component = find_connected_component(visible_coords)
+
+    if min_extreme_point in second_component and max_extreme_point in second_component:
+        volume_cubes = first_component
+    elif min_extreme_point in first_component and max_extreme_point in first_component:
+        volume_cubes = second_component
+    else:
+        _logger.warning("Error. Couldn't find one outside component")
+        raise InvalidVolumeException("Couldn't find one outside component")
+
     if visible_coords:
         _logger.warning(
             f"Found {len(volume_cubes)} as volume, but still {len(visible_coords)} unvisited cubes left. Another enclosed area exists!"

{polycubetools-1.1.1 → polycubetools-1.1.2/src/polycubetools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polycubetools
-Version: 1.1.1
+Version: 1.1.2
 Summary: Basic framework for working with polycubes in a 3-dimensional grid.
 Author: Team Polycube
 Classifier: Development Status :: 3 - Alpha