topologicpy 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

topologicpy/Graph.py

@@ -337,7 +337,7 @@ class Graph:
                         elif (len(gk) < 1) and (len(vk) > 0):
                             d = vd
                         if d:
-                            _ = Topology.SetDictionary(gv,d)
+                            _ = Topology.SetDictionary(gv, d)
                     unique = False
                     returnVertex = gv
                     break
@@ -858,7 +858,7 @@ class Graph:
         # Iterate through the grouped nodes DataFrames
         for graph_id, group_node_df in grouped_nodes:
             vertices = []
-            verts = [] #This is a list of x,y,z tuples to make sure the vertices have unique locations.
+            verts = [] #This is a list of x, y, z tuples to make sure the vertices have unique locations.
             n_verts = 0
             for index, row in group_node_df.iterrows():
                 n_verts += 1
@@ -886,12 +886,12 @@ class Graph:
                     y = random.randrange(0,1000)
                 if not isinstance(z, numbers.Number):
                     z = random.randrange(0,1000)
-                while [x,y,z] in verts:
+                while [x, y, z] in verts:
                     x = x + random.randrange(10000,30000,1000)
                     y = y + random.randrange(4000,6000, 100)
                     z = z + random.randrange(70000,90000, 1000)
-                verts.append([x,y,z])
-                v = Vertex.ByCoordinates(x,y,z)
+                verts.append([x, y, z])
+                v = Vertex.ByCoordinates(x, y, z)
                 if isinstance(v, topologic.Vertex):
                     if len(nodeFeaturesKeys) == 0:
                         values = [node_id, label, mask, features]
@@ -1247,7 +1247,7 @@ class Graph:
                     x = random.uniform(xMin,xMax)
                     y = random.uniform(yMin,yMax)
                     z = random.uniform(zMin,zMax)
-                    centroid = Vertex.ByCoordinates(x,y,z)
+                    centroid = Vertex.ByCoordinates(x, y, z)
                 d = Dictionary.ByKeysValues(["id","psets", "type", "type_id", "name", "label"], [obj_id, psets, obj_type, obj_type_id, name, label])
                 centroid = Topology.SetDictionary(centroid, d)
                 return centroid
@@ -1375,9 +1375,9 @@ class Graph:
         Parameters
         ----------
         vertices : list
-            The list of [x,y,z] coordinates of the vertices/
+            The list of [x, y, z] coordinates of the vertices/
         edges : list
-            the list of [i,j] indices into the vertices list to signify and edge that connects vertices[i] to vertices[j].
+            the list of [i, j] indices into the vertices list to signify and edge that connects vertices[i] to vertices[j].
         vertexDictionaries : list , optional
             The python dictionaries of the vertices (in the same order as the list of vertices).
         edgeDictionaries : list , optional
@@ -3172,7 +3172,7 @@ class Graph:
         for i, v in enumerate(vertices):
                 d = Topology.Dictionary(v)
                 d = Dictionary.SetValueAtKey(d, newKey, colors[i])
-                v = Topology.SetDictionary(v,d)
+                v = Topology.SetDictionary(v, d)
         return graph
     
     @staticmethod
@@ -3208,8 +3208,8 @@ class Graph:
             d1 = Vertex.Distance(vertex, sv)
             d2 = Vertex.Distance(vertex, ev)
             if d1 < d2:
-                return [ev,1]
-            return [sv,0]
+                return [ev, 1]
+            return [sv, 0]
         if not isinstance(graph, topologic.Graph):
             print("Graph.ContractEdge - Error: The input graph parameter is not a valid graph. Returning None.")
             return None
@@ -3905,7 +3905,7 @@ class Graph:
                     flag = True
                 if nodeMaskKey in keys:
                     value = Dictionary.ValueAtKey(nd, nodeMaskKey)
-                    if not value in [0,1,2]:
+                    if not value in [0, 1, 2]:
                         flag = True
                     elif value == 0:
                         train_mask = True
