topologicpy 0.8.33__py3-none-any.whl → 0.8.36__py3-none-any.whl

topologicpy/Topology.py

@@ -1079,7 +1079,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -1226,7 +1226,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -1442,7 +1442,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -1869,7 +1869,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -2093,7 +2093,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -2153,7 +2153,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
         Returns
         -------
         list
@@ -2623,7 +2623,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -3079,7 +3079,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -3313,7 +3313,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -3551,7 +3551,7 @@ class Topology():
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         silent : bool , optional
-            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, error and warning messages are suppressed. The default is False.
         
         Returns
         -------
@@ -3718,7 +3718,7 @@ class Topology():
             keys : str or list or comma-separated str input parameters
                 The key or keys in the topology's dictionary to use for clustering.
             silent : bool , optional
-                If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+                If set to True, error and warning messages are suppressed. The default is False.
 
 
             Returns
@@ -4101,7 +4101,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -5667,7 +5667,7 @@ class Topology():
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         silent : bool , optional
-            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -5811,7 +5811,7 @@ class Topology():
         tolerance : float , ptional
             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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -5878,7 +5878,7 @@ class Topology():
         tolerance : float , ptional
             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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -6071,7 +6071,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -6259,7 +6259,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -6340,7 +6340,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
         Returns
         -------
         list
@@ -6389,7 +6389,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
         Returns
         -------
         list
@@ -6474,7 +6474,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -6881,7 +6881,7 @@ class Topology():
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         silent : bool , optional
-            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, error and warning messages are suppressed. The default is False.
         
         Returns
         -------
@@ -6963,7 +6963,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -7049,7 +7049,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -7870,7 +7870,7 @@ class Topology():
         dictionary : topologic_core.Dictionary
             The input dictionary.
         silent : bool , optional
-            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -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
     
@@ -8115,7 +8108,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
         Returns
         -------
         list
@@ -8172,9 +8165,12 @@ class Topology():
 
              showEdges=True,
              edgeWidth=None,
-             edgeWidthKey = None,
+             edgeWidthKey=None,
              edgeColor=None,
-             edgeColorKey = None,
+             edgeColorKey=None,
+             edgeDash=False,
+             edgeDashKey=None,
+
              edgeLabelKey=None,
              showEdgeLabel = False,
              edgeGroupKey=None,
@@ -8188,7 +8184,7 @@ class Topology():
              faceOpacity=0.5,
              faceOpacityKey=None,
              faceColor="#FAFAFA",
-             faceColorKey = None,
+             faceColorKey=None,
              faceLabelKey=None,
              faceGroupKey=None,
              faceGroups=[], 
@@ -8227,10 +8223,10 @@ class Topology():
              cbUnits="",
              colorScale="Viridis",
              
-             sagitta = 0,
-             absolute = False,
-             sides = 8,
-             angle = 0,
+             sagitta=0,
+             absolute=False,
+             sides=8,
+             angle=0,
              mantissa=6,
              tolerance=0.0001,
              silent=False):
@@ -8300,6 +8296,10 @@ class Topology():
             The default is "black".
         edgeColorKey : str , optional
             The key under which to find the color of the edge. The default is None.
+        edgeDash : bool , optional
+            If set to True, the edges are drawn as dashed lines. The default is False.
+        edgeDashKey : str , optional
+            The key under which to find the boolean flag to draw edges as dashed lines. The default is None.
         edgeWidthKey : str , optional
             The key under which to find the width of the edge. The default is None.
         edgeLabelKey : str , optional
@@ -8414,7 +8414,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -8605,7 +8605,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
         Returns
         -------
         list
@@ -8760,7 +8760,7 @@ class Topology():
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
 
         Returns
@@ -8861,6 +8861,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, error and warning messages are suppressed. 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 +9359,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 +9369,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 +9378,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/Vector.py

@@ -372,7 +372,7 @@ class Vector(list):
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -420,7 +420,7 @@ class Vector(list):
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -530,7 +530,7 @@ class Vector(list):
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         silent : bool , optional
-            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -580,7 +580,7 @@ class Vector(list):
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -627,7 +627,7 @@ class Vector(list):
         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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------

topologicpy/Vertex.py

@@ -60,7 +60,7 @@ class Vertex():
             mantissa : int , optional
                 The desired length of the mantissa. The default is 6.
             silent : bool , optional
-                If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+                If set to True, error and warning messages are suppressed. The default is False.
             
             Returns
             -------
@@ -1116,7 +1116,7 @@ class Vertex():
         tolerance : float , optional
             The tolerance for computing if the input vertex is external to the input topology. 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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -1150,7 +1150,7 @@ class Vertex():
         tolerance : float , optional
             The tolerance for computing if the input vertex is internal to the input topology. 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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -1265,7 +1265,7 @@ class Vertex():
         tolerance : float , optional
             The tolerance for computing if the input vertex is peripheral to the input topology. 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.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -1830,7 +1830,7 @@ class Vertex():
         minDistance : float , optional
             The desired minimum distance. 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.
+                If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------
@@ -1915,7 +1915,7 @@ class Vertex():
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         silent : bool , optional
-            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+            If set to True, error and warning messages are suppressed. The default is False.
 
         Returns
         -------