topologicpy 0.7.87__py3-none-any.whl → 0.7.91__py3-none-any.whl

topologicpy/Plotly.py

@@ -411,29 +411,46 @@ class Plotly:
         
         if showVertices:
             vertices = Graph.Vertices(graph)
-            #v_dictionaries = [Topology.Dictionary(v) for v in vertices]
+            v_dictionaries = [Topology.Dictionary(v) for v in vertices]
             e_cluster = Cluster.ByTopologies(vertices)
             geo = Topology.Geometry(e_cluster, mantissa=mantissa)
             vertices = geo['vertices']
             if len(vertices) > 0:
-                v_data = Plotly.DataByTopology(e_cluster,
-                                        vertexColor=vertexColor,
-                                        vertexColorKey=vertexColorKey,
-                                        vertexSize=vertexSize,
-                                        vertexSizeKey=vertexSizeKey,
-                                        vertexLabelKey=vertexLabelKey,
-                                        showVertexLabel=showVertexLabel,
-                                        vertexGroupKey=vertexGroupKey,
-                                        vertexMinGroup=vertexMinGroup,
-                                        vertexMaxGroup=vertexMaxGroup,
-                                        vertexGroups=vertexGroups,
-                                        showVertexLegend=showVertexLegend,
-                                        vertexLegendLabel=vertexLegendLabel,
-                                        vertexLegendGroup=vertexLegendGroup,
-                                        vertexLegendRank=vertexLegendRank,
-                                        colorScale=colorScale)
-
-                data += v_data
+                v_data = Plotly.vertexData(vertices,
+                                   dictionaries=v_dictionaries,
+                                   color=vertexColor,
+                                   colorKey=vertexColorKey,
+                                   size=vertexSize,
+                                   sizeKey=vertexSizeKey,
+                                   labelKey=vertexLabelKey,
+                                   showVertexLabel=showVertexLabel,
+                                   groupKey=vertexGroupKey,
+                                   minGroup=vertexMinGroup,
+                                   maxGroup=vertexMaxGroup,
+                                   groups=vertexGroups,
+                                   legendLabel=vertexLegendLabel,
+                                   legendGroup=vertexLegendGroup,
+                                   legendRank=vertexLegendRank,
+                                   showLegend=showVertexLegend,
+                                   colorScale=colorScale)
+
+                # v_data = Plotly.DataByTopology(e_cluster,
+                #                         vertexColor=vertexColor,
+                #                         vertexColorKey=vertexColorKey,
+                #                         vertexSize=vertexSize,
+                #                         vertexSizeKey=vertexSizeKey,
+                #                         vertexLabelKey=vertexLabelKey,
+                #                         showVertexLabel=showVertexLabel,
+                #                         vertexGroupKey=vertexGroupKey,
+                #                         vertexMinGroup=vertexMinGroup,
+                #                         vertexMaxGroup=vertexMaxGroup,
+                #                         vertexGroups=vertexGroups,
+                #                         showVertexLegend=showVertexLegend,
+                #                         vertexLegendLabel=vertexLegendLabel,
+                #                         vertexLegendGroup=vertexLegendGroup,
+                #                         vertexLegendRank=vertexLegendRank,
+                #                         colorScale=colorScale)
+                data += [v_data]
         
         if showEdges:
             e_dictionaries = []
@@ -501,7 +518,7 @@ class Plotly:
                 z.append(v[2])
                 colors.append(Color.AnyToHex(color))
                 labels.append("Vertex_"+str(m+1).zfill(n))
-                sizes.append(size)
+                sizes.append(max(size, 1.1))
                 if len(dictionaries) > 0:
                     d = dictionaries[m]
                     if d:
@@ -512,7 +529,11 @@ class Plotly:
                         if not labelKey == None:
                             labels[m] = str(Dictionary.ValueAtKey(d, key=labelKey)) or labels[m]
                         if not sizeKey == None:
-                            sizes[m] = Dictionary.ValueAtKey(d, key=sizeKey) or sizes[m]
+                            sizes[m] = Dictionary.ValueAtKey(d, key=sizeKey)
+                            if sizes[m] == None:
+                               sizes[m] = size
+                            if sizes[m] <= 0:
+                                sizes[m] = 1.1
                         if not groupKey == None:
                             c_value = Dictionary.ValueAtKey(d, key=groupKey)
                             if not c_value == None:
@@ -540,7 +561,7 @@ class Plotly:
         if len(labels) < 1:
             labels = "Vertex_1"
         if len(sizes) < 1:
-            sizes = size
+            sizes = [size]*len(x)
         if showVertexLabel == True:
             mode = "markers+text"
         else:

topologicpy/Topology.py

@@ -6240,7 +6240,7 @@ class Topology():
             return Topology.Type(topology)
 
     @staticmethod
