topologicpy 0.7.83__py3-none-any.whl → 0.7.85__py3-none-any.whl

topologicpy/Cell.py

@@ -726,7 +726,7 @@ class Cell():
         from topologicpy.Topology import Topology
         import math
 
-        def createCone(baseWire, topWire, baseVertex, topVertex, tolerance):
+        def createCone(baseWire, topWire, baseVertex, topVertex, tolerance=0.0001):
             if baseWire == None and topWire == None:
                 raise Exception("Cell.Cone - Error: Both radii of the cone cannot be zero at the same time")
             elif baseWire == None:
@@ -789,7 +789,7 @@ class Cell():
             topWire = None
         baseVertex = Vertex.ByCoordinates(Vertex.X(origin, mantissa=mantissa)+xOffset, Vertex.Y(origin, mantissa=mantissa)+yOffset, Vertex.Z(origin, mantissa=mantissa)+zOffset)
         topVertex = Vertex.ByCoordinates(Vertex.X(origin, mantissa=mantissa)+xOffset, Vertex.Y(origin, mantissa=mantissa)+yOffset, Vertex.Z(origin, mantissa=mantissa)+zOffset+height)
-        cone = createCone(baseWire, topWire, baseVertex, topVertex, tolerance)
+        cone = createCone(baseWire, topWire, baseVertex, topVertex, tolerance=tolerance)
         if cone == None:
             print("Cell.Cone - Error: Could not create a cone. Returning None.")
             return None
@@ -1304,7 +1304,7 @@ class Cell():
         from topologicpy.Topology import Topology
         import math
 
-        def createHyperboloid(baseVertices, topVertices, tolerance):
+        def createHyperboloid(baseVertices, topVertices, tolerance=0.0001):
             baseWire = Wire.ByVertices(baseVertices, close=True)
             topWire = Wire.ByVertices(topVertices, close=True)
             baseFace = Face.ByWire(baseWire, tolerance=tolerance)
@@ -1358,7 +1358,7 @@ class Cell():
                 topY = math.cos(angle-math.radians(twist))*topRadius + Vertex.Y(w_origin, mantissa=mantissa) + yOffset
                 topV.append(Vertex.ByCoordinates(topX,topY,topZ))
 
-        hyperboloid = createHyperboloid(baseV, topV, tolerance)
+        hyperboloid = createHyperboloid(baseV, topV, tolerance=tolerance)
         if hyperboloid == None:
             print("Cell.Hyperboloid - Error: Could not create a hyperboloid. Returning None.")
             return None
@@ -1967,9 +1967,13 @@ class Cell():
         """
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
-
+        import inspect
+        
         if not Topology.IsInstance(cell, "Cell"):
             print("Cell.RemoveCollinearEdges - Error: The input cell parameter is not a valid cell. Returning None.")
+            curframe = inspect.currentframe()
+            calframe = inspect.getouterframes(curframe, 2)
+            print('caller name:', calframe[1][3])
             return None
         faces = Cell.Faces(cell)
         clean_faces = []
@@ -2070,7 +2074,7 @@ class Cell():
             if unused[i]:
                 iv = Topology.InternalVertex(cells[i], tolerance=tolerance)
                 for j in range(len(superCells)):
-                    if (Vertex.IsInternal(iv, superCells[j], tolerance)):
+                    if (Vertex.IsInternal(iv, superCells[j], tolerance=tolerance)):
                         sets[j].append(cells[i])
                         unused[i] = False
         return sets

topologicpy/CellComplex.py

@@ -158,7 +158,7 @@ class CellComplex():
                 return(temp_cells[0])
             if transferDictionaries == True:
                 for temp_cell in temp_cells:
-                    v = Topology.InternalVertex(temp_cell)
+                    v = Topology.InternalVertex(temp_cell, tolerance=tolerance)
                     enclosing_cells = Vertex.EnclosingCell(v, cluster)
                     dictionaries = [Topology.Dictionary(ec) for ec in enclosing_cells]
                     d = Dictionary.ByMergedDictionaries(dictionaries, silent=silent)
@@ -191,7 +191,7 @@ class CellComplex():
             print("CellComplex.ByCellsCluster - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         cells = Topology.Cells(cluster)
-        return CellComplex.ByCells(cells, tolerance)
+        return CellComplex.ByCells(cells, tolerance=tolerance)
 
     @staticmethod
     def ByFaces(faces: list, tolerance: float = 0.0001, silent: bool = False):
@@ -236,7 +236,7 @@ class CellComplex():
             for i in range(1,len(faces)):
                 newCellComplex = None
                 try:
-                    newCellComplex = cellComplex.Merge(faces[i], False, tolerance)
+                    newCellComplex = cellComplex.Merge(faces[i], False, tolerance) # Hook to Core
                 except:
                     if not silent:
                         print("CellComplex.ByFaces - Warning: Failed to merge face #"+str(i)+". Skipping.")
@@ -284,7 +284,7 @@ class CellComplex():
             print("CellComplex.ByFacesCluster - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         faces = Topology.Faces(cluster)
-        return CellComplex.ByFaces(faces, tolerance)
+        return CellComplex.ByFaces(faces, tolerance=tolerance)
 
     @staticmethod
     def ByWires(wires: list, triangulate: bool = True, tolerance: float = 0.0001):
@@ -972,9 +972,14 @@ class CellComplex():
         """
         from topologicpy.Cell import Cell
         from topologicpy.Topology import Topology
