topologicpy 0.7.45__py3-none-any.whl → 0.7.47__py3-none-any.whl

topologicpy/Graph.py

@@ -1389,9 +1389,10 @@ class Graph:
         # Add edges based on the adjacency matrix
         edges = []
         for i in range(len(adjacencyMatrix)):
-            for j in range(i+1, len(adjacencyMatrix)):
-                if not adjacencyMatrix[i][j] == 0:
-                    edges.append(Edge.ByVertices([vertices[i], vertices[j]]))
+            for j in range(len(adjacencyMatrix)):
+                if not i == j:
+                    if not adjacencyMatrix[i][j] == 0:
+                        edges.append(Edge.ByVertices([vertices[i], vertices[j]]))
         
         return Graph.ByVerticesEdges(vertices, edges)
 
@@ -4318,6 +4319,7 @@ class Graph:
                         d = Graph.TopologicalDistance(graph, va, vb, tolerance)
                     top_dist += d
                 if top_dist == 0:
+                    print("Topological Distance is Zero!!")
                     scores.append(0)
                 else:
                     scores.append(round((n-1)/top_dist, mantissa))
@@ -7993,9 +7995,39 @@ class Graph:
         return shortestPaths
 
     @staticmethod
-    def Show(graph, vertexColor="black", vertexSize=6, vertexLabelKey=None, vertexGroupKey=None, vertexGroups=[], showVertices=True, showVertexLegend=False, edgeColor="black", edgeWidth=1, edgeLabelKey=None, edgeGroupKey=None, edgeGroups=[], showEdges=True, showEdgeLegend=False, colorScale='viridis', renderer=None,
-             width=950, height=500, xAxis=False, yAxis=False, zAxis=False, axisSize=1, backgroundColor='rgba(0,0,0,0)', marginLeft=0, marginRight=0, marginTop=20, marginBottom=0,
-             camera=[-1.25, -1.25, 1.25], center=[0, 0, 0], up=[0, 0, 1], projection="perspective", tolerance=0.0001):
+    def Show(graph, vertexColor="black",
+             vertexSize=6,
+             vertexLabelKey=None,
+             vertexGroupKey=None,
+             vertexGroups=[],
+             showVertices=True,
+             showVertexLabels=False,
+             showVertexLegend=False,
+             edgeColor="black",
+             edgeWidth=1,
+             edgeLabelKey=None,
+             edgeGroupKey=None,
+             edgeGroups=[],
+             showEdges=True,
+             showEdgeLabels=False,
+             showEdgeLegend=False,
+             colorScale='viridis',
+             renderer=None,
+             width=950,
+             height=500,
+             xAxis=False,
+             yAxis=False,
+             zAxis=False,
+             axisSize=1,
+             backgroundColor='rgba(0,0,0,0)',
+             marginLeft=0,
+             marginRight=0,
+             marginTop=20,
+             marginBottom=0,
+             camera=[-1.25, -1.25, 1.25],
+             center=[0, 0, 0], up=[0, 0, 1],
+             projection="perspective",
+             tolerance=0.0001):
         """
         Shows the graph using Plotly.
 
@@ -8021,6 +8053,8 @@ class Graph:
             The list of vertex groups against which to index the color of the vertex. The default is [].
         showVertices : bool , optional
             If set to True the vertices will be drawn. Otherwise, they will not be drawn. The default is True.
+        showVertexLabels : bool , optional
+            If set to True, the vertex labels are shown permenantely on screen. Otherwise, they are not. The default is False.
         showVertexLegend : bool , optional
             If set to True the vertex legend will be drawn. Otherwise, it will not be drawn. The default is False.
         edgeColor : str , optional
@@ -8041,6 +8075,8 @@ class Graph:
             The list of edge groups against which to index the color of the edge. The default is [].
         showEdges : bool , optional
             If set to True the edges will be drawn. Otherwise, they will not be drawn. The default is True.
+        showEdgeLabels : bool , optional
+            If set to True, the edge labels are shown permenantely on screen. Otherwise, they are not. The default is False.
         showEdgeLegend : bool , optional
             If set to True the edge legend will be drawn. Otherwise, it will not be drawn. The default is False.
         colorScale : str , optional
@@ -8099,7 +8135,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, showVertexLegend=showVertexLegend, edgeColor=edgeColor, edgeWidth=edgeWidth, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, edgeGroups=edgeGroups, showEdges=showEdges, showEdgeLegend=showEdgeLegend, colorScale=colorScale)
+        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)
         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

@@ -279,6 +279,7 @@ class Plotly:
                     vertexGroupKey: str = None,
                     vertexGroups: list = [],
                     showVertices: bool = True,
+                    showVertexLabels: bool = False,
                     showVertexLegend: bool = False,
                     edgeColor: str = "black",
                     edgeWidth: float = 1,
@@ -286,6 +287,7 @@ class Plotly:
                     edgeGroupKey: str = None,
                     edgeGroups: list = [],
                     showEdges: bool = True,
+                    showEdgeLabels: bool = False,
                     showEdgeLegend: bool = False,
                     colorScale: str = "viridis",
                     mantissa: int = 6):
@@ -314,6 +316,8 @@ class Plotly:
             The list of vertex groups against which to index the color of the vertex. The default is [].
         showVertices : bool , optional
             If set to True the vertices will be drawn. Otherwise, they will not be drawn. The default is True.
+        showVertexLabels : bool , optional
+            If set to True, the vertex labels are shown permenantely on screen. Otherwise, they are not. The default is False.
         showVertexLegend : bool , optional
             If set to True the vertex legend will be drawn. Otherwise, it will not be drawn. The default is False.
         edgeColor : str , optional
@@ -334,6 +338,8 @@ class Plotly:
             The list of groups to use for indexing the color of edges. The default is None.
         showEdges : bool , optional
             If set to True the edges will be drawn. Otherwise, they will not be drawn. The default is True.
+        showEdgeLabels : bool , optional
+            If set to True, the edge labels are shown permenantely on screen. Otherwise, they are not. The default is False.
         showEdgeLegend : bool , optional
             If set to True the edge legend will be drawn. Otherwise, it will not be drawn. The default is False.
         colorScale : str , optional
@@ -376,11 +382,11 @@ class Plotly:
                         v_groupList.append(vertexGroups.index(v_group))
                     except:
                         v_groupList.append(len(vertexGroups))
-                    if not v_label == "" and not v_group == "":
-                        if v_group == 0:
-                            v_label = v_label+" (0)"
-                        else:
-                            v_label = v_label+" ("+str(v_group)+")"
+                    # if not v_label == "" and not v_group == "":
+                    #     if v_group == 0:
+                    #         v_label = v_label+" (0)"
+                    #     else:
+                    #         v_label = v_label+" ("+str(v_group)+")"
                     v_labels.append(v_label)
             else:
                 for v in vertices:
@@ -391,10 +397,14 @@ class Plotly:
                 v_groupList = vertexColor
             if len(v_labels) < 1:
                 v_labels = ""
+            if showVertexLabels == True:
+                mode = "markers+text"
+            else:
+                mode = "markers"
             v_trace=go.Scatter3d(x=Xn,
                 y=Yn,
                 z=Zn,
-                mode='markers',
+                mode=mode,
                 name='Graph Vertices',
                 legendgroup=4,
                 legendrank=4,
@@ -457,10 +467,14 @@ class Plotly:
             if len(e_labels) < 1:
                 e_labels = ""
             
+            if showEdgeLabels == True:
+                mode = "lines+text"
+            else:
+                mode = "lines"
             e_trace=go.Scatter3d(x=Xe,
                                  y=Ye,
                                  z=Ze,
-                                 mode='lines',
+                                 mode=mode,
                                  name='Graph Edges',
                                  legendgroup=5,
                                  legendrank=5,

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.45'
+__version__ = '0.7.47'

{topologicpy-0.7.45.dist-info → topologicpy-0.7.47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.45
+Version: 0.7.47
 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
@@ -49,7 +49,7 @@ Requires-Dist: pytest-xdist >=2.4.0 ; extra == 'test'
 
 <img src="https://topologic.app/wp-content/uploads/2023/02/topologicpy-logo-no-loop.gif" alt="topologicpy logo" width="250" loop="1">
 
-# An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction
+# An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction
 
 ## Introduction
 Welcome to topologicpy (rhymes with apple pie). topologicpy is an open-source python 3 implementation of [Topologic](https://topologic.app) which is a powerful spatial modelling and analysis software library that revolutionizes the way you design architectural spaces, buildings, and artefacts. Topologic's advanced features enable you to create hierarchical and topological information-rich 3D representations that offer unprecedented flexibility and control in your design process. With the integration of geometry, topology, information, and artificial intelligence, Topologic enriches Building Information Models with Building *Intelligence* Models.

{topologicpy-0.7.45.dist-info → topologicpy-0.7.47.dist-info}/RECORD

@@ -10,13 +10,13 @@ topologicpy/Dictionary.py,sha256=KqJ29YyE23Y3Xc6XmKLSCZXRfBvm-OEOxlMZ4dt-rfM,270
 topologicpy/Edge.py,sha256=vhYHkobSLGSWV-oe2oJFFDobqFToDyb7s71yQ840AAA,65166
 topologicpy/EnergyModel.py,sha256=XcCP55VW5WHDIIKcURijmBOZEgNUDEn_V9h5EejkntA,53876
 topologicpy/Face.py,sha256=pn0LGusTPKLrHEMhY94_Bs3rc4wUpIyEqyW9q-ftdG0,115379
-topologicpy/Graph.py,sha256=3TB0bfESpBsGnI7CspeeZqC5v1hVY9SwAgvczFJxT_4,401612
+topologicpy/Graph.py,sha256=1dtcE342b6d7cTiMbtUWWOud6Vu0vHaf4HP2eG_-iqg,402544
 topologicpy/Grid.py,sha256=3-sn7CHWGcXk18XCnHjsUttNJTWwmN63g_Insj__p04,18218
 topologicpy/Helper.py,sha256=i-AfI29NMsZXBaymjilfvxQbuS3wpYbpPw4RWu1YCHs,16358
 topologicpy/Honeybee.py,sha256=vcBECJlgWVjNNdD9ZmjNik_pA1Y_ZNoOorsQb2CiyGA,21965
 topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=YvtF7RYUMATEZ8iHwFwK_MOxEDyARby2DTI2CCK6-cI,19694
-topologicpy/Plotly.py,sha256=Q1jrHXFFNwzA6lMa5V0sH7I5p5KRp5y_WohDnhIlB2E,105354
+topologicpy/Plotly.py,sha256=o0JWE51lViK-UJUpIpf2Yusk_vTX5hfNMyFXFinKSRg,106048
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=0yeECsMz-dqhhZSv52s_xPCO_3BcEXUK7z1YFDN9qoo,106987
 topologicpy/Shell.py,sha256=aKdWIAqmLKPyi80f2PtH3_1iMfQRW0Eklbqol9cOPWM,87601
@@ -27,9 +27,9 @@ topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 topologicpy/Vertex.py,sha256=EQdVYHmW85_pZdHZB3N8pEi0GiadCCkF3z_oqohA7B0,71161
 topologicpy/Wire.py,sha256=9EJE0Iq3nGz5X7Suy6xxjmuOpfV49By6WH98UAL_7m4,153532
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=M-0kJd97wNsL6CZrI2htV9HFPeXVaDWIQkIhzYnuc-Q,23
-topologicpy-0.7.45.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.45.dist-info/METADATA,sha256=4AAcme8ANBpGbJpb0G9Rw12I7lL95TmhfYP_GTz9sK4,10916
-topologicpy-0.7.45.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-topologicpy-0.7.45.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.45.dist-info/RECORD,,
+topologicpy/version.py,sha256=dUV7gU4tNxCy2pDr--lKpOV5DarADBM2ESg5M5mYK6w,23
+topologicpy-0.7.47.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.47.dist-info/METADATA,sha256=6U-VIKu7gA3coK8iB1LazrQeGV8Wkj-q5Fpf4B9ppM0,10918
+topologicpy-0.7.47.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+topologicpy-0.7.47.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.47.dist-info/RECORD,,