topologicpy 0.7.94__py3-none-any.whl → 0.7.97__py3-none-any.whl

topologicpy/Cell.py

@@ -348,8 +348,8 @@ class Cell():
         bottomEdges = Topology.Edges(bottomFace)
         for bottomEdge in bottomEdges:
             topEdge = Topology.Translate(bottomEdge, faceNormal[0]*thickness, faceNormal[1]*thickness, faceNormal[2]*thickness)
-            sideEdge1 = Edge.ByVertices([bottomEdge.StartVertex(), topEdge.StartVertex()], tolerance=tolerance, silent=True)
-            sideEdge2 = Edge.ByVertices([bottomEdge.EndVertex(), topEdge.EndVertex()], tolerance=tolerance, silent=True)
+            sideEdge1 = Edge.ByVertices([Edge.StartVertex(bottomEdge), Edge.StartVertex(topEdge)], tolerance=tolerance, silent=True)
+            sideEdge2 = Edge.ByVertices([Edge.EndVertex(bottomEdge), Edge.EndVertex(topEdge)], tolerance=tolerance, silent=True)
             cellWire = Topology.SelfMerge(Cluster.ByTopologies([bottomEdge, sideEdge1, topEdge, sideEdge2]), tolerance=tolerance)
             cellFaces.append(Face.ByWire(cellWire, tolerance=tolerance))
         return Cell.ByFaces(cellFaces, planarize=planarize, tolerance=tolerance)
@@ -485,23 +485,23 @@ class Cell():
                     e3 = None
                     e4 = None
                     try:
-                        e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=True)
+                        e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=True)
                     except:
                         try:
-                            e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=True)
+                            e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=True)
                             faces.append(Face.ByWire(Wire.ByEdges([e1, e2, e4], tolerance=tolerance), tolerance=tolerance))
                         except:
                             pass
                     try:
-                        e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=True)
+                        e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=True)
                     except:
                         try:
-                            e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=True)
+                            e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=True)
                             faces.append(Face.ByWire(Wire.ByEdges([e1, e2, e3], tolerance=tolerance), tolerance=tolerance))
                         except:
                             pass
                     if e3 and e4:
-                        e5 = Edge.ByVertices([e1.StartVertex(), e2.EndVertex()], tolerance=tolerance, silent=True)
+                        e5 = Edge.ByVertices([Edge.StartVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=True)
                         faces.append(Face.ByWire(Wire.ByEdges([e1, e5, e4], tolerance=tolerance), tolerance=tolerance))
                         faces.append(Face.ByWire(Wire.ByEdges([e2, e5, e3], tolerance=tolerance), tolerance=tolerance))
             else:
@@ -511,17 +511,17 @@ class Cell():
                     e3 = None
                     e4 = None
                     try:
-                        e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=True)
+                        e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=True)
                     except:
                         try:
-                            e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=True)
+                            e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=True)
                         except:
                             pass
                     try:
-                        e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=True)
+                        e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=True)
                     except:
                         try:
-                            e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=True)
+                            e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=True)
                         except:
                             pass
                     if e3 and e4:
@@ -764,8 +764,8 @@ class Cell():
             yOffset = max(baseRadius, topRadius)
             zOffset = 0
 
-        baseZ = origin.Z() + zOffset
-        topZ = origin.Z() + zOffset + height
+        baseZ = Vertex.Z(origin) + zOffset
+        topZ = Vertex.Z(origin) + zOffset + height
         baseV = []
         topV = []
         for i in range(uSides):
@@ -913,7 +913,7 @@ class Cell():
             baseY = Vertex.Y(origin, mantissa=mantissa) + yOffset
             size = radius*3
             for i in range(1, vSides):
-                baseZ = origin.Z() + zOffset + float(height)/float(vSides)*i
+                baseZ = Vertex.Z(origin) + zOffset + float(height)/float(vSides)*i
                 tool_origin = Vertex.ByCoordinates(baseX, baseY, baseZ)
                 cutting_planes.append(Face.ByWire(Wire.Rectangle(origin=tool_origin, width=size, length=size), tolerance=tolerance))
             cutting_planes_cluster = Cluster.ByTopologies(cutting_planes)