-    def _InternalVertex(topology, tolerance: float = 0.0001):
+    def _InternalVertex(topology, tolerance: float = 0.0001, silent: bool = False):
         """
         Returns a vertex guaranteed to be inside the input topology.
 
@@ -6250,6 +6250,8 @@ class Topology():
             The input topology.
         tolerance : float , ptional
             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
         -------
@@ -6271,20 +6273,20 @@ class Topology():
         top = Topology.Copy(topology)
         if Topology.IsInstance(top, "CellComplex"): #CellComplex
             tempCell = Topology.Cells(top)[0]
-            vst = Cell.InternalVertex(tempCell, tolerance=tolerance)
+            vst = Cell.InternalVertex(tempCell, tolerance=tolerance, silent=silent)
         elif Topology.IsInstance(top, "Cell"): #Cell
-            vst = Cell.InternalVertex(top, tolerance=tolerance)
+            vst = Cell.InternalVertex(top, tolerance=tolerance, silent=silent)
         elif Topology.IsInstance(top, "Shell"): #Shell
             tempFace = Topology.Faces(top)[0]
-            vst = Face.InternalVertex(tempFace, tolerance=tolerance)
+            vst = Face.InternalVertex(tempFace, tolerance=tolerance, silent=silent)
         elif Topology.IsInstance(top, "Face"): #Face
-            vst = Face.InternalVertex(top, tolerance=tolerance)
+            vst = Face.InternalVertex(top, tolerance=tolerance, silent=silent)
         elif Topology.IsInstance(top, "Wire"): #Wire
             if top.IsClosed():
                 internalBoundaries = []
                 try:
                     tempFace = topologic.Face.ByExternalInternalBoundaries(top, internalBoundaries)
-                    vst = Face.InternalVertex(tempFace, tolerance=tolerance)
+                    vst = Face.InternalVertex(tempFace, tolerance=tolerance, silent=silent)
                 except:
                     vst = Topology.Centroid(top)
             else:
@@ -6295,7 +6297,7 @@ class Topology():
         elif Topology.IsInstance(top, "Vertex"): #Vertex
             vst = top
         elif Topology.IsInstance(topology, "Aperture"): #Aperture
-            vst = Face.InternalVertex(Aperture.Topology(top), tolerance=tolerance)
+            vst = Face.InternalVertex(Aperture.Topology(top), tolerance=tolerance, silent=silent)
         else:
             vst = Topology.Centroid(top)
         return vst
@@ -6303,7 +6305,7 @@ class Topology():
     
 
     @staticmethod
-    def InternalVertex(topology, timeout: int = 10, tolerance: float = 0.0001):
+    def InternalVertex(topology, timeout: int = 30, tolerance: float = 0.0001, silent: bool = False):
         """
         Returns a vertex guaranteed to be inside the input topology.
 
@@ -6312,9 +6314,11 @@ class Topology():
         topology : topologic_core.Topology
             The input topology.
         timeout : int , optional
-            The amount of seconds to wait before timing out. The default is 10 seconds.
+            The amount of seconds to wait before timing out. The default is 30 seconds.
         tolerance : float , ptional
             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
         -------
@@ -6325,22 +6329,21 @@ class Topology():
         import concurrent.futures
         import time
         # Wrapper function with timeout
-        def run_with_timeout(func, topology, tolerance=0.0001, timeout=10):
+        def run_with_timeout(func, topology, tolerance=0.0001, silent=False, timeout=10):
             with concurrent.futures.ThreadPoolExecutor() as executor:
-                future = executor.submit(func, topology, tolerance=tolerance)
+                future = executor.submit(func, topology, tolerance=tolerance, silent=silent)
                 try:
                     result = future.result(timeout=timeout)  # Wait for the result with a timeout
                     return result
                 except concurrent.futures.TimeoutError:
-                    print("Function took too long, retrying with a different solution.")
                     return None  # or try another approach here
 
-        result = run_with_timeout(Topology._InternalVertex, topology=topology, tolerance=tolerance, timeout=timeout)  # Set a 10 second timeout
+        result = run_with_timeout(Topology._InternalVertex, topology=topology, tolerance=tolerance, silent=silent, timeout=timeout)  # Set a 10 second timeout
         if result is None:
             # Handle failure case (e.g., try a different solution)
-            print("Using a different approach.")
-            result = Topology.Centroid(topology)
-            print("Result is:", result)
+            if not silent:
+                print("Topology.InternalVertex - Warning: Operation took too long. Returning None")
+            return None
         return result
 
     @staticmethod

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.87'
+__version__ = '0.7.91'

{topologicpy-0.7.87.dist-info → topologicpy-0.7.91.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.87
+Version: 0.7.91
 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.7.87.dist-info → topologicpy-0.7.91.dist-info}/RECORD

