topologicpy 0.8.49__py3-none-any.whl → 0.8.51__py3-none-any.whl

topologicpy/Graph.py

@@ -838,6 +838,47 @@ class Graph:
             adjList.append(tempRow)
         return adjList
 
+    @staticmethod
+    def AdjacentEdges(graph, edge, silent: bool = False):
+        """
+        Returns the list of edges connected to the input edge.
+
+        Parameters
+        ----------
+        graph : topologic_core.Graph
+            The input graph.
+        edge : topologic_core.Edge
+            the input edge.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
+
+        Returns
+        -------
+        list
+            The list of adjacent edges.
+
+        """
+        from topologicpy.Edge import Edge
+        from topologicpy.Topology import Topology
+
+        if not Topology.IsInstance(graph, "Graph"):
+            if not silent:
+                print("Graph.AdjacentEdges - Error: The input graph is not a valid graph. Returning None.")
+            return None
+        if not Topology.IsInstance(edge, "Edge"):
+            if not silent:
+                print("Graph.AdjacentEdges - Error: The input edge is not a valid edge. Returning None.")
+            return None
+        edges = []
+        sv = Edge.StartVertex(edge)
+        ev = Edge.EndVertex(edge)
+        edges.extend(Graph.Edges(graph, [sv]))
+        edges.extend(Graph.Edges(graph, [ev]))
+        print(edges)
+        edges = [e for e in edges if not Topology.IsSame(e, edge)]
+        # Complete the algorithm here
+        return edges
+    
     @staticmethod
     def AdjacentVertices(graph, vertex, silent: bool = False):
         """
@@ -6214,53 +6255,79 @@ class Graph:
         return scores
     
     @staticmethod
-    def Diameter(graph):
+    def Diameter(graph, silent: bool = False):
         """
-        Returns the diameter of the input graph. See https://mathworld.wolfram.com/GraphDiameter.html.
+        Returns the diameter of the input (unweighted, undirected) graph.
+
+        The diameter is the maximum, over all pairs of vertices, of the length of a
+        shortest path between them. If the graph is disconnected, this returns the
+        maximum finite eccentricity across connected components and prints a warning
+        unless `silent=True`.
 
         Parameters
         ----------
         graph : topologic_core.Graph
             The input graph.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
 
         Returns
         -------
         int
