topologicpy 0.8.50__py3-none-any.whl → 0.8.52__py3-none-any.whl

topologicpy/Cell.py

@@ -1567,6 +1567,8 @@ class Cell():
         vertices = Topology.Vertices(dodecahedron)
         d = Vertex.Distance(Vertex.Origin(), vertices[0])
         dodecahedron = Topology.Scale(dodecahedron, origin=Vertex.Origin(), x=radius/d, y=radius/d, z=radius/d)
+        verts = Topology.Vertices(dodecahedron)
+        print("Dodec: Distance", Vertex.Distance(Vertex.Origin(), verts[0]))
         if placement == "bottom":
             dodecahedron = Topology.Translate(dodecahedron, 0, 0, radius)
         elif placement == "lowerleft":
@@ -3091,9 +3093,9 @@ class Cell():
     
     @staticmethod
     def Sphere(origin= None, radius: float = 0.5, uSides: int = 16, vSides: int = 8, direction: list = [0, 0, 1],
-                   placement: str = "center", tolerance: float = 0.0001):
+                   placement: str = "center", tolerance: float = 0.0001, silent: bool = False):
         """
-        Creates a sphere.
+        Creates an approximation of a sphere using a UV grid of triangular faces.
 
         Parameters
         ----------
@@ -3111,6 +3113,9 @@ class Cell():
             The description of the placement of the origin of the sphere. This can be "bottom", "center", or "lowerleft". It is case insensitive. Default is "center".
         tolerance : float , optional
             The desired tolerance. Default is 0.0001.
+        silent : bool, optional
+            If set to True, suppresses warning and error messages. Default is False.
+        
 
         Returns
         -------
@@ -3118,24 +3123,89 @@ class Cell():
             The created sphere.
 
         """
-
+    
+        import math
         from topologicpy.Vertex import Vertex
-        from topologicpy.Wire import Wire
-        from topologicpy.CellComplex import CellComplex
+        from topologicpy.Face import Face
+        from topologicpy.Cell import Cell
         from topologicpy.Topology import Topology
 
-        if not Topology.IsInstance(origin, "Vertex"):
+        # Validate inputs
+        if radius <= 0 or uSides < 3 or vSides < 2:
+            if not silent:
+                print("Sphere - Error: radius must be > 0, uSides >= 3, vSides >= 2. Returning None.")
+            return None
+
+        # Center
+        if origin is None:
             origin = Vertex.ByCoordinates(0, 0, 0)
-        if not Topology.IsInstance(origin, "Vertex"):
-            print("Cell.Sphere - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
+        ox = Vertex.X(origin)
+        oy = Vertex.Y(origin)
+        oz = Vertex.Z(origin)
+
+        # Poles
+        top_pole = Vertex.ByCoordinates(ox, oy, oz + radius)
+        bottom_pole = Vertex.ByCoordinates(ox, oy, oz - radius)
+
+        # Latitude rings (exclude poles)
+        rings = []  # list of list[Vertex]
+        for vi in range(1, vSides):
+            phi = math.pi * vi / vSides  # 0..pi
+            sin_phi = math.sin(phi)
+            cos_phi = math.cos(phi)
+            ring = []
+            for ui in range(uSides):
+                theta = 2.0 * math.pi * ui / uSides
+                x = ox + radius * sin_phi * math.cos(theta)
+                y = oy + radius * sin_phi * math.sin(theta)
+                z = oz + radius * cos_phi
+                ring.append(Vertex.ByCoordinates(x, y, z))
+            rings.append(ring)
+
+        faces = []
+
+        # Top cap: triangles from top pole to first ring
+        first_ring = rings[0]
+        for u in range(uSides):
+            v1 = first_ring[u]
+            v2 = first_ring[(u + 1) % uSides]
+            f = Face.ByVertices([top_pole, v1, v2], tolerance=tolerance)
+            if f:
+                faces.append(f)
+
+        # Middle bands: split quads into two triangles
+        for i in range(len(rings) - 1):
+            curr = rings[i]
+            nxt = rings[i + 1]
+            for u in range(uSides):
+                a = curr[u]
+                b = nxt[u]
+                c = nxt[(u + 1) % uSides]
+                d = curr[(u + 1) % uSides]
+                f1 = Face.ByVertices([a, b, c], tolerance=tolerance)
+                if f1:
+                    faces.append(f1)
+                f2 = Face.ByVertices([a, c, d], tolerance=tolerance)
+                if f2:
+                    faces.append(f2)
+
+        # Bottom cap: triangles from last ring to bottom pole
+        last_ring = rings[-1]
+        for u in range(uSides):
+            v1 = last_ring[(u + 1) % uSides]
+            v2 = last_ring[u]
+            f = Face.ByVertices([bottom_pole, v1, v2], tolerance=tolerance)
+            if f:
+                faces.append(f)
+
+        # Sew faces into a shell
+        sphere = None
+        try:
+            sphere = Cell.ByFaces(faces, tolerance=tolerance)
+        except Exception:
+            if not silent:
+                print("Cell.Sphere - Error: could not create a sphere. Returning None.")
             return None
-        c = Wire.Circle(origin=Vertex.Origin(), radius=radius, sides=vSides, fromAngle=0, toAngle=180, close=False, direction=[0, 0, 1], placement="center")
-        c = Topology.Rotate(c, origin=Vertex.Origin(), axis=[1, 0, 0], angle=90)
-        sphere = Topology.Spin(c, origin=Vertex.Origin(), triangulate=False, direction=[0, 0, 1], angle=360, sides=uSides, tolerance=tolerance)
-        if Topology.Type(sphere) == Topology.TypeID("CellComplex"):
-            sphere = CellComplex.ExternalBoundary(sphere)
-        if Topology.Type(sphere) == Topology.TypeID("Shell"):
-            sphere = Cell.ByShell(sphere)
         if placement.lower() == "bottom":
             sphere = Topology.Translate(sphere, 0, 0, radius)
         elif placement.lower() == "lowerleft":

topologicpy/Graph.py

@@ -6255,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):
@@ -13454,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

