topologicpy 0.7.58__py3-none-any.whl → 0.7.60__py3-none-any.whl

topologicpy/Edge.py

@@ -290,6 +290,7 @@ class Edge():
         """
         from topologicpy.Helper import Helper
         from topologicpy.Topology import Topology
+        import inspect
 
         if len(args) == 0:
             print("Edge.ByVertices - Error: The input vertices parameter is an empty list. Returning None.")
@@ -322,6 +323,9 @@ class Edge():
         if not edge:
             if not silent:
                 print("Edge.ByVertices - Error: Could not create an edge. Returning None.")
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
         return edge
     
     @staticmethod
@@ -1135,17 +1139,22 @@ class Edge():
         from topologicpy.Topology import Topology
 
         def calculate_normal(start_vertex, end_vertex):
-            start_vertex = [float(x) for x in start_vertex]
-            end_vertex = [float(x) for x in end_vertex]
-            # Calculate the direction vector of the line segment
-            direction_vector = np.array(end_vertex) - np.array(start_vertex)
-
-            # Calculate the normal vector by swapping components and negating one of them
-            normal_vector = np.array([-direction_vector[1], direction_vector[0], 0])
-
-            # Normalize the normal vector
-            normal_vector /= norm(normal_vector)
+            start_vertex = np.array([float(x) for x in start_vertex])
+            end_vertex = np.array([float(x) for x in end_vertex])
 
+            # Calculate the direction vector of the edge
+            direction_vector = end_vertex - start_vertex
+            
+            # Handle the horizontal edge case (no Z component)
+            if np.isclose(direction_vector[2], 0):
+                # The edge lies in the X-Y plane; compute a perpendicular in the X-Y plane
+                normal_vector = np.array([-direction_vector[1], direction_vector[0], 0.0])
+            else:
+                # Otherwise, calculate the normal by crossing with the Z-axis
+                z_axis = np.array([0, 0, 1])
+                normal_vector = np.cross(direction_vector, z_axis)
+            
+            normal_vector /= norm(normal_vector)  # Normalize the normal vector
             return normal_vector
 
         def calculate_normal_line(start_vertex, end_vertex):
@@ -1156,7 +1165,7 @@ class Edge():
             normal_end_vertex = np.array(start_vertex) + normal_vector
 
             # Return the start and end vertices of the normal line
-            return start_vertex, list(normal_end_vertex)
+            return start_vertex, normal_end_vertex
 
         if not Topology.IsInstance(edge, "Edge"):
             print("Edge.NormalEdge - Error: The input edge parameter is not a valid edge. Returning None.")
@@ -1164,18 +1173,33 @@ class Edge():
         if length <= 0.0:
             print("Edge.NormalEdge - Error: The input length parameter is not a positive number greater than zero. Returning None.")
             return None
-        edge_direction = Edge.Direction(edge)
-        x, y, z = edge_direction
+
+        # Get start and end vertex coordinates
         start_vertex = Vertex.Coordinates(Edge.StartVertex(edge))
         end_vertex = Vertex.Coordinates(Edge.EndVertex(edge))
+
+        # Calculate the normal line
         normal_line_start, normal_line_end = calculate_normal_line(start_vertex, end_vertex)
-        sv = Vertex.ByCoordinates(normal_line_start)
+
+        # Create the normal edge in Topologic
+        sv = Vertex.ByCoordinates(list(normal_line_start))
         ev = Vertex.ByCoordinates(list(normal_line_end))
+        
+        # Create an edge from the start to the end of the normal vector
         normal_edge = Edge.ByVertices([sv, ev])
+
+        # Set the length of the normal edge
         normal_edge = Edge.SetLength(normal_edge, length, bothSides=False)
-        normal_edge = Topology.Rotate(normal_edge, origin=Edge.StartVertex(normal_edge), axis=[x,y,z], angle=angle)
-        dist = Edge.Length(edge)*u
+
+        # Rotate the normal edge around the input edge by the specified angle
+        edge_direction = Edge.Direction(edge)
+        x, y, z = edge_direction
+        normal_edge = Topology.Rotate(normal_edge, origin=Edge.StartVertex(normal_edge), axis=[x, y, z], angle=angle)
+
+        # Translate the normal edge along the edge direction according to the u parameter
+        dist = Edge.Length(edge) * u
         normal_edge = Topology.TranslateByDirectionDistance(normal_edge, edge_direction, dist)
+
         return normal_edge
 
     @staticmethod

topologicpy/Graph.py

@@ -2407,6 +2407,7 @@ class Graph:
                    idKey: str = "TOPOLOGIC_ID",
                    outpostsKey: str = "outposts",
                    vertexCategoryKey: str = "category",
+                   edgeCategoryKey : str = "category",
                    useInternalVertex: bool =True,
                    storeBREP: bool =False,
                    mantissa: int = 6,
@@ -2439,7 +2440,7 @@ class Graph:
         outpostsKey : str , optional
             The key to use to find the list of outposts. It is case insensitive. The default is "outposts".
         vertexCategoryKey : str , optional
-            The key under which to store the node type. Node types are:
+            The key under which to store the node type. Node categories are:
             0 : main topology
             1 : shared topology
             2 : shared aperture
@@ -2447,7 +2448,17 @@ class Graph:
             4 : exterior aperture
             5 : content
             6 : outpost
-            The default is "node_type".
+            The default is "category".
+        edgeCategoryKey : str , optional
+            The key under which to store the node type. Edge categories are:
+            0 : direct
+            1 : via shared topology
+            2 : via shared aperture
+            3 : to exterior topology
+            4 : to exterior aperture
+            5 : to content
+            6 : to outpost
+            The default is "category".
         useInternalVertex : bool , optional
             If set to True, use an internal vertex to represent the subtopology. Otherwise, use its centroid. The default is False.
         storeBREP : bool , optional
@@ -2599,11 +2610,11 @@ class Graph:
                                 e = Edge.ByStartVertexEndVertex(v1, v2, tolerance=tolerance)
                                 mDict = mergeDictionaries(sharedt)
                                 if not mDict == None:
-                                    keys = (Dictionary.Keys(mDict) or [])+["relationship"]
-                                    values = (Dictionary.Values(mDict) or [])+["Direct"]
+                                    keys = (Dictionary.Keys(mDict) or [])+["relationship", edgeCategoryKey]
+                                    values = (Dictionary.Values(mDict) or [])+["Direct", 0]
                                 else:
-                                    keys = ["relationship"]
-                                    values = ["Direct"]
+                                    keys = ["relationship", edgeCategoryKey]
+                                    values = ["Direct", 0]
                                 mDict = Dictionary.ByKeysValues(keys, values)
                                 if mDict:
                                     e.SetDictionary(mDict)
@@ -2687,7 +2698,7 @@ class Graph:
                     vertices.append(vcc)
                     vertices.append(vop)
                     tempe = Edge.ByStartVertexEndVertex(vcc, vop, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Outposts"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Outposts", 6])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
 
@@ -2737,7 +2748,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["Via_Shared_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["Via_Shared_Topologies", 1])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -2761,7 +2772,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if viaSharedApertures:
@@ -2781,7 +2792,7 @@ class Graph:
                                 _ = vsa.SetDictionary(d1)
                             vertices.append(vsa)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vsa, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["Via_Shared_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["Via_Shared_Apertures", 2])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toExteriorTopologies:
@@ -2801,7 +2812,7 @@ class Graph:
                                 _ = vet.SetDictionary(d1)
                             vertices.append(vet)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vet, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Topologies", 3])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -2825,7 +2836,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vet, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if toExteriorApertures:
@@ -2845,7 +2856,7 @@ class Graph:
                                 _ = vea.SetDictionary(d1)
                             vertices.append(vea)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vea, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Apertures", 4])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toContents:
@@ -2869,7 +2880,7 @@ class Graph:
                                 _ = vcn.SetDictionary(d1)
                             vertices.append(vcn)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vcn, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
 
@@ -2927,7 +2938,7 @@ class Graph:
                     else:
                         vop = Topology.CenterOfMass(outpost)
                     tempe = Edge.ByStartVertexEndVertex(vCell, vop, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Outposts"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Outposts", 6])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
                     d1 = outpost.GetDictionary()
@@ -2965,7 +2976,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Topologies", 3])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -2989,7 +3000,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if toExteriorApertures:
@@ -3009,7 +3020,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Apertures", 4])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toContents:
@@ -3033,7 +3044,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vCell, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
             return [vertices, edges]
@@ -3068,11 +3079,11 @@ class Graph:
                                 e = Edge.ByStartVertexEndVertex(v1, v2, tolerance=tolerance)
                                 mDict = mergeDictionaries(sharedt)
                                 if not mDict == None:
-                                    keys = (Dictionary.Keys(mDict) or [])+["relationship"]
-                                    values = (Dictionary.Values(mDict) or [])+["Direct"]
+                                    keys = (Dictionary.Keys(mDict) or [])+["relationship", edgeCategoryKey]
+                                    values = (Dictionary.Values(mDict) or [])+["Direct", 0]
                                 else:
-                                    keys = ["relationship"]
-                                    values = ["Direct"]
+                                    keys = ["relationship", edgeCategoryKey]
+                                    values = ["Direct", 0]
                                 mDict = Dictionary.ByKeysValues(keys, values)
                                 if mDict:
                                     e.SetDictionary(mDict)
@@ -3157,7 +3168,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["Via_Shared_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["Via_Shared_Topologies", 1])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -3181,7 +3192,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if viaSharedApertures:
@@ -3201,7 +3212,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["Via_Shared_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["Via_Shared_Apertures", 2])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toExteriorTopologies:
@@ -3220,7 +3231,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Apertures", 4])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -3244,7 +3255,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if toExteriorApertures:
@@ -3264,7 +3275,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Apertures", 4])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toContents:
@@ -3288,7 +3299,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
 
@@ -3347,7 +3358,7 @@ class Graph:
                         _ = vop.SetDictionary(d1)
                     vertices.append(vcc)
                     tempe = Edge.ByStartVertexEndVertex(vcc, vop, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Outposts"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Outposts", 6])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
             return [vertices, edges]
@@ -3391,7 +3402,7 @@ class Graph:
                     else:
                         vop = Topology.CenterOfMass(outpost)
                     tempe = Edge.ByStartVertexEndVertex(vFace, vop, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Outposts"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Outposts", 6])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
             if (toExteriorTopologies == True) or (toExteriorApertures == True) or (toContents == True):
@@ -3421,7 +3432,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Topologies", 3])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -3445,7 +3456,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if toExteriorApertures:
@@ -3465,7 +3476,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Apertures", 4])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toContents:
@@ -3489,7 +3500,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vFace, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
             return [vertices, edges]
@@ -3526,11 +3537,11 @@ class Graph:
                                 e = Edge.ByStartVertexEndVertex(v1, v2, tolerance=tolerance)
                                 mDict = mergeDictionaries(sharedt)
                                 if not mDict == None:
-                                    keys = (Dictionary.Keys(mDict) or [])+["relationship"]
-                                    values = (Dictionary.Values(mDict) or [])+["Direct"]
+                                    keys = (Dictionary.Keys(mDict) or [])+["relationship", edgeCategoryKey]
+                                    values = (Dictionary.Values(mDict) or [])+["Direct", 0]
                                 else:
-                                    keys = ["relationship"]
-                                    values = ["Direct"]
+                                    keys = ["relationship", edgeCategoryKey]
+                                    values = ["Direct", 0]
                                 mDict = Dictionary.ByKeysValues(keys, values)
                                 if mDict:
                                     e.SetDictionary(mDict)
@@ -3624,7 +3635,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vEdge, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["Via_Shared_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["Via_Shared_Topologies", 1])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -3648,7 +3659,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if viaSharedApertures:
@@ -3668,7 +3679,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vEdge, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["Via_Shared_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["Via_Shared_Apertures", 2])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toExteriorTopologies:
@@ -3676,7 +3687,7 @@ class Graph:
                             vst = exteriorTopology
                             vertices.append(exteriorTopology)
                             tempe = Edge.ByStartVertexEndVertex(vEdge, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Topologies", 3])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -3700,7 +3711,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if toExteriorApertures:
@@ -3720,7 +3731,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vEdge, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Apertures", 4])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     if toContents:
@@ -3744,7 +3755,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vEdge, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
             for anEdge in topEdges:
@@ -3803,7 +3814,7 @@ class Graph:
                         _ = vop.SetDictionary(d1)
                     vertices.append(vop)
                     tempe = Edge.ByStartVertexEndVertex(vcc, vop, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Outposts"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Outposts", 6])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
             
@@ -3854,7 +3865,7 @@ class Graph:
                     else:
                         vop = Topology.CenterOfMass(outpost)
                     tempe = Edge.ByStartVertexEndVertex(vEdge, vop, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Outposts"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Outposts", 6])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
             
@@ -3884,7 +3895,7 @@ class Graph:
                                 _ = vst.SetDictionary(d1)
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vEdge, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Topologies"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Topologies", 3])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                             if toContents:
@@ -3908,7 +3919,7 @@ class Graph:
                                         _ = vst2.SetDictionary(d1)
                                     vertices.append(vst2)
                                     tempe = Edge.ByStartVertexEndVertex(vst, vst2, tolerance=tolerance)
-                                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                                     _ = tempe.SetDictionary(tempd)
                                     edges.append(tempe)
                     if toExteriorApertures:
@@ -3929,7 +3940,7 @@ class Graph:
                             _ = vst.SetDictionary(exTop.GetDictionary())
                             vertices.append(vst)
                             tempe = Edge.ByStartVertexEndVertex(vEdge, vst, tolerance=tolerance)
-                            tempd = Dictionary.ByKeysValues(["relationship"],["To_Exterior_Apertures"])
+                            tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Exterior_Apertures", 4])
                             _ = tempe.SetDictionary(tempd)
                             edges.append(tempe)
                     
@@ -3961,7 +3972,7 @@ class Graph:
                         _ = vst.SetDictionary(d1)
                     vertices.append(vst)
                     tempe = Edge.ByStartVertexEndVertex(topology, vst, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Contents"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Contents", 5])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
             
@@ -3986,7 +3997,7 @@ class Graph:
                     else:
                         vop = Topology.CenterOfMass(outpost)
                     tempe = Edge.ByStartVertexEndVertex(topology, vop, tolerance=tolerance)
-                    tempd = Dictionary.ByKeysValues(["relationship"],["To_Outposts"])
+                    tempd = Dictionary.ByKeysValues(["relationship", edgeCategoryKey],["To_Outposts", 6])
                     _ = tempe.SetDictionary(tempd)
                     edges.append(tempe)
             
@@ -8072,7 +8083,11 @@ class Graph:
         return shortestPaths
 
     @staticmethod
-    def Show(graph, vertexColor="black",
+    def Show(graph,
+             sagitta = 0,
+             absolute = False,
+             sides = 8,
+             vertexColor="black",
              vertexSize=6,
              vertexLabelKey=None,
              vertexGroupKey=None,
@@ -8112,6 +8127,13 @@ class Graph:
         ----------
         graph : topologic_core.Graph
             The input graph.
+        sagitta : float , optional
+            The length of the sagitta. In mathematics, the sagitta is the line connecting the center of a chord to the apex (or highest point) of the arc subtended by that chord. The default is 0 which means a straight edge is drawn instead of an arc. The default is 0.
+        absolute : bool , optional
+            If set to True, the sagitta length is treated as an absolute value. Otherwise, it is treated as a ratio based on the length of the edge. The default is False.
+            For example, if the length of the edge is 10, the sagitta is set to 0.5, and absolute is set to False, the sagitta length will be 5. The default is True.
+        sides : int , optional
+            The number of sides of the arc. The default is 8.
         vertexColor : str , optional
             The desired color of the output vertices. This can be any plotly color string and may be specified as:
             - A hex string (e.g. '#ff0000')
@@ -8212,7 +8234,7 @@ class Graph:
             print("Graph.Show - Error: The input graph is not a valid graph. Returning None.")
             return None
         
-        data= Plotly.DataByGraph(graph, vertexColor=vertexColor, vertexSize=vertexSize, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, vertexGroups=vertexGroups, showVertices=showVertices, showVertexLabels=showVertexLabels, showVertexLegend=showVertexLegend, edgeColor=edgeColor, edgeWidth=edgeWidth, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, edgeGroups=edgeGroups, showEdges=showEdges, showEdgeLabels=showEdgeLabels, showEdgeLegend=showEdgeLegend, colorScale=colorScale)
+        data= Plotly.DataByGraph(graph, sagitta=sagitta, absolute=absolute, sides=sides, vertexColor=vertexColor, vertexSize=vertexSize, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, vertexGroups=vertexGroups, showVertices=showVertices, showVertexLabels=showVertexLabels, showVertexLegend=showVertexLegend, edgeColor=edgeColor, edgeWidth=edgeWidth, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, edgeGroups=edgeGroups, showEdges=showEdges, showEdgeLabels=showEdgeLabels, showEdgeLegend=showEdgeLegend, colorScale=colorScale)
         fig = Plotly.FigureByData(data, width=width, height=height, xAxis=xAxis, yAxis=yAxis, zAxis=zAxis, axisSize=axisSize, backgroundColor=backgroundColor,
                                   marginLeft=marginLeft, marginRight=marginRight, marginTop=marginTop, marginBottom=marginBottom, tolerance=tolerance)
         Plotly.Show(fig, renderer=renderer, camera=camera, center=center, up=up, projection=projection)

topologicpy/Plotly.py

@@ -273,6 +273,9 @@ class Plotly:
 
     @staticmethod
     def DataByGraph(graph,
+                    sagitta: float = 0,
+                    absolute: bool = False,
+                    sides: int = 8,
                     vertexColor: str = "black",
                     vertexSize: float = 6,
                     vertexLabelKey: str = None,
@@ -298,6 +301,13 @@ class Plotly:
         ----------
         graph : topologic_core.Graph
             The input graph.
+        sagitta : float , optional
+            The length of the sagitta. In mathematics, the sagitta is the line connecting the center of a chord to the apex (or highest point) of the arc subtended by that chord. The default is 0 which means a straight edge is drawn instead of an arc. The default is 0.
+        absolute : bool , optional
+            If set to True, the sagitta length is treated as an absolute value. Otherwise, it is treated as a ratio based on the length of the edge. The default is False.
+            For example, if the length of the edge is 10, the sagitta is set to 0.5, and absolute is set to False, the sagitta length will be 5. The default is True.
+        sides : int , optional
+            The number of sides of the arc. The default is 8.
         vertexColor : str , optional
             The desired color of the output vertices. This can be any plotly color string and may be specified as:
             - A hex string (e.g. '#ff0000')
@@ -352,6 +362,7 @@ class Plotly:
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
+        from topologicpy.Wire import Wire
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
         from topologicpy.Graph import Graph
@@ -431,9 +442,23 @@ class Plotly:
             e_labels = []
             e_groupList = []
             edges = Graph.Edges(graph)
+            new_edges = []
+            if sagitta > 0:
+                for edge in edges:
+                    d = Topology.Dictionary(edge)
+                    arc = Wire.ArcByEdge(edge, sagitta=sagitta, absolute=absolute, sides=sides, close=False)
+                    if Topology.IsInstance(arc, "Wire"):
+                        arc_edges = Topology.Edges(arc)
+                        for arc_edge in arc_edges:
+                            arc_edge = Topology.SetDictionary(arc_edge, d)
+                            new_edges.append(arc_edge)
+                    else:
+                        new_edges.append(edge)
+            else:
+                new_edges = edges
                 
             if edgeLabelKey or edgeGroupKey:
-                for e in edges:
+                for e in new_edges:
                     sv = Edge.StartVertex(e)
                     ev = Edge.EndVertex(e)
                     Xe+=[Vertex.X(sv, mantissa=mantissa), Vertex.X(ev, mantissa=mantissa), None] # x-coordinates of edge ends
@@ -455,7 +480,7 @@ class Plotly:
                         e_label = e_label+" ("+e_group+")"
                     e_labels.append(e_label)
             else:
-                for e in edges:
+                for e in new_edges:
                     sv = Edge.StartVertex(e)
                     ev = Edge.EndVertex(e)
                     Xe+=[Vertex.X(sv, mantissa=mantissa), Vertex.X(ev, mantissa=mantissa), None] # x-coordinates of edge ends

topologicpy/Vector.py

@@ -955,7 +955,6 @@ class Vector(list):
                 transformation_matrix = rotation_matrix
             
             return transformation_matrix
-
         tran_mat = transformation_matrix(vectorA, vectorB)
         
         return [list(tran_mat[0]), list(tran_mat[1]), list(tran_mat[2]), list(tran_mat[3])]

topologicpy/Wire.py

@@ -23,24 +23,26 @@ import itertools
 
 class Wire():
     @staticmethod
-    def Arc(startVertex, middleVertex, endVertex, sides: int = 16, close: bool = True, tolerance: float = 0.0001):
+    def Arc(startVertex, middleVertex, endVertex, sides: int = 16, close: bool = True, tolerance: float = 0.0001, silent: bool = False):
         """
         Creates an arc. The base chord will be parallel to the x-axis and the height will point in the positive y-axis direction. 
 
         Parameters
         ----------
         startVertex : topologic_core.Vertex