-            The diameter of the input graph.
-
+            The diameter of the input graph, or None if the graph is empty.
         """
+        from collections import deque
         from topologicpy.Topology import Topology
 
+        # Basic checks
         if not Topology.IsInstance(graph, "Graph"):
-            print("Graph.Diameter - Error: The input graph is not a valid graph. Returning None.")
+            if not silent:
+                print("Graph.Diameter - Error: The input graph is not a valid graph. Returning None.")
             return None
-        
-        def dfs(node, visited):
-            visited.add(node)
-            max_depth = 0
-            farthest_node = node
-            for neighbor in adj_dict[node]:
-                if neighbor not in visited:
-                    depth, end_node = dfs(neighbor, visited)
-                    if depth + 1 > max_depth:
-                        max_depth = depth + 1
-                        farthest_node = end_node
-            return max_depth, farthest_node
 
-        adj_dict = Graph.AdjacencyDictionary(graph, includeWeights=False)
-
-        # Step 1: Pick an arbitrary starting node (first node in the graph)
-        start_node = next(iter(adj_dict))
-        
-        # Step 2: Run DFS to find the farthest node from the start_node
-        visited = set()
-        _, farthest_node = dfs(start_node, visited)
-
-        # Step 3: Run DFS from the farthest node found to get the maximum depth
-        visited.clear()
-        diameter, _ = dfs(farthest_node, visited)
+        # Build adjacency dictionary (as sets) and force undirected symmetry
+        adj_raw = Graph.AdjacencyDictionary(graph, includeWeights=False)
+        if not adj_raw:  # empty graph
+            if not silent:
+                print("Graph.Diameter - Warning: The graph has no vertices. Returning None.")
+            return None
+
+        adj = {u: set(neighbors) for u, neighbors in adj_raw.items()}
+        # Ensure symmetry (in case the underlying graph stored directed edges)
+        for u, nbrs in list(adj.items()):
+            for v in nbrs:
+                adj.setdefault(v, set()).add(u)
+                adj[u].add(v)
+
+        def bfs_eccentricity(start):
+            """Return distances map from start and its eccentricity."""
+            dist = {start: 0}
+            q = deque([start])
+            while q:
+                u = q.popleft()
+                for v in adj.get(u, ()):
+                    if v not in dist:
+                        dist[v] = dist[u] + 1
+                        q.append(v)
+            ecc = max(dist.values()) if dist else 0
+            return dist, ecc
+
+        diameter = 0
+        n = len(adj)
+        disconnected = False
+
+        for s in adj:
+            dist, ecc = bfs_eccentricity(s)
+            if len(dist) < n:
+                disconnected = True
+            if ecc > diameter:
+                diameter = ecc
+
+        if disconnected and not silent:
+            print("Graph.Diameter - Warning: The graph is disconnected. Returning the maximum finite diameter across connected components.")
 
         return diameter
+
     
     @staticmethod
     def Dictionary(graph):
@@ -12464,7 +12531,7 @@ class Graph:
 
     @staticmethod
     def Quotient(topology,
-                topologyType: str = None,
+                topologyType: str = "vertex",
                 key: str = None,
                 groupLabelKey: str = None,
                 groupCountKey: str = "count",
@@ -12480,8 +12547,8 @@ class Graph:
 
         Parameters
         ----------
-        topology : topologic_core.Topology
-            The input topology.
+        topology : topologic_core.Topology or topologic_core.Graph
+            The input topology or graph.
         topologyType : str
             The type of subtopology for which to search. This can be one of "vertex", "edge", "face", "cell". It is case-insensitive.
         key : str , optional
@@ -12510,9 +12577,9 @@ class Graph:
         from topologicpy.Edge import Edge
         from topologicpy.Graph import Graph
 
-        if not Topology.IsInstance(topology, "Topology"):
+        if not Topology.IsInstance(topology, "Topology") and not Topology.IsInstance(topology, "Graph"):
             if not silent:
-                print("Graph.Quotient - Error: The input topology parameter is not a valid Topology. Returning None.")
+                print("Graph.Quotient - Error: The input topology parameter is not a valid Topology or Graph. Returning None.")
             return None
         if topologyType.lower() not in {"vertex", "edge", "face", "cell"}:
             if not silent:
@@ -12676,6 +12743,8 @@ class Graph:
 
             group_vertices.append(v)
 
+        group_vertices = Vertex.Separate(group_vertices, minDistance = 0.1, strength=0.5, silent=silent)
+
         # 7) Edges, with optional weights
         edges = []
         for (a, b), w in group_edges.items():
@@ -12691,6 +12760,7 @@ class Graph:
             except Exception:
                 continue
 
+
         return Graph.ByVerticesEdges(group_vertices, edges)
 
     @staticmethod
@@ -13410,7 +13480,85 @@ class Graph:
                     queue.append((neighbor, distance + 1))
         
         return None  # Target not reachable
-    
+
+    @staticmethod
+    def Tietze(radius: float = 0.5, height: float = 1):
+        """
+        Creates a Tietze's graph mapped on a mobius strip of the same input radius and height. See https://en.wikipedia.org/wiki/Tietze%27s_graph
+
+        Parameters
+        ----------
+        radius : float , optional
+            The desired radius of the mobius strip on which the graph is mapped. Default is 0.5.
+        height : float , optional
+            The desired height of the mobius strip on which the graph is mapped. Default is 1.
+
+        Returns
+        -------
+        topologicpy.Graph
+            The created Tietze's graph.
+
+        """
+        from topologicpy.Dictionary import Dictionary
+        from topologicpy.Edge import Edge
+        from topologicpy.Shell import Shell
+        from topologicpy.Graph import Graph
+        from topologicpy.Topology import Topology
+
+        m = Shell.MobiusStrip(radius=radius, height=height, uSides=12, vSides=3)
+        eb = Shell.ExternalBoundary(m)
+        verts = Topology.Vertices(eb)
+        new_verts = []
+        for i in range(0, len(verts), 2): #The mobius strip has 24 edges, we need half of that (12).
+            new_verts.append(verts[i])
+
+        graph_edges = []
+        for r in range(0,6):
+            s = (r + 6)
+            e = Edge.ByVertices(new_verts[r], new_verts[s])
+            if r == 0:
+                v1 = Edge.VertexByParameter(e, 2/3)
+                v2 = Edge.EndVertex(e)
+                e = Edge.ByVertices(v1, v2)
+            elif r == 1:
+                v3 = Edge.VertexByParameter(e, 1/3)
+                v4 = Edge.VertexByParameter(e, 2/3)
+                e = Edge.ByVertices(v3, v4)
+            elif r == 2:
+                v5 = Edge.StartVertex(e)
+                v6 = Edge.VertexByParameter(e, 1/3)
+                e = Edge.ByVertices(v5, v6)
+            elif r == 3:
+                v7 = Edge.VertexByParameter(e, 1/3)
+                v8 = Edge.VertexByParameter(e, 2/3)
+                e = Edge.ByVertices(v7, v8)
+            elif r == 4:
+                v9 = Edge.VertexByParameter(e, 2/3)
+                v10 = Edge.EndVertex(e)
+                e = Edge.ByVertices(v9, v10)
+            elif r == 5:
+                v11 = Edge.VertexByParameter(e, 1/3)
+                v12 = Edge.VertexByParameter(e, 2/3)
+                e = Edge.ByVertices(v11, v12)
+            graph_edges.append(e)
+
+        graph_vertices= [v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12]
+        graph_edges.append(Edge.ByVertices(v10, v2))
+        graph_edges.append(Edge.ByVertices(v5, v10))
+        graph_edges.append(Edge.ByVertices(v2, v5))
+        graph_edges.append(Edge.ByVertices(v1, v4))
+        graph_edges.append(Edge.ByVertices(v4, v8))
+        graph_edges.append(Edge.ByVertices(v8, v9))
+        graph_edges.append(Edge.ByVertices(v9, v12))
+        graph_edges.append(Edge.ByVertices(v12, v3))
+        graph_edges.append(Edge.ByVertices(v3, v6))
+        graph_edges.append(Edge.ByVertices(v6, v7))
+        graph_edges.append(Edge.ByVertices(v7, v11))
+        graph_edges.append(Edge.ByVertices(v11, v1))
+        graph_edges = [Edge.Reverse(e) for e in graph_edges] #This makes them look better when sagitta is applied.
+        graph = Graph.ByVerticesEdges(graph_vertices, graph_edges)
+        return graph
+
     @staticmethod
     def TopologicalDistance(graph, vertexA, vertexB, tolerance=0.0001):
         """