@@ -950,6 +950,7 @@ class Cell():
             8. "inclinedApertures": list of inclined apertures
 
         """
+        from topologicpy.Vertex import Vertex
         from topologicpy.Face import Face
         from topologicpy.Vector import Vector
         from topologicpy.Aperture import Aperture
@@ -986,7 +987,7 @@ class Cell():
         faces = Cell.Faces(cell)
         zList = []
         for f in faces:
-            zList.append(f.Centroid().Z())
+            zList.append(Vertex.Z(Topology.Centroid(f)))
         zMin = min(zList)
         zMax = max(zList)
         up = [0, 0, 1]
@@ -997,14 +998,14 @@ class Cell():
                 verticalFaces.append(aFace)
                 verticalApertures += getApertures(aFace)
             elif aCode == 1:
-                if abs(aFace.Centroid().Z() - zMin) < tolerance:
+                if abs(Vertex.Z(Topology.Centroid(aFace)) - zMin) < tolerance:
                     bottomHorizontalFaces.append(aFace)
                     bottomHorizontalApertures += getApertures(aFace)
                 else:
                     topHorizontalFaces.append(aFace)
                     topHorizontalApertures += getApertures(aFace)
             elif aCode == 2:
-                if abs(aFace.Centroid().Z() - zMax) < tolerance:
+                if abs(Vertex.Z(Topology.Centroid(aFace)) - zMax) < tolerance:
                     topHorizontalFaces.append(aFace)
                     topHorizontalApertures += getApertures(aFace)
                 else:
@@ -1344,8 +1345,8 @@ class Cell():
         elif placement.lower() == "lowerleft":
             xOffset = max(baseRadius, topRadius)
             yOffset = max(baseRadius, topRadius)
-        baseZ = w_origin.Z() + zOffset
-        topZ = w_origin.Z() + zOffset + height
+        baseZ = Vertex.Z(w_origin) + zOffset
+        topZ = Vertex.Z(w_origin) + zOffset + height
         for i in range(sides):
             angle = math.radians(360/sides)*i
             if baseRadius > 0:
@@ -1789,8 +1790,8 @@ class Cell():
         topV = []
 
         if Topology.IsInstance(profile, "Wire"):
-            baseWire = Topology.Translate(profile, 0 , 0, sv.Z())
-            topWire = Topology.Translate(profile, 0 , 0, sv.Z()+dist)
+            baseWire = Topology.Translate(profile, 0 , 0, Vertex.Z(sv))
+            topWire = Topology.Translate(profile, 0 , 0, Vertex.Z(sv)+dist)
         else:
             for i in range(sides):
                 angle = math.radians(360/sides)*i
@@ -1813,13 +1814,13 @@ class Cell():
         pipe = Topology.Rotate(pipe, origin=sv, axis=[0, 0, 1], angle=phi)
         zzz = Vertex.ByCoordinates(0, 0, 0)
         if endcapA:
-            origin = edge.StartVertex()
+            origin = Edge.StartVertex(edge)
             x1 = Vertex.X(origin, mantissa=mantissa)
             y1 = Vertex.Y(origin, mantissa=mantissa)
             z1 = Vertex.Z(origin, mantissa=mantissa)
-            x2 = Vertex.X(edge.EndVertex(), mantissa=mantissa)
-            y2 = Vertex.Y(edge.EndVertex(), mantissa=mantissa)
-            z2 = Vertex.Z(edge.EndVertex(), mantissa=mantissa)
+            x2 = Vertex.X(Edge.EndVertex(edge), mantissa=mantissa)
+            y2 = Vertex.Y(Edge.EndVertex(edge), mantissa=mantissa)
+            z2 = Vertex.Z(Edge.EndVertex(edge), mantissa=mantissa)
             dx = x2 - x1
             dy = y2 - y1
             dz = z2 - z1    
@@ -1834,13 +1835,13 @@ class Cell():
             endcapA = Topology.Rotate(endcapA, origin=zzz, axis=[0, 0, 1], angle=phi+180)
             endcapA = Topology.Translate(endcapA, Vertex.X(origin, mantissa=mantissa), Vertex.Y(origin, mantissa=mantissa), Vertex.Z(origin, mantissa=mantissa))
         if endcapB:
-            origin = edge.EndVertex()
+            origin = Edge.EndVertex(edge)
             x1 = Vertex.X(origin, mantissa=mantissa)
             y1 = Vertex.Y(origin, mantissa=mantissa)
             z1 = Vertex.Z(origin, mantissa=mantissa)
-            x2 = Vertex.X(edge.StartVertex(), mantissa=mantissa)
-            y2 = Vertex.Y(edge.StartVertex(), mantissa=mantissa)
-            z2 = Vertex.Z(edge.StartVertex(), mantissa=mantissa)
+            x2 = Vertex.X(Edge.StartVertex(edge), mantissa=mantissa)
+            y2 = Vertex.Y(Edge.StartVertex(edge), mantissa=mantissa)
+            z2 = Vertex.Z(Edge.StartVertex(edge), mantissa=mantissa)
             dx = x2 - x1
             dy = y2 - y1
             dz = z2 - z1    

topologicpy/CellComplex.py

@@ -350,10 +350,10 @@ class CellComplex():
                 e3 = None
                 e4 = None
                 try:
-                    e3 = Edge.ByStartVertexEndVertex(e1.StartVertex(), e2.StartVertex(), tolerance=tolerance, silent=True)
+                    e3 = Edge.ByStartVertexEndVertex(Edge.StartVertex(e1), Edge.StartVertex(e2), tolerance=tolerance, silent=True)
                 except:
                     try:
-                        e4 = Edge.ByStartVertexEndVertex(e1.EndVertex(), e2.EndVertex(), tolerance=tolerance, silent=True)
+                        e4 = Edge.ByStartVertexEndVertex(Edge.EndVertex(e1), Edge.EndVertex(e2), tolerance=tolerance, silent=True)
                         f = Face.ByExternalBoundary(Wire.ByEdges([e1, e2, e4], tolerance=tolerance))
                         if triangulate == True:
                             if len(Topology.Vertices(face)) > 3:
@@ -366,10 +366,10 @@ class CellComplex():
                     except:
                         pass
                 try:
-                    e4 = Edge.ByStartVertexEndVertex(e1.EndVertex(), e2.EndVertex(), tolerance=tolerance, silent=True)
+                    e4 = Edge.ByStartVertexEndVertex(Edge.EndVertex(e1), Edge.EndVertex(e2), tolerance=tolerance, silent=True)
                 except:
                     try:
-                        e3 = Edge.ByStartVertexEndVertex(e1.StartVertex(), e2.StartVertex(), tolerance=tolerance, silent=True)
+                        e3 = Edge.ByStartVertexEndVertex(Edge.StartVertex(e1), Edge.StartVertex(e2), tolerance=tolerance, silent=True)
                         f = Face.ByWire(Wire.ByEdges([e1, e2, e3], tolerance=tolerance), tolerance=tolerance)
                         if triangulate == True:
                             if len(Topology.Vertices(face)) > 3:
@@ -383,7 +383,7 @@ class CellComplex():
                         pass
                 if e3 and e4:
                     if triangulate == True:
-                        e5 = Edge.ByStartVertexEndVertex(e1.StartVertex(), e2.EndVertex(), tolerance=tolerance, silent=True)
+                        e5 = Edge.ByStartVertexEndVertex(Edge.StartVertex(e1), Edge.EndVertex(e2), tolerance=tolerance, silent=True)
                         faces.append(Face.ByWire(Wire.ByEdges([e1, e5, e4], tolerance=tolerance), tolerance=tolerance))
                         faces.append(Face.ByWire(Wire.ByEdges([e2, e5, e3], tolerance=tolerance), tolerance=tolerance))
                     else:
@@ -485,6 +485,7 @@ class CellComplex():
             15. "internalInclinedApertures": list of internal inclined apertures
 
         """