@@ -3992,7 +3992,7 @@ class Graph:
                     flag = True
                 if edgeMaskKey in keys:
                     value = Dictionary.ValueAtKey(ed, edgeMaskKey)
-                    if not value in [0,1,2]:
+                    if not value in [0, 1, 2]:
                         flag = True
                     elif value == 0:
                         train_mask = True
@@ -4193,7 +4193,7 @@ class Graph:
                     source, target = edge_id
                     file.write(f'<edge id="{edge_id}" source="{source}" target="{target}" label="{edge_attrs["label"]}">\n')
                     if "color" in edge_attrs:
-                        r,g,b = Color.ByCSSNamedColor(edge_attrs["color"])
+                        r, g, b = Color.ByCSSNamedColor(edge_attrs["color"])
                         file.write(f'<viz:color r="{r}" g="{g}" b="{b}"/>\n')
                     file.write('<attvalues>\n')
                     keys = edge_attrs.keys()
@@ -4302,7 +4302,7 @@ class Graph:
             if not vertex_color in Color.CSSNamedColors():
                 vertex_color = defaultVertexColor
             node_dict['color'] = vertex_color
-            r,g,b = Color.ByCSSNamedColor(vertex_color)
+            r, g, b = Color.ByCSSNamedColor(vertex_color)
             node_dict['r'] = r
             node_dict['g'] = g
             node_dict['b'] = b
@@ -4370,7 +4370,7 @@ class Graph:
                 edge_color = defaultVertexColor
             edge_dict['color'] = edge_color
             
-            r,g,b = Color.ByCSSNamedColor(edge_color)
+            r, g, b = Color.ByCSSNamedColor(edge_color)
             edge_dict['r'] = r
             edge_dict['g'] = g
             edge_dict['b'] = b
@@ -4887,7 +4887,7 @@ class Graph:
         return graph.GetGUID()
 
     @staticmethod
-    def IncomingEdges(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool=False, tolerance: float=0.0001) -> list:
+    def IncomingEdges(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool = False, tolerance: float = 0.0001) -> list:
         """
         Returns the incoming edges connected to a vertex. An edge is considered incoming if its end vertex is
         coincident with the input vertex.
@@ -4928,7 +4928,7 @@ class Graph:
         return incoming_edges
     
     @staticmethod
-    def IncomingVertices(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool=False, tolerance: float=0.0001) -> list:
+    def IncomingVertices(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool = False, tolerance: float = 0.0001) -> list:
         """
         Returns the incoming vertices connected to a vertex. A vertex is considered incoming if it is an adjacent vertex to the input vertex
         and the the edge connecting it to the input vertex is an incoming edge.
@@ -5146,7 +5146,7 @@ class Graph:
         j_data = {}
         j_data['nodes'] = {}
         j_data['edges'] = {}
-        n = len(str(len(vertices)))
+        n = max(len(str(len(vertices))), 4)
         v_labels = []
         v_dicts = []
         for i, v in enumerate(vertices):
@@ -5534,7 +5534,7 @@ class Graph:
                 keys.append(residualKey)
                 values.append(residual)
                 d = Dictionary.ByKeysValues(keys, values)
-                edge = Topology.SetDictionary(edge,d)
+                edge = Topology.SetDictionary(edge, d)
         return max_flow
 
     @staticmethod
@@ -5551,8 +5551,8 @@ class Graph:
         -------
         dict
             The python dictionary of the mesh data of the input graph. The keys in the dictionary are:
-            'vertices' : The list of [x,y,z] coordinates of the vertices.
-            'edges' : the list of [i,j] indices into the vertices list to signify and edge that connects vertices[i] to vertices[j].
+            'vertices' : The list of [x, y, z] coordinates of the vertices.
+            'edges' : the list of [i, j] indices into the vertices list to signify and edge that connects vertices[i] to vertices[j].
             'vertexDictionaries' : The python dictionaries of the vertices (in the same order as the list of vertices).
             'edgeDictionaries' : The python dictionaries of the edges (in the same order as the list of edges).
 