-            The location of the start vertex of the arc.
+            The start vertex of the arc.
         middleVertex : topologic_core.Vertex
-            The location of the middle vertex (apex) of the arc.
+            The middle vertex (apex) of the arc.
         endVertex : topologic_core.Vertex
-            The location of the end vertex of the arc.
+            The end vertex of the arc.
         sides : int , optional
             The number of sides of the arc. The default is 16.
         close : bool , optional
             If set to True, the arc will be closed by connecting the last vertex to the first vertex. Otherwise, it will be left open.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -49,68 +51,165 @@ class Wire():
 
         """
         from topologicpy.Vertex import Vertex
-        from topologicpy.Edge import Edge
         from topologicpy.Wire import Wire
-        from topologicpy.Vector import Vector
+        from topologicpy.Topology import Topology
         import numpy as np
-        
 
-        def calculate_circle_center_and_radius(sv, mv, ev):
-            """
-            Calculate the center and radius of the circle passing through three points.
-            
-            Parameters:
-            sv (tuple): The start vertex as (x, y, z).
-            mv (tuple): The middle vertex as (x, y, z).
-            ev (tuple): The end vertex as (x, y, z).
-            
-            Returns:
-            tuple: The center of the circle as (x, y, z) and the radius.
-            """
-            # Convert points to numpy arrays for easier manipulation
-            A = np.array(sv)
-            B = np.array(mv)
-            C = np.array(ev)
-            
-            # Calculate the lengths of the sides of the triangle
-            a = np.linalg.norm(B - C)
-            b = np.linalg.norm(C - A)
-            c = np.linalg.norm(A - B)
-            
-            # Calculate the circumcenter using the formula
-            D = 2 * (A[0] * (B[1] - C[1]) + B[0] * (C[1] - A[1]) + C[0] * (A[1] - B[1]))
-            Ux = ((A[0]**2 + A[1]**2) * (B[1] - C[1]) + (B[0]**2 + B[1]**2) * (C[1] - A[1]) + (C[0]**2 + C[1]**2) * (A[1] - B[1])) / D
-            Uy = ((A[0]**2 + A[1]**2) * (C[0] - B[0]) + (B[0]**2 + B[1]**2) * (A[0] - C[0]) + (C[0]**2 + C[1]**2) * (B[0] - A[0])) / D
-            center = np.array([Ux, Uy, A[2]])
-            
-            # Calculate the radius
-            radius = np.linalg.norm(center - A)
+        def circle_arc_points(p1, p2, p3, n):
+            # Convert points to numpy arrays
+            p1, p2, p3 = np.array(p1), np.array(p2), np.array(p3)
+
+            # Calculate vectors
+            v1 = p2 - p1
+            v2 = p3 - p1
+
+            # Find the normal to the plane containing the three points
+            normal = np.cross(v1, v2)
+            normal = normal / np.linalg.norm(normal)
+
+            # Calculate midpoints of p1-p2 and p1-p3
+            midpoint1 = (p1 + p2) / 2
+            midpoint2 = (p1 + p3) / 2
+
+            # Find the circumcenter using the perpendicular bisectors
+            def perpendicular_bisector(pA, pB, midpoint):
+                direction = np.cross(normal, pB - pA)
+                direction = direction / np.linalg.norm(direction)
+                return direction, midpoint
+
+            direction1, midpoint1 = perpendicular_bisector(p1, p2, midpoint1)
+            direction2, midpoint2 = perpendicular_bisector(p1, p3, midpoint2)
+
+            # Solve for circumcenter
+            A = np.array([direction1, -direction2]).T
+            b = midpoint2 - midpoint1
+            t1, t2 = np.linalg.lstsq(A, b, rcond=None)[0]
             
-            return center, radius
-        
-        
-        e2 = Edge.ByVertices(middleVertex, endVertex)
-        
-        center, radius = calculate_circle_center_and_radius(Vertex.Coordinates(startVertex), Vertex.Coordinates(middleVertex), Vertex.Coordinates(endVertex))
-        center = Vertex.ByCoordinates(list(center))
-        
-        e1 = Edge.ByVertices(center, startVertex)
-        e2 = Edge.ByVertices(center, endVertex)
-        ang1 = Vector.CompassAngle(Vector.North(), Edge.Direction(e1))
-        ang2 = Vector.CompassAngle(Vector.North(), Edge.Direction(e2))
-        arc1 = Wire.Circle(origin=center, radius=radius, fromAngle=ang1, toAngle=ang2, sides=sides*4, close=False)
-        arc2 = Wire.Circle(origin=center, radius=radius, fromAngle=ang2, toAngle=ang1, sides=sides*4, close=False)
-        if Vertex.IsInternal(middleVertex, arc1):
-            arc = arc1
-        else:
-            arc = arc2
-        final_vertices = []
-        for i in range(sides+1):
-            v = Wire.VertexByParameter(arc, float(i)/float(sides))
-            final_vertices.append(v)
-        arc = Wire.ByVertices(final_vertices, close=close)
+            circumcenter = midpoint1 + t1 * direction1
+
+            # Calculate radius
+            radius = np.linalg.norm(circumcenter - p1)
+
+            # Generate points along the arc
+            def interpolate_on_arc(p_start, p_end, center, radius, n_points):
+                v_start = p_start - center
+                v_end = p_end - center
+                
+                angle_between = np.arccos(np.dot(v_start, v_end) / (np.linalg.norm(v_start) * np.linalg.norm(v_end)))
+                axis = np.cross(v_start, v_end)
+                axis = axis / np.linalg.norm(axis)
+                
+                angles = np.linspace(0, angle_between, n_points)
+                arc_points = []
+                
+                for angle in angles:
+                    rotation_matrix = rotation_matrix_around_axis(axis, angle)
+                    point_on_arc = center + np.dot(rotation_matrix, v_start)
+                    arc_points.append(point_on_arc)
+                
+                return arc_points
+
+            # Helper function to rotate a point around an arbitrary axis
+            def rotation_matrix_around_axis(axis, theta):
+                cos_theta = np.cos(theta)
+                sin_theta = np.sin(theta)
+                x, y, z = axis
+                return np.array([
+                    [cos_theta + x*x*(1-cos_theta), x*y*(1-cos_theta) - z*sin_theta, x*z*(1-cos_theta) + y*sin_theta],
+                    [y*x*(1-cos_theta) + z*sin_theta, cos_theta + y*y*(1-cos_theta), y*z*(1-cos_theta) - x*sin_theta],
+                    [z*x*(1-cos_theta) - y*sin_theta, z*y*(1-cos_theta) + x*sin_theta, cos_theta + z*z*(1-cos_theta)]
+                ])
+
+            # Get points on the arc from p1 to p3 via p2
+            arc1 = interpolate_on_arc(p1, p2, circumcenter, radius, n//2)
+            arc2 = interpolate_on_arc(p2, p3, circumcenter, radius, n//2)
+
+            return np.vstack([arc1, arc2])
+        
+        if not Topology.IsInstance(startVertex, "Vertex"):
+            if not silent:
+                print("Wire.Arc - Error: The input startVertex is not a valid vertex. Returning None.")
+            return None
+        if not Topology.IsInstance(middleVertex, "Vertex"):
+            if not silent:
+                print("Wire.Arc - Error: The input middleVertex is not a valid vertex. Returning None.")
+            return None
+        if not Topology.IsInstance(endVertex, "Vertex"):
+            if not silent:
+                print("Wire.Arc - Error: The input endVertex is not a valid vertex. Returning None.")
+            return None
+        arc_points = circle_arc_points(np.array(Vertex.Coordinates(startVertex)), np.array(Vertex.Coordinates(middleVertex)), np.array(Vertex.Coordinates(endVertex)), sides)
+        vertices = []
+        for arc_point in arc_points:
+            vertices.append(Vertex.ByCoordinates(list(arc_point)))
+        arc = Wire.ByVertices(vertices, close=False)
+        if not Topology.IsInstance(arc, "Wire"):
+            if not silent:
+                print("Wire.Arc - Error: Could not create an arc. Returning None.")
+            return None
+        # Reinterpolate the arc with equal segments
+        vertices = []
+        for i in range(0,sides+1,1):
+            u = i/sides
+            v = Wire.VertexByParameter(arc, u)
+            vertices.append(v)
+        arc = Wire.ByVertices(vertices, close=close)
+        if not Topology.IsInstance(arc, "Wire"):
+            if not silent:
+                print("Wire.Arc - Error: Could not create an arc. Returning None.")
+            return None
         return arc
     
+    def ArcByEdge(edge, sagitta: float = 1, absolute: bool = True, sides: int = 16, close: bool = True, tolerance: float = 0.0001, silent: bool = False):
+        """
+        Creates an arc. The base chord will be parallel to the x-axis and the height will point in the positive y-axis direction. 
+
+        Parameters
+        ----------
+        edge : topologic_core.Edge
+            The location of the start vertex of the arc.
+        sagitta : float , optional
+            The length of the sagitta. In mathematics, the sagitta is the line connecting the center of a chord to the apex (or highest point) of the arc subtended by that chord. The default is 1.
+        absolute : bool , optional
+            If set to True, the sagitta length is treated as an absolute value. Otherwise, it is treated as a ratio based on the length of the edge.
+            For example, if the length of the edge is 10, the sagitta is set to 0.5, and absolute is set to False, the sagitta length will be 5. The default is True.
+        sides : int , optional
+            The number of sides of the arc. The default is 16.
+        close : bool , optional
+            If set to True, the arc will be closed by connecting the last vertex to the first vertex. Otherwise, it will be left open.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+
+        Returns
+        -------
+        topologic_core.Wire
+            The created arc.
+
+        """
+        from topologicpy.Edge import Edge
+        from topologicpy.Wire import Wire
+        from topologicpy.Topology import Topology
+
+        if not Topology.IsInstance(edge, "Edge"):
+            if not silent:
+                print("Wire.ArcByEdge - Error: The input edge parameter is not a valid edge. Returning None.")
+            return None
+        if sagitta <= 0:
+            if not silent:
+                print("Wire.ArcByEdge - Error: The input sagitta parameter is not a valid positive number. Returning None.")
+            return None
+        sv = Edge.StartVertex(edge)
+        ev = Edge.EndVertex(edge)
+        if absolute == True:
+            length = sagitta
+        else:
+            length = Edge.Length(edge)*sagitta
+        norm = Edge.NormalEdge(edge, length=length)
+        cv = Edge.EndVertex(norm)
+        return Wire.Arc(sv, cv, ev, sides=sides, close=close)
+    
     @staticmethod
     def BoundingRectangle(topology, optimize: int = 0, mantissa: int = 6, tolerance=0.0001):
         """

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.58'
+__version__ = '0.7.60'

