topologicpy 0.8.31__py3-none-any.whl → 0.8.35__py3-none-any.whl

topologicpy/Shell.py

@@ -739,42 +739,6 @@ class Shell():
         _ = shell.Faces(None, faces)
         return faces
     
-    @staticmethod
-    def IsOnBoundary(shell, vertex, tolerance: float = 0.0001) -> bool:
-        """
-        Returns True if the input vertex is on the boundary of the input shell. Returns False otherwise. On the boundary is defined as being on the boundary of one of the shell's external or internal boundaries
-
-        Parameters
-        ----------
-        shell : topologic_core.Shell
-            The input shell.
-        vertex : topologic_core.Vertex
-            The input vertex.
-        tolerance : float , optional
-            The desired tolerance. The default is 0.0001.
-
-        Returns
-        -------
-        bool
-            Returns True if the input vertex is inside the input shell. Returns False otherwise.
-
-        """
-        from topologicpy.Vertex import Vertex
-        from topologicpy.Topology import Topology
-
-        if not Topology.IsInstance(shell, "Shell"):
-            return None
-        if not Topology.IsInstance(vertex, "Vertex"):
-            return None
-        boundary = Shell.ExternalBoundary(shell, tolerance=tolerance)
-        if Vertex.IsInternal(vertex, boundary, tolerance=tolerance):
-            return True
-        internal_boundaries = Shell.InternalBoundaries(shell, tolerance=tolerance)
-        for ib in internal_boundaries:
-            if Vertex.IsInternal(vertex, ib, tolerance=tolerance):
-                return True
-        return False
-    
     @staticmethod
     def HyperbolicParaboloidRectangularDomain(origin= None,
                                               llVertex= None,
@@ -1097,6 +1061,41 @@ class Shell():
         """
         return shell.IsClosed()
 
+    @staticmethod
+    def IsOnBoundary(shell, vertex, tolerance: float = 0.0001) -> bool:
+        """
+        Returns True if the input vertex is on the boundary of the input shell. Returns False otherwise. On the boundary is defined as being on the boundary of one of the shell's external or internal boundaries
+
+        Parameters
+        ----------
+        shell : topologic_core.Shell
+            The input shell.
+        vertex : topologic_core.Vertex
+            The input vertex.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        bool
+            Returns True if the input vertex is inside the input shell. Returns False otherwise.
+
+        """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Topology import Topology
+
+        if not Topology.IsInstance(shell, "Shell"):
+            return None
+        if not Topology.IsInstance(vertex, "Vertex"):
+            return None
+        boundary = Shell.ExternalBoundary(shell, tolerance=tolerance)
+        if Vertex.IsInternal(vertex, boundary, tolerance=tolerance):
+            return True
+        internal_boundaries = Shell.InternalBoundaries(shell, tolerance=tolerance)
+        for ib in internal_boundaries:
+            if Vertex.IsInternal(vertex, ib, tolerance=tolerance):
+                return True
+        return False
 
     @staticmethod
     def Paraboloid(origin= None, focalLength=0.125, width: float = 1, length: float = 1, uSides: int = 16, vSides: int = 16,
@@ -1644,62 +1643,6 @@ class Shell():
         else:
             return None
 
-    def Skeleton(face, tolerance: float = 0.001):
-        """
-            Creates a shell through a straight skeleton. This method is contributed by 高熙鹏 xipeng gao <gaoxipeng1998@gmail.com>
-            This algorithm depends on the polyskel code which is included in the library. Polyskel code is found at: https://github.com/Botffy/polyskel
-
-        Parameters
-        ----------
-        face : topologic_core.Face
-            The input face.
-        tolerance : float , optional
-            The desired tolerance. The default is 0.001. (This is set to a larger number as it was found to work better)
-
-        Returns
-        -------
-        topologic_core.Shell
-            The created straight skeleton.
-
-        """
-        from topologicpy.Wire import Wire
-        from topologicpy.Face import Face
-        from topologicpy.Topology import Topology
-        import topologic_core as topologic
-        import math
-
-        if not Topology.IsInstance(face, "Face"):
-            return None
-        roof = Wire.Skeleton(face, tolerance=tolerance)
-        if not (Topology.IsInstance(roof, "Wire") or Topology.IsInstance(roof, "Cluster")):
-            print("Shell.Skeleton - Error: Could not create base skeleton wire. Returning None.")
-            return None
-        br = Wire.BoundingRectangle(roof) #This works even if it is a Cluster not a Wire
-        if not Topology.IsInstance(br, "Wire"):
-            print("Shell.Skeleton - Error: Could not create a bounding rectangle wire. Returning None.")
-            return None
-        br = Topology.Scale(br, Topology.Centroid(br), 1.5, 1.5, 1)
-        bf = Face.ByWire(br, tolerance=tolerance)
-        if not Topology.IsInstance(bf, "Face"):
-            print("Shell.Skeleton - Error: Could not create a bounding rectangle face. Returning None.")
-            return None
-        large_shell = Topology.Boolean(bf, roof, operation="slice", tolerance=tolerance)
-        if not large_shell:
-            return None
-        faces = Topology.Faces(large_shell)
-        if not faces:
-            return None
-        final_faces = []
-        for f in faces:
-            internalBoundaries = Face.InternalBoundaries(f)
-            if len(internalBoundaries) == 0:
-                final_faces.append(f)
-        shell = Shell.ByFaces(final_faces, tolerance=tolerance)
-        if not Topology.IsInstance(shell, "Shell"):
-            print("Shell.Skeleton - Error: Could not create shell. Returning None.")
-            return None
-        return shell
-
     @staticmethod
     def Simplify(shell, simplifyBoundary: bool = True, mantissa: int = 6, tolerance: float = 0.0001):
         """
@@ -1846,6 +1789,63 @@ class Shell():
             final_result = Shell.ByFaces(final_faces, tolerance=tolerance)
         return final_result
 
+    @staticmethod
+    def Skeleton(face, tolerance: float = 0.001):
+        """
+            Creates a shell through a straight skeleton. This method is contributed by 高熙鹏 xipeng gao <gaoxipeng1998@gmail.com>
+            This algorithm depends on the polyskel code which is included in the library. Polyskel code is found at: https://github.com/Botffy/polyskel
+
+        Parameters
+        ----------
+        face : topologic_core.Face
+            The input face.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.001. (This is set to a larger number as it was found to work better)
+
+        Returns
+        -------
+        topologic_core.Shell
+            The created straight skeleton.
+
+        """
+        from topologicpy.Wire import Wire
+        from topologicpy.Face import Face
+        from topologicpy.Topology import Topology
+        import topologic_core as topologic
+        import math
+
+        if not Topology.IsInstance(face, "Face"):
+            return None
+        roof = Wire.Skeleton(face, tolerance=tolerance)
+        if not (Topology.IsInstance(roof, "Wire") or Topology.IsInstance(roof, "Cluster")):
+            print("Shell.Skeleton - Error: Could not create base skeleton wire. Returning None.")
+            return None
+        br = Wire.BoundingRectangle(roof) #This works even if it is a Cluster not a Wire
+        if not Topology.IsInstance(br, "Wire"):
+            print("Shell.Skeleton - Error: Could not create a bounding rectangle wire. Returning None.")
+            return None
+        br = Topology.Scale(br, Topology.Centroid(br), 1.5, 1.5, 1)
+        bf = Face.ByWire(br, tolerance=tolerance)
+        if not Topology.IsInstance(bf, "Face"):
+            print("Shell.Skeleton - Error: Could not create a bounding rectangle face. Returning None.")
+            return None
+        large_shell = Topology.Boolean(bf, roof, operation="slice", tolerance=tolerance)
+        if not large_shell:
+            return None
+        faces = Topology.Faces(large_shell)
+        if not faces:
+            return None
+        final_faces = []
+        for f in faces:
+            internalBoundaries = Face.InternalBoundaries(f)
+            if len(internalBoundaries) == 0:
+                final_faces.append(f)
+        shell = Shell.ByFaces(final_faces, tolerance=tolerance)
+        if not Topology.IsInstance(shell, "Shell"):
+            print("Shell.Skeleton - Error: Could not create shell. Returning None.")
+            return None
+        return shell
+    
     @staticmethod
     def Square(origin= None, size: float = 1.0,
                   uSides: int = 2, vSides: int = 2, direction: list = [0, 0, 1],
@@ -1882,6 +1882,33 @@ class Shell():
                   uSides=uSides, vSides=vSides, direction=direction,
                   placement=placement, tolerance=tolerance)
     
+    @staticmethod
+    def _grow_connected_group(seed_idx, group_size, adjacency, visited_global):
+        """
+        Attempts to grow a group of the given size starting from seed_idx using adjacency.
+        Returns a list of indices if successful, else None.
+        """
+        from collections import deque
+        import random
+
+        group = [seed_idx]
+        visited = set(group)
+        queue = deque([seed_idx])
+
+        while queue and len(group) < group_size:
+            current = queue.popleft()
+            neighbors = adjacency.get(current, [])
+            random.shuffle(neighbors)
+            for neighbor in neighbors:
+                if neighbor not in visited and neighbor not in visited_global:
+                    group.append(neighbor)
+                    visited.add(neighbor)
+                    queue.append(neighbor)
+                    if len(group) >= group_size:
+                        break
+
+        return group if len(group) == group_size else None
+    
     @staticmethod
     def Vertices(shell) -> list:
         """

topologicpy/Topology.py

@@ -7897,13 +7897,6 @@ class Topology():
                 calframe = inspect.getouterframes(curframe, 2)
                 print('caller name:', calframe[1][3])
             return topology
-        if len(dictionary.Keys()) < 1:
-            if not silent:
-                print("Topology.SetDictionary - Warning: the input dictionary parameter is empty. Returning original input.")
-                curframe = inspect.currentframe()
-                calframe = inspect.getouterframes(curframe, 2)
-                print('caller name:', calframe[1][3])
-            return topology
         _ = topology.SetDictionary(dictionary)
         return topology
     
@@ -8861,6 +8854,177 @@ class Topology():
                 pass
         return returnTopology
     
+    @staticmethod
+    def SubCombinations(topology,
+                        subTopologyType=None,
+                        minSize: int = 2,
+                        maxSize: int = None,
+                        maxCombinations: int = 100,
+                        timeLimit: int = 10,
+                        removeCoplanarFaces: bool = False,
+                        removeCollinearEdges: bool = False,
+                        tolerance: float = 0.001,
+                        silent: bool = False):
+        """
+        Creates connected sub-combination topologies of the input topology. Warning: This is prone to combinatorial explosion.
+
+        Parameters
+        ----------
+        topology : topologic_core.Topology
+            The input topology. This cannot be vertex or edge.
+        subTopologyType : str , optional except when topology is a Cluster
+            The type of subTopology to include in the combinations.
+            If the input is a Cluster, you must specify the subTopologyType.
+            The options are (case insensitive):
+                - "CellComplex"
+                - "Shell"
+                - "Wire"
+            If set to None, it will be set according to the input topology type as follows:
+                - "Cluster" -> User-defined
+                - "CellComplex" -> "CellComplexes"
+                - "Cell" -> "Shells"
+                - "Shell" -> "Shells"
+                - "Face" -> "Wires"
+                - "Wire" -> "Wires"
+                - "Edge" -> None
+                - "Vertex" -> None
+                - "Graph" -> "Graphs"
+        minSize : int , optional
+            The minimum number of subtopologies to include in a combination. This number cannot be less than 2. The default is 2.
+        maxSize : int , optional
+            The maximum number of faces to include in a combinations. This number cannot be less than the number of subtopologies minus 1. The default is None which means the maximum will be set to the number of subtopologies minus 1.
+        maxCombinations : int , optional
+            The maximum number of combinations to create. The default is 100.
+        timeLimit : int , optional
+                The time limit in seconds. The default is 10 seconds. Note that this time limit only applies to creating the combination indices and not the actual Shells.
+        removeCoplanarFaces : bool , optional
+            If set to True, coplanar faces are removed. Otherwise they are not. The default is False.
+        removeCollinearEdges : bool , optional
+            If set to True, collinear edges are removed. Otherwise they are not. The default is False.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+
+        Returns
+        -------
+        list
+            The list of created sub-combinations.
+
+        """
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Graph import Graph
+        from topologicpy.Topology import Topology
+        from topologicpy.Dictionary import Dictionary
+        from topologicpy.Helper import Helper
+        import random
+        import time
+
+        if Topology.IsInstance(topology, "cluster") and subTopologyType is None:
+            if not silent:
+                print("Topology.SubCombinations - Error: The topology input parameter is a cluster but the subTopologyType is not specified. Returning None.")
+            return None
+
+        if Topology.IsInstance(topology, "vertex") or Topology.IsInstance(topology, "edge"):
+            if not silent:
+                print("Topology.SubCombinations - Error: The topology input parameter cannot be a vertex or an edge. Returning None.")
+            return None
+
+        mapping = {
+            "cellcomplex": "cell",
+            "cell": "face",
+            "shell": "face",
+            "face": "edge",
+            "wire": "edge",
+            "graph": "vertex"
+        }
+
+        type_string = Topology.TypeAsString(topology).lower()
+        if type_string not in mapping:
+            if not silent:
+                print(f"Topology.SubCombinations - Error: The input topology type ({type_string}) is not supported. Returning None.")
+            return None
+
+        if subTopologyType is None:
+            subTopologyType = mapping[type_string]
+        subTopologyType = subTopologyType.lower()
+
+        if subTopologyType not in ["cell", "face", "edge", "vertex"]:
+            if not silent:
+                print(f"Topology.SubCombinations - Error: Unknown subTopologyType: {subTopologyType}. Returning None.")
+            return None
+
+        if ((type_string in ["cell", "shell"]) and subTopologyType not in ["face", "edge"]) or \
+        ((type_string in ["wire", "face"]) and subTopologyType != "edge"):
+            if not silent:
+                print(f"Topology.SubCombinations - Error: The subTopology type {subTopologyType} is not appropriate for topology of type {type_string}. Returning None.")
+            return None
+
+        all_subtopologies = Topology.SubTopologies(topology, subTopologyType=subTopologyType, silent=silent)
+        num_subtopologies = len(all_subtopologies)
+        if num_subtopologies < 2:
+            if not silent:
+                print("Topology.SubCombinations - Warning: Not enough subtopologies found. Returning empty list.")
+            return []
+
+        indices = list(range(num_subtopologies))
+        minSize = max(2, minSize)
+        maxSize = num_subtopologies - 1 if maxSize is None else min(maxSize, num_subtopologies - 1)
+
+        subt_label_key = "__index__"
+        all_subtopologies = [Topology.SetDictionary(subt, Dictionary.ByKeyValue(subt_label_key, i)) for i, subt in enumerate(all_subtopologies)]
+
+        group_sizes = list(range(minSize, maxSize + 1))
+        num_sizes = len(group_sizes)
+        per_size_combinations = maxCombinations // num_sizes
+        per_size_time = timeLimit / num_sizes
+
+        adjacency = Dictionary.AdjacencyDictionary(topology, subTopologyType=subTopologyType, labelKey=subt_label_key, weightKey=None, includeWeights=False)
+
+        results = []
+        seen_groups = set()
+
+        for group_size in reversed(group_sizes):
+            size_start_time = time.time()
+            remaining = per_size_combinations
+            tries = 0
+            max_tries = per_size_combinations * 10
+
+            while remaining > 0 and (time.time() - size_start_time) < per_size_time and tries < max_tries:
+                random.shuffle(indices)
+                for seed in indices:
+                    if (time.time() - size_start_time) > per_size_time:
+                        break
+                    group = Helper.Grow(seed, group_size, adjacency, visited_global=seen_groups)
+                    if group:
+                        key = tuple(sorted(group))
+                        if key not in seen_groups:
+                            tries += 1
+                            seen_groups.add(key)
+                            results.append(group)
+                            remaining -= 1
+                    if remaining <= 0 or tries >= max_tries:
+                        break
+
+        return_combinations = []
+        for result in reversed(results):
+            subtopologies = [all_subtopologies[i] for i in result]
+            # Special case for graphs
+            if Topology.IsInstance(topology, "Graph"):
+                edges = Graph.Edges(topology, vertices = subtopologies)
+                combination = Graph.ByVerticesEdges(subtopologies, edges)
+            else:
+                combination = Topology.SelfMerge(Cluster.ByTopologies(subtopologies), tolerance=tolerance)
+                if removeCollinearEdges:
+                    if Topology.IsInstance(combination, "face") or Topology.IsInstance(combination, "wire"):
+                        combination = Topology.RemoveCollinearEdges(combination, tolerance=tolerance)
+                if removeCoplanarFaces:
+                    if Topology.IsInstance(combination, "cellcomplex") or Topology.IsInstance(combination, "cell") or Topology.IsInstance(combination, "shell"):
+                        combination = Topology.RemoveCoplanarFaces(combination, tolerance=tolerance)
+            return_combinations.append(combination)
+
+        return return_combinations
+
     @staticmethod
     def Taper(topology, origin=None, ratioRange: list = [0, 1], triangulate: bool = False, mantissa: int = 6, tolerance: float = 0.0001):
         """
@@ -9188,7 +9352,7 @@ class Topology():
         return Topology.SubTopologies(topology=topology, subTopologyType="cluster")
     
     @staticmethod
-    def SubTopologies(topology, subTopologyType="vertex"):
+    def SubTopologies(topology, subTopologyType="vertex", silent: bool = False):
         """
         Returns the subtopologies of the input topology as specified by the subTopologyType input string.
 
@@ -9198,7 +9362,8 @@ class Topology():
             The input topology.
         subTopologyType : str , optional
             The requested subtopology type. This can be one of "vertex", "edge", "wire", "face", "shell", "cell", "cellcomplex", "cluster". It is case insensitive. The default is "vertex".
-
+        silent : bool , optional
+            If set to True, no warnings or errors will be printed. The default is False.
         Returns
         -------
         list
@@ -9206,15 +9371,28 @@ class Topology():
 
         """
         from topologicpy.Face import Face
+        from topologicpy.Graph import Graph
 
-        if not Topology.IsInstance(topology, "Topology"):
-            print("Topology.SubTopologies - Error: the input topology parameter is not a valid topology. Returning None.")
+        if not Topology.IsInstance(topology, "Topology") and not Topology.IsInstance(topology, "Graph"):
+            if not silent:
+                print("Topology.SubTopologies - Error: the input topology parameter is not a valid topology. Returning None.")
             return None
         if Topology.TypeAsString(topology).lower() == subTopologyType.lower():
             return [topology]
         
         subTopologies = []
 
+        # Special case for Graphs
+        if Topology.IsInstance(topology, "graph"):
+            if subTopologyType.lower() == "vertex":
+                return Graph.Vertices(topology)
+            elif subTopologyType.lower() == "edge":
+                return Graph.Edges(topology)
+            else:
+                if not silent:
+                    print(f"Topology.SubTopologies - Error: the input subTopologyType parameter {subTopologyType} is not a valid subTopology of Graphs. Returning None.")
+                return None
+
         # Spcecial case for faces to return vertices in CW/CCW order.
         if Topology.IsInstance(topology, "face") and (subTopologyType.lower() == "vertex" or subTopologyType.lower() == "edge"):
             wires = Face.Wires(topology)

topologicpy/Vertex.py

@@ -726,7 +726,7 @@ class Vertex():
             return None
     
     @staticmethod
-    def EnclosingCell(vertex, topology, exclusive: bool = True, mantissa: int = 6, tolerance: float = 0.0001) -> list:
+    def EnclosingCells(vertex, topology, exclusive: bool = True, mantissa: int = 6, tolerance: float = 0.0001) -> list:
         """
         Returns the list of Cells found in the input topology that enclose the input vertex.