@@ -5898,7 +5898,7 @@ class Graph:
         return len(Graph.Vertices(graph))
     
     @staticmethod
-    def OutgoingEdges(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool=False, tolerance: float=0.0001) -> list:
+    def OutgoingEdges(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool = False, tolerance: float = 0.0001) -> list:
         """
         Returns the outgoing edges connected to a vertex. An edge is considered outgoing if its start vertex is
         coincident with the input vertex.
@@ -5939,7 +5939,7 @@ class Graph:
         return outgoing_edges
     
     @staticmethod
-    def OutgoingVertices(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool=False, tolerance: float=0.0001) -> list:
+    def OutgoingVertices(graph: topologic.Graph, vertex: topologic.Vertex, directed: bool = False, tolerance: float = 0.0001) -> list:
         """
         Returns the list of outgoing vertices connected to a vertex. A vertex is considered outgoing if it is an adjacent vertex to the input vertex
         and the the edge connecting it to the input vertex is an outgoing edge.
@@ -6348,7 +6348,7 @@ class Graph:
     @staticmethod
     def ShortestPath(graph, vertexA, vertexB, vertexKey="", edgeKey="Length", tolerance=0.0001):
         """
-        Returns the shortest path that connects the input vertices.
+        Returns the shortest path that connects the input vertices. The shortest path will take into consideration both the vertexKey and the edgeKey if both are specified and will minimize the total "cost" of the path. Otherwise, it will take into consideration only whatever key is specified.
 
         Parameters
         ----------
@@ -6537,7 +6537,7 @@ class Graph:
         zAxis : bool , optional
             If set to True the z axis is drawn. Otherwise it is not drawn. The default is False.
         axisSize : float , optional
-            The size of the X,Y,Z, axes. The default is 1.
+            The size of the X, Y, Z, axes. The default is 1.
         backgroundColor : str , optional
             The desired color of the background. This can be any plotly color string and may be specified as:
             - A hex string (e.g. '#ff0000')
@@ -6555,11 +6555,11 @@ class Graph:
         marginBottom : int , optional
             The size in pixels of the bottom margin. The default value is 0.
         camera : list , optional
-            The desired location of the camera). The default is [-1.25,-1.25,1.25].
+            The desired location of the camera). The default is [-1.25, -1.25, 1.25].
         center : list , optional
-            The desired center (camera target). The default is [0,0,0].
+            The desired center (camera target). The default is [0, 0, 0].
         up : list , optional
-            The desired up vector. The default is [0,0,1].
+            The desired up vector. The default is [0, 0, 1].
         projection : str , optional
             The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
 
@@ -6735,7 +6735,7 @@ class Graph:
         return Graph.ByVerticesEdges(dictionary['vertices'], dictionary['edges'])
     
     @staticmethod
-    def VertexDegree(graph : topologic.Graph, vertex: topologic.Vertex, edgeKey: str=None, tolerance: float=0.0001):
+    def VertexDegree(graph : topologic.Graph, vertex: topologic.Vertex, edgeKey: str = None, tolerance: float = 0.0001):
         """
         Returns the degree of the input vertex. See https://en.wikipedia.org/wiki/Degree_(graph_theory).
 

topologicpy/Grid.py

@@ -56,12 +56,12 @@ class Grid(topologic.Cluster):
             return None
         if not uOrigin:
             if not isinstance(face, topologic.Face):
-                uOrigin = Vertex.ByCoordinates(0,0,0)
+                uOrigin = Vertex.ByCoordinates(0, 0, 0)
             else:
                 uOrigin = Face.VertexByParameters(face, 0, 0)
         if not vOrigin:
             if not isinstance(face, topologic.Face):
-                vOrigin = Vertex.ByCoordinates(0,0,0)
+                vOrigin = Vertex.ByCoordinates(0, 0, 0)
             else:
                 vOrigin = Face.VertexByParameters(face, 0, 0)
         