@@ -1,7 +1,7 @@
 topologicpy/ANN.py,sha256=m_WxD1lgQqDhUpaM20Lia6TmJACDYaAE96wigsi-99U,47932
 topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
 topologicpy/BVH.py,sha256=mKVCAu9K8qzcWXtPDVH5usXZV1DNNNJl4n3rU5Lh1ZM,12931
-topologicpy/Cell.py,sha256=nVJEFgj6nnHDNUYIlMf1NS2xiufDMj18szKGqf9HwDM,108090
+topologicpy/Cell.py,sha256=Fdqf2GCWfKe50EecBVcB8PCHKWENRUTTH8yPrOSF3-0,108321
 topologicpy/CellComplex.py,sha256=ncjfvJ2QJzz4Fu8BMaQBLxAQ6WHx6HfUCddaLP8kXsc,51480
 topologicpy/Cluster.py,sha256=__PvNVjRnFfy12aawd7HSrb3UBX3Rtd1iWSSQnPGpfk,55768
 topologicpy/Color.py,sha256=q9xsGmxFMz7sQKmygwSVS12GaTRB-OT0-_i6t3-cthE,20307
@@ -10,27 +10,27 @@ topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=t0O7Du-iPq46FyKqZfcjHfsUK1E8GS_e67R2V5cpkbw,33186
 topologicpy/Edge.py,sha256=KWOJCkLDwCWyZJ5MKwDhT5umWwCYBHtLOz6ulHrSOfY,67205
 topologicpy/EnergyModel.py,sha256=AqTtmXE35SxvRXhG3vYAQd7GQDW-6HtjYPHua6ME4Eg,53762
-topologicpy/Face.py,sha256=qiQmvCRFHO248VMqPxcE4Jrrw2JvNIJDdWHMopCPWGQ,142173
-topologicpy/Graph.py,sha256=YKVo3ePAesJL4pt8GBekzPhujGeTc2XbErnzqEOZITQ,431147
+topologicpy/Face.py,sha256=2k1vSRK1M-s588RcqGHEalwIHJ9nT3qgx3pU4ktN0dU,150077
+topologicpy/Graph.py,sha256=Qm0V17oeIlhr62faoYqJpNUMzAB5d0F-3zes4jCtRi8,460350
 topologicpy/Grid.py,sha256=2s9cSlWldivn1i9EUz4OOokJyANveqmRe_vR93CAndI,18245
 topologicpy/Helper.py,sha256=F3h4_qcOD_PHAoVe0tEbEE7_jYyVcaHjtwVs4QHOZuI,23978
 topologicpy/Honeybee.py,sha256=HfTaEV1R8K1xOVQQy9sBOhBTF_ap8A2RxZOYhirp_Mw,21835
 topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=t52hgE9cVsqkGc7m7fjRsLnyfRHakVHwdvF4ms7ow78,22342
-topologicpy/Plotly.py,sha256=Ld-VrYAn_FwONYwdVoz-7Kqt-5fs-qbVl35Utmcu7OE,114508
+topologicpy/Plotly.py,sha256=Tvo0_zKVEHtPhsMNNvLy5G0HIys5FPAOyp_o4QN_I_A,115760
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 topologicpy/Shell.py,sha256=UdDz3zfIYmGRjoZIseviJ2cXNtR5Kx5tIsZLhWMyO_U,87906
 topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=E683mKTwx4a1p1l6vN5KWFqX9gVJwV78S12EdtkfQjM,441297
+topologicpy/Topology.py,sha256=d99wryPPXvw7eRw12GVKV-DT6jhlmVq6GsMAjg-E-40,441693
 topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=sYWTbAHqKGRUAJRCIUqrCO_xFhvsXK09Sx7E4dafPLQ,73754
 topologicpy/Wire.py,sha256=HjagWKoJb8Z3zhgOij_4k6ZnKIl5gk8LletHbsT1ZKU,190632
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=9To1hhHw5YQrfDyVdFvuKgwM_UIfjviXKudPl9B2kdE,23
-topologicpy-0.7.87.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.87.dist-info/METADATA,sha256=UWltJr_9E-eV2trZxj7ZsvXZlVD8GHtBWdIxgUvn6zM,10513
-topologicpy-0.7.87.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-topologicpy-0.7.87.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.87.dist-info/RECORD,,
+topologicpy/version.py,sha256=em3O4PG8JKL9957EgCcS5zUXOhgyMhAa6bmjZHQ7UmE,23
+topologicpy-0.7.91.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.91.dist-info/METADATA,sha256=m96FnumZC4Hy2QqaPuRryOZron2mQdjkGJvv5HJs3kM,10513
+topologicpy-0.7.91.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+topologicpy-0.7.91.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.91.dist-info/RECORD,,