topologicpy 0.7.67__py3-none-any.whl → 0.7.69__py3-none-any.whl

topologicpy/Cell.py

@@ -165,7 +165,7 @@ class Cell():
                     finalFaces.append(f)
             finalFinalFaces = []
             for f in finalFaces:
-                vertices = Face.Vertices(f)
+                vertices = Topology.Vertices(f)
                 w = Wire.Cycles(Face.ExternalBoundary(f), maxVertices=len(vertices))[0]
                 f1 = Face.ByWire(w, tolerance=tolerance, silent=True)
                 if Topology.IsInstance(f1, "Face"):
@@ -1157,6 +1157,7 @@ class Cell():
 
         from topologicpy.Vertex import Vertex
         from topologicpy.Wire import Wire
+        from topologicpy.CellComplex import CellComplex
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
 
@@ -1194,7 +1195,7 @@ class Cell():
         c = Wire.ByVertices(new_verts, close=False)
         egg = Topology.Spin(c, origin=Vertex.Origin(), triangulate=False, direction=[0, 0, 1], angle=360, sides=uSides, tolerance=tolerance)
         if Topology.IsInstance(egg, "CellComplex"):
-            egg = egg.ExternalBoundary()
+            egg = CellComplex.ExternalBoundary(egg)
         if Topology.IsInstance(egg, "Shell"):
             egg = Cell.ByShell(egg)
         egg = Topology.Scale(egg, origin=Vertex.Origin(), x=height, y=height, z=height)
@@ -1232,7 +1233,7 @@ class Cell():
             print("Cell.ExternalBoundary - Error: The input cell parameter is not a valid topologic cell. Returning None.")
             return None
         try:
-            return cell.ExternalBoundary()
+            return cell.ExternalBoundary() # Hook to Core
         except:
             print("Cell.ExternalBoundary - Error: Could not compute the external boundary. Returning None.")
             return None
@@ -2131,6 +2132,7 @@ class Cell():
 
         from topologicpy.Vertex import Vertex
         from topologicpy.Wire import Wire
+        from topologicpy.CellComplex import CellComplex
         from topologicpy.Topology import Topology
 
         if not Topology.IsInstance(origin, "Vertex"):
@@ -2142,7 +2144,7 @@ class Cell():
         c = Topology.Rotate(c, origin=Vertex.Origin(), axis=[1, 0, 0], angle=90)
         sphere = Topology.Spin(c, origin=Vertex.Origin(), triangulate=False, direction=[0, 0, 1], angle=360, sides=uSides, tolerance=tolerance)
         if Topology.Type(sphere) == Topology.TypeID("CellComplex"):
-            sphere = sphere.ExternalBoundary()
+            sphere = CellComplex.ExternalBoundary(sphere)
         if Topology.Type(sphere) == Topology.TypeID("Shell"):
             sphere = Cell.ByShell(sphere)
         if placement.lower() == "bottom":

topologicpy/CellComplex.py

@@ -668,24 +668,6 @@ class CellComplex():
         _ = cellComplex.Edges(None, edges) # Hook to Core
         return edges
 
-    @staticmethod
-    def ExternalBoundary(cellComplex):
-        """
-        Returns the external boundary (cell) of the input cellComplex.
-
-        Parameters
-        ----------
-        cellComplex : topologic_core.CellComplex
-            The input cellComplex.
-
-        Returns
-        -------
-        topologic_core.Cell
-            The external boundary of the input cellComplex.
-
-        """
-        return cellComplex.ExternalBoundary()
-
     @staticmethod
     def ExternalBoundary(cellComplex):
         """
@@ -707,7 +689,7 @@ class CellComplex():
         if not Topology.IsInstance(cellComplex, "CellComplex"):
             print("CellComplex.ExternalBoundary - Error: The input cellComplex parameter is not a valid cellComplex. Returning None.")
             return None
-        return cellComplex.ExternalBoundary()
+        return cellComplex.ExternalBoundary() # Hook to Core
     
     @staticmethod
     def ExternalFaces(cellComplex) -> list:
@@ -726,7 +708,7 @@ class CellComplex():
 
         """
         from topologicpy.Cell import Cell