+        from topologicpy.Vertex import Vertex
         from topologicpy.Face import Face
         from topologicpy.Vector import Vector
         from topologicpy.Aperture import Aperture
@@ -527,7 +528,7 @@ class CellComplex():
         faces = CellComplex.Faces(cellComplex)
         zList = []
         for f in faces:
-            zList.append(f.Centroid().Z())
+            zList.append(Vertex.Z(Topology.Centroid(f)))
         zMin = min(zList)
         zMax = max(zList)
         up = [0, 0, 1]
@@ -545,7 +546,7 @@ class CellComplex():
                     internalVerticalApertures += getApertures(aFace)
             elif aCode == 1:
                 if n == 1:
-                    if abs(aFace.Centroid().Z() - zMin) < tolerance:
+                    if abs(Vertex.Z(Topology.Centroid(aFace)) - zMin) < tolerance:
                         bottomHorizontalFaces.append(aFace)
                         bottomHorizontalApertures += getApertures(aFace)
                     else:
@@ -556,7 +557,7 @@ class CellComplex():
                     internalHorizontalApertures += getApertures(aFace)
             elif aCode == 2:
                 if n == 1:
-                    if abs(aFace.Centroid().Z() - zMax) < tolerance:
+                    if abs(Vertex.Z(Topology.Centroid(aFace)) - zMax) < tolerance:
                         topHorizontalFaces.append(aFace)
                         topHorizontalApertures += getApertures(aFace)
                     else:

topologicpy/DGL.py

@@ -1633,6 +1633,7 @@ class DGL:
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
         from topologicpy.Graph import Graph
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
@@ -1661,8 +1662,8 @@ class DGL:
 
         for i in range(len(edges)):
             e = edges[i]
-            sv = e.StartVertex()
-            ev = e.EndVertex()
+            sv = Edge.StartVertex(e)
+            ev = Edge.EndVertex(e)
             sn = nodes[Vertex.Index(vertex=sv, vertices=vertices, strict=False, tolerance=tolerance)]
             en = nodes[Vertex.Index(vertex=ev, vertices=vertices, strict=False, tolerance=tolerance)]
             if (([sn,en] in graph_edges) == False) and (([en,sn] in graph_edges) == False):

topologicpy/Edge.py

@@ -427,8 +427,8 @@ class Edge():
         if not Topology.IsInstance(edge, "Edge"):
             print("Edge.Direction - Error: The input edge parameter is not a valid topologic edge. Returning None.")
             return None
-        ev = edge.EndVertex()
-        sv = edge.StartVertex()
+        sv = Edge.StartVertex(edge)
+        ev = Edge.EndVertex(edge)
         x = Vertex.X(ev, mantissa=mantissa) - Vertex.X(sv, mantissa=mantissa)
         y = Vertex.Y(ev, mantissa=mantissa) - Vertex.Y(sv, mantissa=mantissa)
         z = Vertex.Z(ev, mantissa=mantissa) - Vertex.Z(sv, mantissa=mantissa)
@@ -461,7 +461,7 @@ class Edge():
             return None
         vert = None
         try:
-            vert = edge.EndVertex()
+            vert = edge.EndVertex() # Hook to core
         except:
             vert = None
         return vert
@@ -1247,11 +1247,11 @@ class Edge():
             print("Edge.Normalize - Error: The input edge parameter is not a valid topologic edge. Returning None.")
             return None
         if not useEndVertex:
-            sv = edge.StartVertex()
-            ev = Edge.VertexByDistance(edge, 1.0, edge.StartVertex())
+            sv = Edge.StartVertex(edge)
+            ev = Edge.VertexByDistance(edge, 1.0, Edge.StartVertex(edge))
         else:
-            sv = Edge.VertexByDistance(edge, 1.0, edge.StartVertex())
-            ev = edge.EndVertex()
+            sv = Edge.VertexByDistance(edge, 1.0, Edge.StartVertex(edge))
+            ev = Edge.EndVertex(edge)
         return Edge.ByVertices([sv, ev], tolerance=tolerance)
 
     @staticmethod
@@ -1316,7 +1316,7 @@ class Edge():
         if not Topology.IsInstance(edge, "Edge"):
             print("Edge.Reverse - Error: The input edge parameter is not a valid topologic edge. Returning None.")
             return None
-        return Edge.ByVertices([edge.EndVertex(), edge.StartVertex()], tolerance=tolerance)
+        return Edge.ByVertices([Edge.EndVertex(edge), Edge.StartVertex(edge)], tolerance=tolerance)
     
     @staticmethod
     def SetLength(edge , length: float = 1.0, bothSides: bool = True, reverse: bool = False, tolerance: float = 0.0001):
@@ -1375,7 +1375,7 @@ class Edge():
             return None
         vert = None
         try:
-            vert = edge.StartVertex()
+            vert = edge.StartVertex() # Hook to core
         except:
             vert = None
         return vert
@@ -1534,12 +1534,12 @@ class Edge():
             print("Edge.TrimByEdge2D - Error: The input edge parameter is not a valid topologic edge. Returning None.")
             return None
         if not Topology.IsInstance(origin, "Vertex"):