@@ -8320,6 +8320,8 @@ class Topology():
              absolute=False,
              sides=8,
              angle=0,
+
+             showFigure=True,
              mantissa=6,
              tolerance=0.0001,
              silent=False):
@@ -8507,6 +8509,8 @@ class Topology():
             The units used in the colorbar. Default is ""
         colorScale : str , optional
             The desired type of plotly color scales to use (e.g. "viridis", "plasma"). Default is "viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
+        showFigure : bool , optional
+            If set to True, the figure will be shown and a None is returned. If not, the figure will be returned, but not shown. Default is True.
         mantissa : int , optional
             The desired length of the mantissa for the values listed on the colorbar. Default is 6.
         tolerance : float , optional
@@ -8516,7 +8520,8 @@ class Topology():
 
         Returns
         -------
-        None
+        Plotly figure
+            The created plotly figure.
 
         """
 
@@ -8691,7 +8696,10 @@ class Topology():
                                      tolerance=tolerance)
         if showScale:
             figure = Plotly.AddColorBar(figure, values=cbValues, nTicks=cbTicks, xPosition=cbX, width=cbWidth, outlineWidth=cbOutlineWidth, title=cbTitle, subTitle=cbSubTitle, units=cbUnits, colorScale=colorScale, mantissa=mantissa)
-        Plotly.Show(figure=figure, renderer=renderer, camera=camera, center=center, up=up, projection=projection)
+        if showFigure:
+            Plotly.Show(figure=figure, renderer=renderer, camera=camera, center=center, up=up, projection=projection)
+            return None
+        return figure
 
     @staticmethod
     def SmallestFaces(topology, removeCoplanarFaces: bool = False, epsilon: float = 0.001, tolerance: float = 0.0001, silent: bool = False):

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.50'
+__version__ = '0.8.52'

{topologicpy-0.8.50.dist-info → topologicpy-0.8.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.50
+Version: 0.8.52
 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.50.dist-info → topologicpy-0.8.52.dist-info}/RECORD

@@ -2,7 +2,7 @@ topologicpy/ANN.py,sha256=gpflv4lFypOW789vO7mSkMLaMF_ZftVOCqCvtGr6-JA,47873
 topologicpy/Aperture.py,sha256=wNn5miB_IrGCBYuQ18HXQYRva20dUC3id4AJCulL7to,2723
 topologicpy/BVH.py,sha256=JA4bb-9hgMfVZ_syzmSmTL3ueCq-0vMUGMPZxNcawAY,13023
 topologicpy/CSG.py,sha256=09la1-xzS9vr-WnV7tpJ0I-mkZ-XY0MRSd5iB50Nfgw,15556
-topologicpy/Cell.py,sha256=gldsBl3LnrvTRS4SnK9aAM8k_kS1aNovTjUNHxQRNKk,175319
+topologicpy/Cell.py,sha256=-QoKvAsLjKp4xXO1bXCIpKdKNrPF7o232QTj60WCADE,177462
 topologicpy/CellComplex.py,sha256=Kbz63rGeE08bJfMXFvB-AptoKHiaCK5OtiV1wz8Y-Fk,68081
 topologicpy/Cluster.py,sha256=G49AuhJHQ1s819cB5MtVdmAGgkag19IC3dRP1ub1Wh4,58608
 topologicpy/Color.py,sha256=hzSmgBWhiuYc55RSipkQNIgGtgyhC5BqY8AakNYEK-U,24486
@@ -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=Idp-Wmm_ziofg_mJyJHhw6Qm0xRd-etTzaVNxp3EreU,686857
+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=MoEszjDhEiCVYTO4IFxYsYjYj4Vg5TnWUcnoPMNj-Nc,471350
+topologicpy/Topology.py,sha256=Oz6I0jerzgXJaOEAS-WZVko5wj4_PYq67UH707jpwE0,471685
 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=jLQwp8ZJ2hrMvKdSSwJuigGT_jHflNoJKrmd0A0MBrM,23
-topologicpy-0.8.50.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.50.dist-info/METADATA,sha256=bOOGHTn6e-sOwgpqkBLm1YWvhnNNUMdjgfQZzqLHM9g,10535
-topologicpy-0.8.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-topologicpy-0.8.50.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.50.dist-info/RECORD,,
+topologicpy/version.py,sha256=KGLw5DoKAzuYOCwcR3luB2Dw4oq0tDBaQ67alLPVna8,23
+topologicpy-0.8.52.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.52.dist-info/METADATA,sha256=haOTIpPxEwBfVeLm4SOIow_qanvOQ-4bzWRFNCGnWPg,10535
+topologicpy-0.8.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.52.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.52.dist-info/RECORD,,