-
+        import inspect
+        
         if not Topology.IsInstance(cellComplex, "CellComplex"):
             print("CellComplex.RemoveCollinearEdges - Error: The input cellComplex parameter is not a valid cellComplex. Returning None.")
+            print("CellComplex.RemoveCollinearEdges - Inspection:")
+            curframe = inspect.currentframe()
+            calframe = inspect.getouterframes(curframe, 2)
+            print('caller name:', calframe[1][3])
             return None
         cells = CellComplex.Cells(cellComplex)
         clean_cells = []

topologicpy/Cluster.py

@@ -143,14 +143,14 @@ class Cluster():
         return Cluster.ByTopologies(vertices)
     
     @staticmethod
-    def ByTopologies(*args, transferDictionaries: bool = False, silent=False):
+    def ByTopologies(*topologies, transferDictionaries: bool = False, silent=False):
         """
         Creates a topologic Cluster from the input list of topologies. The input can be individual topologies each as an input argument or a list of topologies stored in one input argument.
 
         Parameters
         ----------
-        topologies : list
-            The list of topologies.
+        *topologies : topologic_core.Topology
+            One or more instances of `topologic_core.Topology` to be processed.
         transferDictionaries : bool , optional
             If set to True, the dictionaries from the input topologies are merged and transferred to the cluster. Otherwise they are not. The default is False.
         silent : bool , optional
@@ -167,15 +167,15 @@ class Cluster():
         from topologicpy.Helper import Helper
         import inspect
         
-        if len(args) == 0:
+        if len(topologies) == 0:
             if not silent:
                 print("Cluster.ByTopologies - Error: The input topologies parameter is an empty list. Returning None.")
                 curframe = inspect.currentframe()
                 calframe = inspect.getouterframes(curframe, 2)
                 print('caller name:', calframe[1][3])
             return None
-        if len(args) == 1:
-            topologies = args[0]
+        if len(topologies) == 1:
+            topologies = topologies[0]
             if isinstance(topologies, list):
                 if len(topologies) == 0:
                     if not silent:
@@ -186,7 +186,7 @@ class Cluster():
                     return None
                 else:
                     topologyList = [x for x in topologies if Topology.IsInstance(x, "Topology")]
-                    if len(topologies) == 0:
+                    if len(topologyList) == 0:
                         if not silent:
                             print("Cluster.ByTopologies - Error: The input topologies parameter does not contain any valid topologies. Returning None.")
                             curframe = inspect.currentframe()
@@ -201,7 +201,7 @@ class Cluster():
                     print('caller name:', calframe[1][3])
                 return topologies
         else:
-            topologyList = Helper.Flatten(list(args))
+            topologyList = Helper.Flatten(list(topologies))
             topologyList = [x for x in topologyList if Topology.IsInstance(x, "Topology")]
         if len(topologyList) == 0:
             if not silent:

topologicpy/Dictionary.py

@@ -637,7 +637,40 @@ class Dictionary():
             return processTopologicDictionary(dictionary, key, value)
         else:
             return None
- 
+    
+    @staticmethod
+    def SetValuesAtKeys(dictionary, keys, values):
+        """
+        Creates a key/value pair in the input dictionary.
+
+        Parameters
+        ----------
+        keys : list
+            A list of strings representing the keys of the dictionary.
+        values : list
+            A list of values corresponding to the list of keys. Values can be integers, floats, strings, or lists
+
+        Returns
+        -------
+        topologic_core.Dictionary
+            The created dictionary.
+
+        """
+        
+        if not isinstance(keys, list):
+            print("Dictionary.SetValuesAtKeys - Error: The input keys parameter is not a valid list. Returning None.")
+            return None
+        if not isinstance(values, list):
+            print("Dictionary.SetValuesAtkeys - Error: The input values parameter is not a valid list. Returning None.")
+            return None
+        if len(keys) != len(values):
+            print("Dictionary.SetValuesAtKeys - Error: The input keys and values parameters are not of equal length. Returning None.")
+            return None
+        
+        for i, key in enumerate(keys):
+            dictionary = Dictionary.SetValueAtKey(dictionary, key, values[i])
+        return dictionary
+    
     @staticmethod
     def _ConvertAttribute(attr):
         """