-            origin = edge.StartVertex()
+            origin = Edge.StartVertex(edge)
         if not Topology.IsInstance(origin, "Vertex"):
             print("Edge.TrimByEdge2D - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
             return None
-        sv = edge.StartVertex()
-        ev = edge.EndVertex()
+        sv = Edge.StartVertex(edge)
+        ev = Edge.EndVertex(edge)
         vx = Vertex.X(ev, mantissa=mantissa) - Vertex.X(sv, mantissa=mantissa)
         vy = Vertex.Y(ev, mantissa=mantissa) - Vertex.Y(sv, mantissa=mantissa)
         vz = Vertex.Z(ev, mantissa=mantissa) - Vertex.Z(sv, mantissa=mantissa)
@@ -1572,9 +1572,9 @@ class Edge():
             return None
         vertex = None
         if u == 0:
-            vertex = edge.StartVertex()
+            vertex = Edge.StartVertex(edge)
         elif u == 1:
-            vertex = edge.EndVertex()
+            vertex = Edge.EndVertex(edge)
         else:
             dir = Edge.Direction(edge)
             edge_length = Edge.Length(edge)

topologicpy/EnergyModel.py

@@ -307,7 +307,7 @@ class EnergyModel:
             building_cells = [building]
         for spaceNumber, buildingCell in enumerate(building_cells):
             osSpace = openstudio.model.Space(osModel)
-            osSpaceZ = Vertex.Z(buildingCell.CenterOfMass(), mantissa=mantissa)
+            osSpaceZ = Vertex.Z(Topology.CenterOfMass(buildingCell), mantissa=mantissa)
             osBuildingStory = osBuildingStorys[0]
             for x in osBuildingStorys:
                 osBuildingStoryZ = x.nominalZCoordinate().get()
@@ -372,7 +372,7 @@ class EnergyModel:
                             osSurface.setSurfaceType("RoofCeiling")
                             osSurface.setOutsideBoundaryCondition("Outdoors")
                             osSurface.setName(osSpace.name().get() + "_TopHorizontalSlab_" + str(faceNumber))
-                            if max(list(map(lambda vertex: vertex.Z(), Topology.SubTopologies(buildingFace, "Vertex")))) < 1e-6:
+                            if max(list(map(lambda vertex: Vertex.Z(vertex), Topology.SubTopologies(buildingFace, "Vertex")))) < 1e-6:
                                 osSurface.setSurfaceType("Floor")
                                 osSurface.setOutsideBoundaryCondition("Ground")
                                 osSurface.setName(osSpace.name().get() + "_BottomHorizontalSlab_" + str(faceNumber))
@@ -1039,14 +1039,14 @@ class EnergyModel:
             surfaceEdges = []
             surfaceVertices = surface.vertices()
             for i in range(len(surfaceVertices)-1):
-                sv = Vertex.ByCoordinates(surfaceVertices[i].x(), surfaceVertices[i].y(), surfaceVertices[i].z())
-                ev = Vertex.ByCoordinates(surfaceVertices[i+1].x(), surfaceVertices[i+1].y(), surfaceVertices[i+1].z())
+                sv = Vertex.ByCoordinates(Vertex.X(surfaceVertices[i]), Vertex.Y(surfaceVertices[i]), Vertex.Z(surfaceVertices[i]))
+                ev = Vertex.ByCoordinates(Vertex.X(surfaceVertices[i+1]), Vertex.Y(surfaceVertices[i+1]), Vertex.Z(surfaceVertices[i+1]))
                 edge = Edge.ByStartVertexEndVertex(sv, ev, tolerance=tolerance, silent=False)
                 if not edge:
                     continue
                 surfaceEdges.append(edge)
-            sv = Vertex.ByCoordinates(surfaceVertices[len(surfaceVertices)-1].x(), surfaceVertices[len(surfaceVertices)-1].y(), surfaceVertices[len(surfaceVertices)-1].z())
-            ev = Vertex.ByCoordinates(surfaceVertices[0].x(), surfaceVertices[0].y(), surfaceVertices[0].z())
+            sv = Vertex.ByCoordinates(Vertex.X(surfaceVertices[len(surfaceVertices)-1]), Vertex.Y(surfaceVertices[len(surfaceVertices)-1]), Vertex.Z(surfaceVertices[len(surfaceVertices)-1]))
+            ev = Vertex.ByCoordinates(Vertex.X(surfaceVertices[0]), Vertex.Y(surfaceVertices[0]), Vertex.Z(surfaceVertices[0]))
             edge = Edge.ByStartVertexEndVertex(sv, ev, tolerance=tolerance, silent=False)
             surfaceEdges.append(edge)
             surfaceWire = Wire.ByEdges(surfaceEdges, tolerance=tolerance)
@@ -1057,7 +1057,7 @@ class EnergyModel:
         def addApertures(face, apertures):
             usedFaces = []
             for aperture in apertures:
-                cen = aperture.CenterOfMass()
+                cen = Topology.CenterOfMass(aperture)
                 try:
                     params = face.ParametersAtVertex(cen)
                     u = params[0]