{topologicpy-0.7.58.dist-info → topologicpy-0.7.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.58
+Version: 0.7.60
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.58.dist-info → topologicpy-0.7.60.dist-info}/RECORD

@@ -8,29 +8,29 @@ topologicpy/Color.py,sha256=FrxX2yILqWvYrqD8kBaknfMfOR_phJOmhvTvFc07bY4,18065
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=cURg452wwk2WeSxWY46ncgAUo5XD1c2c5EtO6ESZHaY,27304
-topologicpy/Edge.py,sha256=vhYHkobSLGSWV-oe2oJFFDobqFToDyb7s71yQ840AAA,65166
+topologicpy/Edge.py,sha256=7Mxu9w9AY8uEk-xJpwMlWkuAgK96YIvUo0jtS5xuPq0,66123
 topologicpy/EnergyModel.py,sha256=NM3_nAdY9_YDtbp9CaEZ0x0xVsetTqVDzm_VSjmq_mI,53746
 topologicpy/Face.py,sha256=YjU6TxxW2Mf5InumMvzXUXVVRdtjxyRGauRIhGXzkao,116411
-topologicpy/Graph.py,sha256=6jeS8ViWSdSoieISY0iZnZN19f6Ow0WRtF68SoA6s3E,408932
+topologicpy/Graph.py,sha256=NoHGYCCoCFP2nDLrzkM7x4hpemo6KiVeOq5Cm0BR78c,411204
 topologicpy/Grid.py,sha256=3-sn7CHWGcXk18XCnHjsUttNJTWwmN63g_Insj__p04,18218
 topologicpy/Helper.py,sha256=i-AfI29NMsZXBaymjilfvxQbuS3wpYbpPw4RWu1YCHs,16358
 topologicpy/Honeybee.py,sha256=Oc8mfGBNSjs6wxkPzCKmEw1ZPQPbp9XtiYWaAF62oSk,21893
 topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=BezQ-sdpU8B0W4X_kaF7alZrlN0-h4779HFrB3Fsn-w,22033