@@ -71,9 +71,9 @@ class Grid(topologic.Cluster):
             v3 = Face.VertexByParameters(face, 0, 0)
             v4 = Face.VertexByParameters(face, 0, 1)
         else:
-            v1 = Vertex.ByCoordinates(0,0,0)
+            v1 = Vertex.ByCoordinates(0, 0, 0)
             v2 = Vertex.ByCoordinates(max(uRange),0,0)
-            v3 = Vertex.ByCoordinates(0,0,0)
+            v3 = Vertex.ByCoordinates(0, 0, 0)
             v4 = Vertex.ByCoordinates(0,max(vRange),0)
 
         uVector = [v2.X()-v1.X(), v2.Y()-v1.Y(),v2.Z()-v1.Z()]
@@ -224,7 +224,7 @@ class Grid(topologic.Cluster):
         face : topologic.Face , optional
             The input face. If set to None, the grid will be created on the XY plane. The default is None.
         origin : topologic.Vertex , optional
-            The origin of the grid vertices. If set to None: if the face is set, the origin will be set to vertex at the face's 0,0 paratmer. If the face is set to None, the origin will be set to (0,0,0). The default is None.
+            The origin of the grid vertices. If set to None: if the face is set, the origin will be set to vertex at the face's 0,0 paratmer. If the face is set to None, the origin will be set to (0, 0, 0). The default is None.
         uRange : list , optional
             A list of distances for the *u* grid lines from the uOrigin. The default is [-0.5,-0.25,0, 0.25,0.5].
         vRange : list , optional
@@ -251,7 +251,7 @@ class Grid(topologic.Cluster):
             return None
         if not origin:
             if not isinstance(face, topologic.Face):
-                origin = Vertex.ByCoordinates(0,0,0)
+                origin = Vertex.ByCoordinates(0, 0, 0)
             else:
                 origin = Face.VertexByParameters(face, 0, 0)
         
@@ -261,9 +261,9 @@ class Grid(topologic.Cluster):
             v3 = Face.VertexByParameters(face, 0, 0)
             v4 = Face.VertexByParameters(face, 0, 1)
         else:
-            v1 = Vertex.ByCoordinates(0,0,0)
+            v1 = Vertex.ByCoordinates(0, 0, 0)
             v2 = Vertex.ByCoordinates(max(uRange),0,0)
-            v3 = Vertex.ByCoordinates(0,0,0)
+            v3 = Vertex.ByCoordinates(0, 0, 0)
             v4 = Vertex.ByCoordinates(0,max(vRange),0)
 
         uVector = [v2.X()-v1.X(), v2.Y()-v1.Y(),v2.Z()-v1.Z()]
@@ -300,7 +300,7 @@ class Grid(topologic.Cluster):
         face : topologic.Face , optional
             The input face. If set to None, the grid will be created on the XY plane. The default is None.
         origin : topologic.Vertex , optional
-            The origin of the grid vertices. If set to None: if the face is set, the origin will be set to vertex at the face's 0,0 paratmer. If the face is set to None, the origin will be set to (0,0,0). The default is None.
+            The origin of the grid vertices. If set to None: if the face is set, the origin will be set to vertex at the face's 0,0 paratmer. If the face is set to None, the origin will be set to (0, 0, 0). The default is None.
         uRange : list , optional
             A list of *u* parameters for the *u* grid lines from the uOrigin. The default is [0.0,0.25,0.5,0.75,1.0].
         vRange : list , optional

topologicpy/Plotly.py