topologicpy/Edge.py

@@ -214,7 +214,7 @@ class Edge():
 
         n = Edge.Normal(edge)
         n = Vector.Normalize(n)
-        n = Vector.Multiply(n, offset, tolerance)
+        n = Vector.Multiply(n, offset, tolerance=tolerance)
         edge = Topology.Translate(edge, n[0], n[1], n[2])
         return edge
 
@@ -1477,7 +1477,7 @@ class Edge():
         svb = Edge.StartVertex(edgeB)
         evb = Edge.EndVertex(edgeB)
         intVertex = None
-        if Edge.IsCollinear(edgeA, edgeB):
+        if Edge.IsCollinear(edgeA, edgeB, tolerance=tolerance):
             if Vertex.IsInternal(svb, edgeA):
                 intVertex = svb
             elif Vertex.IsInternal(evb, edgeA):
@@ -1544,7 +1544,7 @@ class Edge():
         vy = Vertex.Y(ev, mantissa=mantissa) - Vertex.Y(sv, mantissa=mantissa)
         vz = Vertex.Z(ev, mantissa=mantissa) - Vertex.Z(sv, mantissa=mantissa)
         vector = Vector.Normalize([vx, vy, vz])
-        vector = Vector.Multiply(vector, distance, tolerance)
+        vector = Vector.Multiply(vector, distance, tolerance=tolerance)
         return Vertex.ByCoordinates(Vertex.X(origin, mantissa=mantissa)+vector[0], Vertex.Y(origin, mantissa=mantissa)+vector[1], Vertex.Z(origin, mantissa=mantissa)+vector[2])
     
     @staticmethod

topologicpy/Face.py

@@ -594,6 +594,7 @@ class Face():
         # Try the simple method first
         face = None
         ext_boundary = Wire.RemoveCollinearEdges(Shell.ExternalBoundary(shell))
+        #ext_boundary = Shell.ExternalBoundary(shell)
         if Topology.IsInstance(ext_boundary, "Wire"):
             face = Face.ByWire(ext_boundary, silent=silent)
         elif Topology.IsInstance(ext_boundary, "Cluster"):
@@ -652,8 +653,11 @@ class Face():
             for int_boundary in int_boundaries:
                 temp_wires = Topology.Wires(int_boundary)
                 int_wires.append(Topology.RemoveCollinearEdges(temp_wires[0], angTolerance))
+                #int_wires.append(temp_wires[0])
+
             temp_wires = Topology.Wires(ext_boundary)
             ext_wire = Topology.RemoveCollinearEdges(temp_wires[0], angTolerance)
+            #ext_wire = temp_wires[0]
             face = Face.ByWires(ext_wire, int_wires)
             face = Topology.Unflatten(face, origin=origin, direction=normal)
             return face
@@ -1635,7 +1639,7 @@ class Face():
                 return plane
             return [coef / norm for coef in plane]
 
-        def are_planes_coplanar(plane1, plane2, tolerance):
+        def are_planes_coplanar(plane1, plane2, tolerance=0.0001):
             normalized_plane1 = normalize_plane_coefficients(plane1)
             normalized_plane2 = normalize_plane_coefficients(plane2)
             return np.allclose(normalized_plane1, normalized_plane2, atol=tolerance)
@@ -1840,7 +1844,7 @@ class Face():
             # Return the average angle
             return np.mean(angles)
 
-        def vertex_part_of_face(vertex, face, tolerance):
+        def vertex_part_of_face(vertex, face, tolerance=0.0001):
             vertices = Topology.Vertices(face)
             for v in vertices:
                 if Vertex.Distance(vertex, v) < tolerance:
@@ -2573,9 +2577,13 @@ class Face():
         """
         from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
-
+        import inspect
+        
         if not Topology.IsInstance(face, "Face"):
             print("Face.RemoveCollinearEdges - Error: The input face parameter is not a valid face. Returning None.")
+            curframe = inspect.currentframe()
+            calframe = inspect.getouterframes(curframe, 2)
+            print('caller name:', calframe[1][3])
             return None
         eb = Wire.RemoveCollinearEdges(Face.Wire(face), angTolerance=angTolerance, tolerance=tolerance)
         ib = [Wire.RemoveCollinearEdges(w, angTolerance=angTolerance, tolerance=tolerance) for w in Face.InternalBoundaries(face)]