-topologicpy/Plotly.py,sha256=_cgTZmMhp2EOWNazA-GGBgPy5tx_vdl-6hVl0xjhp90,106526
+topologicpy/Plotly.py,sha256=FeRneK3QfMdWZzwnr2lLWvFLQIjwuyq9ms-DghvuZnI,108134
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 topologicpy/Shell.py,sha256=joahFtpRQTWJpQOmi3qU4Xe0Sx2XXeayHlXTNx8CzMk,87610
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
 topologicpy/Topology.py,sha256=cFYSb93kxqcsdGLdeVcdE9td-KZ9X967sEn98NQAYfM,397243
-topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
+topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=bLY60YWoMsgCgHk7F7k9F93Sq2FJ6AzUcTfJ83NZfHA,71107
-topologicpy/Wire.py,sha256=OoPb7SJl0VpZDZpGL0-VkYJ35zPANS7gHDt9tixOSxc,157629
+topologicpy/Wire.py,sha256=rGLAwjd5p80rxvkOkcrE1MPXkU9oZ1iRK7n_wOTLbd0,162382
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=_LZYqF4sncRmxYtm8gZrX2loMxAZar5Q6FHbJDatzH0,23
-topologicpy-0.7.58.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.58.dist-info/METADATA,sha256=XLAiGFSE_Wlh15I97O2XsTqjKkgBWhqoi4iHYCwr1HQ,10918
-topologicpy-0.7.58.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-topologicpy-0.7.58.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.58.dist-info/RECORD,,
+topologicpy/version.py,sha256=OPMe-rPXSkz9Cu9DTdHOcBcmqfzAZp01-uadL4eOXFY,23
+topologicpy-0.7.60.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.60.dist-info/METADATA,sha256=zVoxaGqEvSXMGH8W2SJlq4eqAF7XCCZDWEDTjPSSNhw,10918
+topologicpy-0.7.60.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+topologicpy-0.7.60.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.60.dist-info/RECORD,,