-        cell = cellComplex.ExternalBoundary()
+        cell = CellComplex.ExternalBoundary(cellComplex)
         return Cell.Faces(cell)
 
     @staticmethod

topologicpy/Cluster.py

@@ -248,7 +248,7 @@ class Cluster():
             print("Cluster.CellComplexes - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         cellComplexes = []
-        _ = cluster.CellComplexes(None, cellComplexes)
+        _ = cluster.CellComplexes(None, cellComplexes) # Hook to Core
         return cellComplexes
 
     @staticmethod
@@ -273,7 +273,7 @@ class Cluster():
             print("Cluster.Cells - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         cells = []
-        _ = cluster.Cells(None, cells)
+        _ = cluster.Cells(None, cells) # Hook to Core
         return cells
 
     @staticmethod
@@ -479,7 +479,7 @@ class Cluster():
             print("Cluster.Edges - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         edges = []
-        _ = cluster.Edges(None, edges)
+        _ = cluster.Edges(None, edges) # Hook to Core
         return edges
 
     @staticmethod
@@ -504,7 +504,7 @@ class Cluster():
             print("Cluster.Faces - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         faces = []
-        _ = cluster.Faces(None, faces)
+        _ = cluster.Faces(None, faces) # Hook to Core
         return faces
 
     @staticmethod
@@ -531,14 +531,12 @@ class Cluster():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Cluster.FreeCells - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        allCells = []
-        _ = cluster.Cells(None, allCells)
+        allCells = Cluster.Cells(cluster)
         if len(allCells) < 1:
             return []
         allCellsCluster = Cluster.ByTopologies(allCells)
         freeCells = []
-        cellComplexes = []
-        _ = cluster.CellComplexes(None, cellComplexes)
+        cellComplexes = Cluster.CellComplexes(cluster)
         cellComplexesCells = []
         for cellComplex in cellComplexes:
             tempCells = CellComplex.Cells(cellComplex)
@@ -580,13 +578,11 @@ class Cluster():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Cluster.FreeShells - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        allShells = []
-        _ = cluster.Shells(None, allShells)
+        allShells = Cluster.Shells(cluster)
         if len(allShells) < 1:
             return []
         allShellsCluster = Cluster.ByTopologies(allShells)
-        cells = []
-        _ = cluster.Cells(None, cells)
+        cells = Cluster.Cells(cluster)
         cellsShells = []
         for cell in cells:
             tempShells = Cell.Shells(cell)
@@ -628,13 +624,11 @@ class Cluster():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Cluster.FreeFaces - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        allFaces = []
-        _ = cluster.Faces(None, allFaces)
+        allFaces = Cluster.Faces(cluster)
         if len(allFaces) < 1:
             return []
         allFacesCluster = Cluster.ByTopologies(allFaces)
-        shells = []
-        _ = cluster.Shells(None, shells)
+        shells = Cluster.Shells(cluster)
         shellFaces = []
         for shell in shells:
             tempFaces = Shell.Faces(shell)
@@ -676,13 +670,11 @@ class Cluster():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Cluster.FreeWires - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        allWires = []
-        _ = cluster.Wires(None, allWires)
+        allWires = Cluster.Wires(cluster)
         if len(allWires) < 1:
             return []
         allWiresCluster = Cluster.ByTopologies(allWires)
-        faces = []
-        _ = cluster.Faces(None, faces)
+        faces = Cluster.Faces(cluster)
         facesWires = []
         for face in faces:
             tempWires = Face.Wires(face)
@@ -724,13 +716,11 @@ class Cluster():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Cluster.FreeEdges - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        allEdges = []
-        _ = cluster.Edges(None, allEdges)
+        allEdges = Cluster.Edges(cluster)
         if len(allEdges) < 1:
             return []
         allEdgesCluster = Cluster.ByTopologies(allEdges)
-        wires = []
-        _ = cluster.Wires(None, wires)
+        wires = Cluster.Wires(cluster)
         wireEdges = []
         for wire in wires:
             tempEdges = Wire.Edges(wire)
@@ -772,16 +762,14 @@ class Cluster():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Cluster.FreeVertices - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        allVertices = []
-        _ = cluster.Vertices(None, allVertices)
+        allVertices = Topology.Vertices(cluster)
         if len(allVertices) < 1:
             return []
         allVerticesCluster = Cluster.ByTopologies(allVertices)
-        edges = []
-        _ = cluster.Edges(None, edges)
+        edges = Topology.Edges(cluster)
         edgesVertices = []
         for edge in edges:
-            tempVertices = Edge.Vertices(edge)
+            tempVertices = Topology.Vertices(edge)
             edgesVertices += tempVertices
         if len(edgesVertices) == 0:
             return allVertices
@@ -845,25 +833,25 @@ class Cluster():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Cluster.HighestType - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        cellComplexes = Cluster.CellComplexes(cluster)
+        cellComplexes = Topology.CellComplexes(cluster)
         if len(cellComplexes) > 0:
             return Topology.TypeID("CellComplex")
-        cells = Cluster.Cells(cluster)
+        cells = Topology.Cells(cluster)
         if len(cells) > 0:
             return Topology.TypeID("Cell")
-        shells = Cluster.Shells(cluster)
+        shells = Topology.Shells(cluster)
         if len(shells) > 0:
             return Topology.TypeID("Shell")
-        faces = Cluster.Faces(cluster)
+        faces = Topology.Faces(cluster)
         if len(faces) > 0:
             return Topology.TypeID("Face")
         wires = Cluster.Wires(cluster)
         if len(wires) > 0:
             return Topology.TypeID("Wire")
-        edges = Cluster.Edges(cluster)
+        edges = Topology.Edges(cluster)
         if len(edges) > 0:
             return Topology.TypeID("Edge")
-        vertices = Cluster.Vertices(cluster)
+        vertices = Topology.Vertices(cluster)
         if len(vertices) > 0:
             return Topology.TypeID("Vertex")
     
@@ -1147,10 +1135,10 @@ class Cluster():
 
         """
         import topologicpy
-        from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
         from topologicpy.Wire import Wire
         from topologicpy.Cluster import Cluster
+        from topologicpy.Topology import Topology
         from itertools import combinations
 
         if wire == None:
@@ -1158,7 +1146,7 @@ class Cluster():
         if not Wire.IsClosed(wire):
             print("Cluster.MysticRose - Error: The input wire parameter is not a closed topologic wire. Returning None.")
             return None
-        vertices = Wire.Vertices(wire)
+        vertices = Topology.Vertices(wire)
         indices = list(range(len(vertices)))
         combs = [[comb[0],comb[1]] for comb in combinations(indices, 2) if not (abs(comb[0]-comb[1]) == 1) and not (abs(comb[0]-comb[1]) == len(indices)-1)]
         edges = []
@@ -1190,7 +1178,7 @@ class Cluster():
             print("Cluster.Shells - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         shells = []
-        _ = cluster.Shells(None, shells)
+        _ = cluster.Shells(None, shells) # Hook to Core
         return shells
 
     @staticmethod
@@ -1215,54 +1203,41 @@ class Cluster():
             print("Cluster.Simplify - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         resultingTopologies = []
-        topCC = []
-        _ = cluster.CellComplexes(None, topCC)
-        topCells = []
-        _ = cluster.Cells(None, topCells)
-        topShells = []
-        _ = cluster.Shells(None, topShells)
-        topFaces = []
-        _ = cluster.Faces(None, topFaces)
-        topWires = []
-        _ = cluster.Wires(None, topWires)
-        topEdges = []
-        _ = cluster.Edges(None, topEdges)
-        topVertices = []
-        _ = cluster.Vertices(None, topVertices)
+        topCC = Topology.CellComplexes(cluster)
+        topCells = Topology.Cells(cluster)
+        topShells = Topology.Shells(cluster)
+        topFaces = Topology.Faces(cluster)
+        topWires = Topology.Wires(cluster)
+        topEdges = Topology.Edges(cluster)
+        topVertices = Topology.Vertices(cluster)
         if len(topCC) == 1:
             cc = topCC[0]
-            ccVertices = []
-            _ = cc.Vertices(None, ccVertices)
+            ccVertices = Topology.Vertices(cc)
             if len(topVertices) == len(ccVertices):
                 resultingTopologies.append(cc)
         if len(topCC) == 0 and len(topCells) == 1:
             cell = topCells[0]
-            ccVertices = []
-            _ = cell.Vertices(None, ccVertices)
+            ccVertices = Topology.Vertices(cell)
             if len(topVertices) == len(ccVertices):
                 resultingTopologies.append(cell)
         if len(topCC) == 0 and len(topCells) == 0 and len(topShells) == 1:
             shell = topShells[0]
-            ccVertices = []
-            _ = shell.Vertices(None, ccVertices)
+            ccVertices = Topology.Vertices(shell)
             if len(topVertices) == len(ccVertices):
                 resultingTopologies.append(shell)
         if len(topCC) == 0 and len(topCells) == 0 and len(topShells) == 0 and len(topFaces) == 1:
             face = topFaces[0]
-            ccVertices = []
-            _ = face.Vertices(None, ccVertices)
+            ccVertices = Topology.Vertices(face)
             if len(topVertices) == len(ccVertices):
                 resultingTopologies.append(face)
         if len(topCC) == 0 and len(topCells) == 0 and len(topShells) == 0 and len(topFaces) == 0 and len(topWires) == 1:
             wire = topWires[0]
-            ccVertices = []
-            _ = wire.Vertices(None, ccVertices)
+            ccVertices = Topology.Vertices(wire)
             if len(topVertices) == len(ccVertices):
                 resultingTopologies.append(wire)
         if len(topCC) == 0 and len(topCells) == 0 and len(topShells) == 0 and len(topFaces) == 0 and len(topWires) == 0 and len(topEdges) == 1:
             edge = topEdges[0]
-            ccVertices = []
-            _ = wire.Vertices(None, ccVertices)
+            ccVertices = Topology.Vertices(edge)
             if len(topVertices) == len(ccVertices):
                 resultingTopologies.append(edge)
         if len(topCC) == 0 and len(topCells) == 0 and len(topShells) == 0 and len(topFaces) == 0 and len(topWires) == 0 and len(topEdges) == 0 and len(topVertices) == 1:
@@ -1294,7 +1269,7 @@ class Cluster():
             print("Cluster.Vertices - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         vertices = []
-        _ = cluster.Vertices(None, vertices)
+        _ = cluster.Vertices(None, vertices) # Hook to Core
         return vertices
 
     @staticmethod
@@ -1319,7 +1294,7 @@ class Cluster():
             print("Cluster.Wires - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
         wires = []
-        _ = cluster.Wires(None, wires)
+        _ = cluster.Wires(None, wires) # Hook to Core
         return wires
 
     

topologicpy/Edge.py

@@ -353,7 +353,7 @@ class Edge():
         if not Topology.IsInstance(cluster, "Cluster"):
             print("Edge.ByVerticesCluster - Error: The input cluster parameter is not a valid topologic cluster. Returning None.")
             return None
-        vertices = Cluster.Vertices(cluster)
+        vertices = Topology.Vertices(cluster)
         vertexList = [x for x in vertices if Topology.IsInstance(x, "Vertex")]
         if len(vertexList) < 2:
             print("Edge.ByVerticesCluster - Error: The input cluster parameter contains less than two vertices. Returning None.")

topologicpy/EnergyModel.py

@@ -356,7 +356,7 @@ class EnergyModel:
             if cellFaces:
                 for faceNumber, buildingFace in enumerate(cellFaces):
                     osFacePoints = []
-                    for vertex in Topology.SubTopologies(buildingFace.ExternalBoundary(), "Vertex"):
+                    for vertex in Topology.SubTopologies(Face.ExternalBoundary(buildingFace), "Vertex"):
                         osFacePoints.append(openstudio.Point3d(Vertex.X(vertex, mantissa=mantissa), Vertex.Y(vertex, mantissa=mantissa), Vertex.Z(vertex, mantissa=mantissa)))
                     osSurface = openstudio.model.Surface(osFacePoints, osModel)
                     faceNormal = Face.Normal(buildingFace, mantissa=mantissa)
@@ -387,7 +387,7 @@ class EnergyModel:
                             if len(apertures) > 0:
                                 for apertureFace in apertures:
                                     osSubSurfacePoints = []
-                                    for vertex in Topology.SubTopologies(apertureFace.ExternalBoundary(), "Vertex"):
+                                    for vertex in Topology.SubTopologies(Face.ExternalBoundary(apertureFace), "Vertex"):
                                         osSubSurfacePoints.append(openstudio.Point3d(Vertex.X(vertex, mantissa=mantissa), Vertex.Y(vertex, mantissa=mantissa), Vertex.Z(vertex, mantissa=mantissa)))
                                     osSubSurface = openstudio.model.SubSurface(osSubSurfacePoints, osModel)
                                     apertureFaceNormal = Face.Normal(apertureFace, mantissa=mantissa)
@@ -424,7 +424,7 @@ class EnergyModel:
                         if len(apertures) > 0:
                             for apertureFace in apertures:
                                 osSubSurfacePoints = []
-                                for vertex in Topology.SubTopologies(apertureFace.ExternalBoundary(), "Vertex"):
+                                for vertex in Topology.SubTopologies(Face.ExternalBoundary(apertureFace), "Vertex"):
                                     osSubSurfacePoints.append(openstudio.Point3d(Vertex.X(vertex, mantissa=mantissa), Vertex.Y(vertex, mantissa=mantissa), Vertex.Z(vertex.Z, mantissa=mantissa)))
                                 osSubSurface = openstudio.model.SubSurface(osSubSurfacePoints, osModel)
                                 apertureFaceNormal = Face.Normal(apertureFace, mantissa=mantissa)
@@ -453,7 +453,7 @@ class EnergyModel:
             osShadingGroup = openstudio.model.ShadingSurfaceGroup(osModel)
             for faceIndex, shadingFace in enumerate(Topology.SubTopologies(shadingSurfaces, "Face")):
                 facePoints = []
-                for aVertex in Topology.SubTopologies(shadingFace.ExternalBoundary(), "Vertex"):
+                for aVertex in Topology.SubTopologies(Face.ExternalBoundary(shadingFace), "Vertex"):
                     facePoints.append(openstudio.Point3d(Vertex.X(aVertex, mantissa=mantissa), Vertex.Y(aVertex, mantissa=mantissa), Vertex.Z(aVertex, mantissa=mantissa)))
                 aShadingSurface = openstudio.model.ShadingSurface(facePoints, osModel)
                 faceNormal = Face.Normal(shadingFace, mantissa=mantissa)

topologicpy/Face.py

@@ -64,9 +64,8 @@ class Face():
         if len(wireList) < 1:
             print("Face.AddInternalBoundaries - Warning: The input wires parameter does not contain any valid wires. Returning the input face.")
             return face
-        faceeb = face.ExternalBoundary()
-        faceibList = []
-        _ = face.InternalBoundaries(faceibList)
+        faceeb = Face.ExternalBoundary(face)
+        faceibList = Face.InternalBoundaries(face)
         for wire in wires:
             faceibList.append(wire)
         return Face.ByWires(faceeb, faceibList)
@@ -98,8 +97,7 @@ class Face():
             return face
         if not Topology.IsInstance(cluster, "Cluster"):
             return face
-        wires = []
-        _ = cluster.Wires(None, wires)
+        wires = Topology.Wires(cluster)
         return Face.AddInternalBoundaries(face, wires)
     
     @staticmethod
@@ -637,8 +635,7 @@ class Face():
                 print("Face.ByShell - Error: The operation failed. Returning None.")
                 return None
         elif Topology.IsInstance(ext_boundary, "Cluster"): # The shell has holes.
-            wires = []
-            _ = ext_boundary.Wires(None, wires)
+            wires = Topology.Wires(ext_boundary)
             faces = []
             areas = []
             for wire in wires:
@@ -654,14 +651,11 @@ class Face():
             int_boundaries = list(set(faces) - set([ext_boundary]))
             int_wires = []
             for int_boundary in int_boundaries:
-                temp_wires = []
-                _ = int_boundary.Wires(None, temp_wires)
+                temp_wires = Topology.Wires(int_boundary)
                 int_wires.append(Topology.RemoveCollinearEdges(temp_wires[0], angTolerance))
-            temp_wires = []
-            _ = ext_boundary.Wires(None, temp_wires)
+            temp_wires = Topology.Wires(ext_boundary)
             ext_wire = Topology.RemoveCollinearEdges(temp_wires[0], angTolerance)
             face = Face.ByWires(ext_wire, int_wires)
-           
             face = Topology.Unflatten(face, origin=origin, direction=normal)
             return face
         else:
@@ -701,7 +695,7 @@ class Face():
         if not Wire.IsManifold(wire):
             print("Face.ByThickenedWire - Error: The input wire parameter is not a manifold wire. Returning None.")
             return None
-        three_vertices = Wire.Vertices(wire)[0:3]
+        three_vertices = Topology.Vertices(wire)[0:3]
         temp_w = Wire.ByVertices(three_vertices, close=True)
         flat_face = Face.ByWire(temp_w, tolerance=tolerance)
         origin = Vertex.Origin()
@@ -786,7 +780,7 @@ class Face():
 
         if not Topology.IsInstance(cluster, "Cluster"):
             return None
-        vertices = Cluster.Vertices(cluster)
+        vertices = Topology.Vertices(cluster)
         return Face.ByVertices(vertices, tolerance=tolerance)
 
     @staticmethod
@@ -1076,11 +1070,11 @@ class Face():
             The compactness measure of the input face.
 
         """
+        from topologicpy.Topology import Topology
         from topologicpy.Edge import Edge
 
-        exb = face.ExternalBoundary()
-        edges = []
-        _ = exb.Edges(None, edges)
+        exb = Face.ExternalBoundary(face)
+        edges = Topology.Edges(exb)
         perimeter = 0.0
         for anEdge in edges:
             perimeter = perimeter + abs(Edge.Length(anEdge))
@@ -1148,7 +1142,7 @@ class Face():
         if not Topology.IsInstance(face, "Face"):
             return None
         edges = []
-        _ = face.Edges(None, edges)
+        _ = face.Edges(None, edges) # Hook to Core
         return edges
 
     @staticmethod
@@ -1307,7 +1301,7 @@ class Face():
         from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
-        eb = face.ExternalBoundary()
+        eb = face.ExternalBoundary() # Hook to Core
         return eb
     
     @staticmethod
@@ -1385,7 +1379,7 @@ class Face():
         eb = Topology.Copy(Face.ExternalBoundary(face))
         ib_list = Face.InternalBoundaries(face)
         ib_list = [Topology.Copy(ib) for ib in ib_list]
-        f_vertices = Face.Vertices(face)
+        f_vertices = Topology.Vertices(face)
         if isinstance(radiusKey, str):
             eb = Topology.TransferDictionariesBySelectors(eb, selectors=f_vertices, tranVertices=True)
         eb = Wire.Fillet(eb, radius=radius, radiusKey=radiusKey, tolerance=tolerance)
@@ -1438,12 +1432,12 @@ class Face():
         origin = Topology.Centroid(face)
         flatFace = Topology.Flatten(face, origin=origin, direction=normal)
         world_origin = Vertex.Origin()
-        vertices = Wire.Vertices(Face.ExternalBoundary(flatFace))
+        vertices = Topology.Vertices(Face.ExternalBoundary(flatFace))
         harmonizedEB = Wire.ByVertices(vertices)
         internalBoundaries = Face.InternalBoundaries(flatFace)
         harmonizedIB = []
         for ib in internalBoundaries:
-            ibVertices = Wire.Vertices(ib)
+            ibVertices = Topology.Vertices(ib)
             harmonizedIB.append(Wire.ByVertices(ibVertices))
         harmonizedFace = Face.ByWires(harmonizedEB, harmonizedIB, tolerance=tolerance)
         harmonizedFace = Topology.Unflatten(harmonizedFace, origin=origin, direction=normal)
@@ -1511,7 +1505,7 @@ class Face():
         if not Topology.IsInstance(face, "Face"):
             return None
         wires = []
-        _ = face.InternalBoundaries(wires)
+        _ = face.InternalBoundaries(wires) # Hook to Core
         return list(wires)
 
     @staticmethod
@@ -1573,7 +1567,7 @@ class Face():
         if not Topology.IsInstance(face, "Face"):
             return None
         eb = Face.ExternalBoundary(face)
-        vertices = Wire.Vertices(eb)
+        vertices = Topology.Vertices(eb)
         vertices.reverse()
         inverted_wire = Wire.ByVertices(vertices)
         internal_boundaries = Face.InternalBoundaries(face)
@@ -1693,8 +1687,7 @@ class Face():
         from topologicpy.Vector import Vector
 
         def vertexPartofFace(vertex, face, tolerance):
-            vertices = []
-            _ = face.Vertices(None, vertices)
+            vertices = Topology.Vertices(face)
             for v in vertices:
                 if Vertex.Distance(vertex, v) < tolerance:
                     return True
@@ -1874,12 +1867,12 @@ class Face():
                 medialAxisEdges.append(e)
 
         extBoundary = Face.ExternalBoundary(flatFace)
-        extVertices = Wire.Vertices(extBoundary)
+        extVertices = Topology.Vertices(extBoundary)
 
         intBoundaries = Face.InternalBoundaries(flatFace)
         intVertices = []
         for ib in intBoundaries:
-            intVertices = intVertices+Wire.Vertices(ib)
+            intVertices = intVertices+Topology.Vertices(ib)
         
         theVertices = []
         if internalVertices:
@@ -2153,9 +2146,8 @@ class Face():
         if not Topology.IsInstance(faceB, "Face"):
             return None
 
-        eb = faceA.ExternalBoundary()
-        ib_list = []
-        _ = faceA.InternalBoundaries(ib_list)
+        eb = Face.ExternalBoundary(faceA)
+        ib_list = Face.InternalBoundaries(faceA)
         p_eb = Wire.Project(wire=eb, face = faceB, direction=direction, mantissa=mantissa, tolerance=tolerance)
         p_ib_list = []
         for ib in ib_list:
@@ -2539,14 +2531,14 @@ class Face():
             
             from topologicpy.Vertex import Vertex
             from topologicpy.Wire import Wire
-            from topologicpy.Face import Face
+            from topologicpy.Topology import Topology
 
             if not Topology.IsInstance(face, "Face"):
                 print("Face.Triangulate - Error: The input face parameter is not a valid face. Returning None.")
                 return None
             if not meshSize:
                 bounding_face = Face.BoundingRectangle(face)
-                bounding_face_vertices = Face.Vertices(bounding_face)
+                bounding_face_vertices = Topology.Vertices(bounding_face)
                 bounding_face_vertices_x = [Vertex.X(i, mantissa=mantissa) for i in bounding_face_vertices]
                 bounding_face_vertices_y = [Vertex.Y(i, mantissa=mantissa) for i in bounding_face_vertices]
                 width = max(bounding_face_vertices_x)-min(bounding_face_vertices_x)
@@ -2555,7 +2547,7 @@ class Face():
             
             gmsh.initialize()
             face_external_boundary = Face.ExternalBoundary(face)
-            external_vertices = Wire.Vertices(face_external_boundary)
+            external_vertices = Topology.Vertices(face_external_boundary)
             external_vertex_number = len(external_vertices)
             for i in range(external_vertex_number):
                 gmsh.model.geo.addPoint(Vertex.X(external_vertices[i], mantissa=mantissa), Vertex.Y(external_vertices[i], mantissa=mantissa), Vertex.Z(external_vertices[i], mantissa=mantissa), meshSize, i+1)
@@ -2779,7 +2771,7 @@ class Face():
         if not Topology.IsInstance(face, "Face"):
             return None
         vertices = []
-        _ = face.Vertices(None, vertices)
+        _ = face.Vertices(None, vertices) # Hook to Core
         return vertices
     
     @staticmethod
@@ -2821,5 +2813,5 @@ class Face():
         if not Topology.IsInstance(face, "Face"):
             return None
         wires = []
-        _ = face.Wires(None, wires)
+        _ = face.Wires(None, wires) # Hook to Core
         return wires