@@ -223,7 +223,7 @@ class Plotly:
         """
 
         if isinstance(data[labels[0]][0], int):
-            xAxis_list = list(range(1,data[labels[0]][0]+1))
+            xAxis_list = list(range(1, data[labels[0]][0]+1))
         else:
             xAxis_list = data[labels[0]][0]
         plot_data = [xAxis_list]
@@ -307,9 +307,9 @@ class Plotly:
             vertices = Graph.Vertices(graph)
             if vertexLabelKey or vertexGroupKey:
                 for v in vertices:
-                    Xn=[round(Vertex.X(v),4) for v in vertices] # x-coordinates of nodes
-                    Yn=[round(Vertex.Y(v),4) for v in vertices] # y-coordinates of nodes
-                    Zn=[round(Vertex.Z(v),4) for v in vertices] # x-coordinates of nodes
+                    Xn=[round(Vertex.X(v), 4) for v in vertices] # x-coordinates of nodes
+                    Yn=[round(Vertex.Y(v), 4) for v in vertices] # y-coordinates of nodes
+                    Zn=[round(Vertex.Z(v), 4) for v in vertices] # x-coordinates of nodes
                     v_label = ""
                     v_group = ""
                     d = Topology.Dictionary(v)
@@ -334,9 +334,9 @@ class Plotly:
                     v_labels.append(v_label)
             else:
                 for v in vertices:
-                    Xn=[round(Vertex.X(v),4) for v in vertices] # x-coordinates of nodes
-                    Yn=[round(Vertex.Y(v),4) for v in vertices] # y-coordinates of nodes
-                    Zn=[round(Vertex.Z(v),4) for v in vertices] # x-coordinates of nodes
+                    Xn=[round(Vertex.X(v), 4) for v in vertices] # x-coordinates of nodes
+                    Yn=[round(Vertex.Y(v), 4) for v in vertices] # y-coordinates of nodes
+                    Zn=[round(Vertex.Z(v), 4) for v in vertices] # x-coordinates of nodes
             if len(list(set(v_groupList))) < 2:
                 v_groupList = vertexColor
             if len(v_labels) < 1:
@@ -372,9 +372,9 @@ class Plotly:
                 for e in edges:
                     sv = Edge.StartVertex(e)
                     ev = Edge.EndVertex(e)
-                    Xe+=[round(Vertex.X(sv),4), round(Vertex.X(ev),4), None] # x-coordinates of edge ends
-                    Ye+=[round(Vertex.Y(sv),4), round(Vertex.Y(ev),4), None] # y-coordinates of edge ends
-                    Ze+=[round(Vertex.Z(sv),4), round(Vertex.Z(ev),4), None] # z-coordinates of edge ends
+                    Xe+=[round(Vertex.X(sv), 4), round(Vertex.X(ev), 4), None] # x-coordinates of edge ends
+                    Ye+=[round(Vertex.Y(sv), 4), round(Vertex.Y(ev), 4), None] # y-coordinates of edge ends
+                    Ze+=[round(Vertex.Z(sv), 4), round(Vertex.Z(ev), 4), None] # z-coordinates of edge ends
                     e_label = ""
                     e_group = ""
                     d = Topology.Dictionary(e)
@@ -398,9 +398,9 @@ class Plotly:
                 for e in edges:
                     sv = Edge.StartVertex(e)
                     ev = Edge.EndVertex(e)
-                    Xe+=[round(Vertex.X(sv),4), round(Vertex.X(ev),4), None] # x-coordinates of edge ends
-                    Ye+=[round(Vertex.Y(sv),4), round(Vertex.Y(ev),4), None] # y-coordinates of edge ends
-                    Ze+=[round(Vertex.Z(sv),4), round(Vertex.Z(ev),4), None] # z-coordinates of edge ends
+                    Xe+=[round(Vertex.X(sv), 4), round(Vertex.X(ev), 4), None] # x-coordinates of edge ends
+                    Ye+=[round(Vertex.Y(sv), 4), round(Vertex.Y(ev), 4), None] # y-coordinates of edge ends
+                    Ze+=[round(Vertex.Z(sv), 4), round(Vertex.Z(ev), 4), None] # z-coordinates of edge ends
 
             if len(list(set(e_groupList))) < 2:
                 e_groupList = edgeColor
@@ -677,9 +677,9 @@ class Plotly:
                 for m, e in enumerate(edges):
                     sv = vertices[e[0]]
                     ev = vertices[e[1]]
-                    x+=[round(sv[0],5),round(ev[0],mantissa), None] # x-coordinates of edge ends
-                    y+=[round(sv[1],5),round(ev[1],mantissa), None] # y-coordinates of edge ends
-                    z+=[round(sv[2],5),round(ev[2],mantissa), None] # z-coordinates of edge ends
+                    x+=[round(sv[0], mantissa),round(ev[0], mantissa), None] # x-coordinates of edge ends
+                    y+=[round(sv[1], mantissa),round(ev[1], mantissa), None] # y-coordinates of edge ends
+                    z+=[round(sv[2], mantissa),round(ev[2], mantissa), None] # z-coordinates of edge ends
                     label = ""
                     group = ""
                     if len(dictionaries) > 0:
@@ -1338,7 +1338,7 @@ class Plotly:
         zAxis : bool , optional
             If set to True the z axis is drawn. Otherwise it is not drawn. The default is False.
         axisSize : float , optional
-            The size of the X,Y,Z, axes. The default is 1.
+            The size of the X, Y, Z, axes. The default is 1.
         backgroundColor : str , optional
             The desired color of the background. This can be any plotly color string and may be specified as:
             - A hex string (e.g. '#ff0000')
@@ -1370,7 +1370,7 @@ class Plotly:
         if not isinstance(data, list):
             return None
 
-        v0 = Vertex.ByCoordinates(0,0,0)
+        v0 = Vertex.ByCoordinates(0, 0, 0)
         v1 = Vertex.ByCoordinates(axisSize,0,0)
         v2 = Vertex.ByCoordinates(0,axisSize,0)
         v3 = Vertex.ByCoordinates(0,0,axisSize)
@@ -1630,11 +1630,11 @@ class Plotly:
         marginBottom : int , optional
             The size in pixels of the bottom margin. The default value is 0.
         camera : list , optional
-            The desired location of the camera). The default is [-1.25,-1.25,1.25].
+            The desired location of the camera). The default is [-1.25, -1.25, 1.25].
         center : list , optional
-            The desired center (camera target). The default is [0,0,0].
+            The desired center (camera target). The default is [0, 0, 0].
         up : list , optional
-            The desired up vector. The default is [0,0,1].
+            The desired up vector. The default is [0, 0, 1].
         renderer : str , optional
             The desired renderer. See Plotly.Renderers(). The default is "notebook".
         intensityKey : str , optional
@@ -1888,11 +1888,11 @@ class Plotly:
         figure : plotly.graph_objs._figure.Figure
             The input plotly figure.
         camera : list , optional
-            The desired location of the camera. The default is [-1.25,-1.25,1.25].
+            The desired location of the camera. The default is [-1.25, -1.25, 1.25].
         center : list , optional
-            The desired center (camera target). The default is [0,0,0].
+            The desired center (camera target). The default is [0, 0, 0].
         up : list , optional
-            The desired up vector. The default is [0,0,1].
+            The desired up vector. The default is [0, 0, 1].
         projection : str , optional
             The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
         
@@ -1905,9 +1905,9 @@ class Plotly:
         if not isinstance(camera, list):
             camera = [-1.25, -1.25, 1.25]
         if not isinstance(center, list):
-            center = [0,0,0]
+            center = [0, 0, 0]
         if not isinstance(up, list):
-            up = [0,0,1]
+            up = [0, 0, 1]
         projection = projection.lower()
         if projection in "orthographic":
             projection = "orthographic"
@@ -1932,11 +1932,11 @@ class Plotly:
         figure : plotly.graph_objs._figure.Figure
             The input plotly figure.
         camera : list , optional
-            The desired location of the camera. The default is [0,0,0].
+            The desired location of the camera. The default is [0, 0, 0].
         center : list , optional
-            The desired center (camera target). The default is [0,0,0].
+            The desired center (camera target). The default is [0, 0, 0].
         up : list , optional
-            The desired up vector. The default is [0,0,1].
+            The desired up vector. The default is [0, 0, 1].
         renderer : str , optional
             The desired rendered. See Plotly.Renderers(). The default is "notebook".
         projection : str, optional