topologicpy/Shell.py

@@ -1175,7 +1175,7 @@ class Shell():
             if not silent:
                 print("Shell.MobiusStrip - Error: The height input parameter must be a positive number  greater than the tolerance input parameter. Returning None.")
             return None
-        if uSides <= 3:
+        if uSides < 3:
             if not silent:
                 print("Shell.MobiusStrip - Error: The uSides input parameter must be a positive integer greater than 2. Returning None.")
             return None

topologicpy/Topology.py

@@ -339,7 +339,7 @@ class Topology():
 
         Parameters
         ----------
-        topology : topologic_core.Topology
+        topology : topologic_core.Topology or topologic_core.graph
             The input topology.
         hostTopology : topologic_core.Topology
             The host topology in which to search.
@@ -352,11 +352,14 @@ class Topology():
             The list of adjacent topologies.
 
         """
+
+        from topologicpy.Graph import Graph
+
         if not Topology.IsInstance(topology, "Topology"):
             print("Topology.AdjacentTopologies - Error: the input topology parameter is not a valid topology. Returning None.")
             return None
-        if not Topology.IsInstance(hostTopology, "Topology"):
-            print("Topology.AdjacentTopologies - Error: the input hostTopology parameter is not a valid topology. Returning None.")
+        if not Topology.IsInstance(hostTopology, "Topology") and not Topology.IsInstance(hostTopology, "Graph"):
+            print("Topology.AdjacentTopologies - Error: the input hostTopology parameter is not a valid topology or graph. Returning None.")
             return None
         if not topologyType:
             topologyType = Topology.TypeAsString(topology).lower()
@@ -370,21 +373,28 @@ class Topology():
         error = False
         if Topology.IsInstance(topology, "Vertex"):
             if topologyType.lower() == "vertex":
-                try:
-                    _ = topology.AdjacentVertices(hostTopology, adjacentTopologies) # Hook to Core
-                except:
+                if Topology.IsInstance(hostTopology, "graph"):
+                    adjacentTopologies = Graph.AdjacentVertices(hostTopology, topology)
+                else:
                     try:
-                        _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
+                        _ = topology.AdjacentVertices(hostTopology, adjacentTopologies) # Hook to Core
                     except:
-                        error = True
+                        try:
+                            _ = topology.Vertices(hostTopology, adjacentTopologies) # Hook to Core
+                        except:
+                            error = True
             elif topologyType.lower() == "edge":
-                try:
-                    _ = topologic.VertexUtility.AdjacentEdges(topology, hostTopology, adjacentTopologies) # Hook to Core
-                except:
+                if Topology.IsInstance(hostTopology, "graph"):
+                    adjacentTopologies = Graph.Edges(hostTopology, [topology])
+                    print("Topology.AdjacentTopologies - adjacentTopologies:", adjacentTopologies)
+                else:
                     try:
-                        _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
+                        _ = topologic.VertexUtility.AdjacentEdges(topology, hostTopology, adjacentTopologies) # Hook to Core
                     except:
-                        error = True
+                        try:
+                            _ = topology.Edges(hostTopology, adjacentTopologies) # Hook to Core
+                        except:
+                            error = True
             elif topologyType.lower() == "wire":
                 try:
                     _ = topologic.VertexUtility.AdjacentWires(topology, hostTopology, adjacentTopologies) # Hook to Core
@@ -432,10 +442,13 @@ class Topology():
                 except:
                     error = True
             elif topologyType.lower() == "edge":
-                try:
-                    _ = topology.AdjacentEdges(hostTopology, adjacentTopologies) # Hook to Core
-                except:
-                    error = True
+                if Topology.IsInstance(hostTopology, "graph"):
+                    adjacentTopologies = Graph.AdjacentEdges(hostTopology, topology)
+                else:
+                    try:
+                        _ = topology.AdjacentEdges(hostTopology, adjacentTopologies) # Hook to Core
+                    except:
+                        error = True
             elif topologyType.lower() == "wire":
                 try:
                     _ = topologic.EdgeUtility.AdjacentWires(topology, adjacentTopologies) # Hook to Core
@@ -5391,7 +5404,7 @@ class Topology():
         tVertices = []
         if transposeAxes:
             for v in vertices:
-                tVertices.append([v[0], v[2], v[1]])
+                tVertices.append([v[0], -v[2], v[1]])
             vertices = tVertices
         for v in vertices:
             lines.append("v " + str(v[0]) + " " + str(v[1]) + " " + str(v[2]))

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.49'
+__version__ = '0.8.51'

{topologicpy-0.8.49.dist-info → topologicpy-0.8.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.49
+Version: 0.8.51
 Summary: An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: AGPL v3 License

{topologicpy-0.8.49.dist-info → topologicpy-0.8.51.dist-info}/RECORD

@@ -12,7 +12,7 @@ topologicpy/Dictionary.py,sha256=Z4YQ88tONWd-0X0dENQ8IZqIOa9mbBqhJkTBsHmft2g,446
 topologicpy/Edge.py,sha256=DifItuyabFDUFC7CVMlt2DeMFMNaGOqCg43iU9CPP0A,74029
 topologicpy/EnergyModel.py,sha256=IiBJNx7F9-8TPMaQn1iQON1ZtTv2nT5kbZHxM_gBCTQ,53773
 topologicpy/Face.py,sha256=aX9EcR3JGbLITElhd25J0Z8m9U8KkmbYivGg3oZN-Uw,202296
-topologicpy/Graph.py,sha256=vK5mj90cc_cwC5suodSuYDrXCX3njp_SV4SiTyQzvuE,685271
+topologicpy/Graph.py,sha256=o6aK18tCTkfzsNFOTAU-wIPG2p3g_vpm6n7YHc44bYU,691239
 topologicpy/Grid.py,sha256=3OsBMyHh4w8gpFOTMKHMNTpo62V0CwRNu5cwm87yDUA,18421
 topologicpy/Helper.py,sha256=aGmndgmEztjVNU-wW9OoHDel7wzapprM0TjA7f2AoS8,31188
 topologicpy/Honeybee.py,sha256=C7Am0kCK3a5rt7Jpu2EIgqeR114ZJWtsx4_DBcr5hQA,21716
@@ -22,17 +22,17 @@ topologicpy/Plotly.py,sha256=RXGeEBwVs8unJaT9vv_FBmAFfKd-1Z5x3V8oeKE43Bs,122924
 topologicpy/Polyskel.py,sha256=oVfM4lqSMPTjnkHfsRU9VI8Blt6Vf0LVPkD9ebz7Wmw,27082
 topologicpy/PyG.py,sha256=wOsoBFxMgwZYWjj86OMkz_PJuQ02locV_djhSDD6dVc,109644
 topologicpy/ShapeGrammar.py,sha256=KYsKDLXWdflAcYMAIz84AUF-GMkbTmaBDd2-ovbilqU,23336
-topologicpy/Shell.py,sha256=e6R7JdzYL1ubO0xXJs5P_UiiNHccN5SjQhQfGPPgHBg,96793
+topologicpy/Shell.py,sha256=ioO4raCJfXtYldQg-adpcLVeJPEA6od6cAA5ro7t6r4,96792
 topologicpy/Speckle.py,sha256=-eiTqJugd7pHiHpD3pDUcDO6CGhVyPV14HFRzaqEoaw,18187
 topologicpy/Sun.py,sha256=8S6dhCKfOhUGVny-jEk87Q08anLYMB1JEBKRGCklvbQ,36670
-topologicpy/Topology.py,sha256=x6NTJ8AFIeFq3emZRT7FA_6NgNd-aavd4i9ws704AAU,470541
+topologicpy/Topology.py,sha256=MoEszjDhEiCVYTO4IFxYsYjYj4Vg5TnWUcnoPMNj-Nc,471350
 topologicpy/Vector.py,sha256=pEC8YY3TeHGfGdeNgvdHjgMDwxGabp5aWjwYC1HSvMk,42236
 topologicpy/Vertex.py,sha256=0f6HouARKaCuxhdxsUEYi8T9giJycnWhQ8Cn70YILBA,84885
 topologicpy/Wire.py,sha256=gjgQUGHdBdXUIijgZc_VIW0E39w-smaVhhdl0jF63fQ,230466
 topologicpy/__init__.py,sha256=RMftibjgAnHB1vdL-muo71RwMS4972JCxHuRHOlU428,928
-topologicpy/version.py,sha256=QtAkT5hlIePCtadXLl4JDdKbyvuiJ4-dBo60LPK6aDE,23
-topologicpy-0.8.49.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.49.dist-info/METADATA,sha256=xrO1G5MVgzF8yZXxfihp6syuWrK7z_aBao9_chfUw6U,10535
-topologicpy-0.8.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-topologicpy-0.8.49.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.49.dist-info/RECORD,,
+topologicpy/version.py,sha256=xWa9BLlvIYvhh3MnyCUV3ug10L4hsf2fDMNf9z_dCY4,23
+topologicpy-0.8.51.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.51.dist-info/METADATA,sha256=6kYuhs7iebTG3MIvoPQyA558AmaRzFkRce7CKgKBgr0,10535
+topologicpy-0.8.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.51.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.51.dist-info/RECORD,,