topologicpy 0.7.90__py3-none-any.whl → 0.7.92__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/Vector.py

@@ -312,7 +312,7 @@ class Vector(list):
         return vector
 
     @staticmethod
-    def CompassAngle(vectorA, vectorB, mantissa=6, tolerance=0.0001):
+    def CompassAngle(vectorA, vectorB, mantissa: int = 6, tolerance: float = 0.0001, silent: bool = False):
         """
         Returns the horizontal compass angle in degrees between the two input vectors. The angle is measured in clockwise fashion.
         0 is along the positive Y-axis, 90 is along the positive X axis.
@@ -328,6 +328,8 @@ class Vector(list):
             The length of the desired mantissa. The default is 6.
         tolerance : float , optional
             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
         -------
@@ -335,9 +337,21 @@ class Vector(list):
             The horizontal compass angle in degrees between the two input vectors.
 
         """
+        if not isinstance(vectorA, list):
+            if not silent:
+                print("Vector.Coordinates - Error: The input vectorA parameter is not a valid vector. Returning Nonne.")
+            return None
+        if not isinstance(vectorB, list):
+            if not silent:
+                print("Vector.Coordinates - Error: The input vectorB parameter is not a valid vector. Returning Nonne.")
+            return None
         if abs(vectorA[0]) < tolerance and abs(vectorA[1]) < tolerance:
+            if not silent:
+                print("Vector.CompassAngle - Error: The input vectorA parameter is vertical in the Z Axis. Returning Nonne.")
             return None
         if abs(vectorB[0]) < tolerance and abs(vectorB[1]) < tolerance:
+            if not silent:
+                print("Vector.CompassAngle - Error: The input vectorB parameter is vertical in the Z Axis. Returning Nonne.")
             return None
         p1 = (vectorA[0], vectorA[1])
         p2 = (vectorB[0], vectorB[1])
@@ -346,7 +360,7 @@ class Vector(list):
         return round(rad2deg((ang1 - ang2) % (2 * pi)), mantissa)
 
     @staticmethod
-    def Coordinates(vector, outputType="xyz", mantissa: int = 6):
+    def Coordinates(vector, outputType="xyz", mantissa: int = 6, silent: bool = False):
         """
         Returns the coordinates of the input vector.
 
@@ -358,6 +372,8 @@ class Vector(list):
             The desired output type. Could be any permutation or substring of "xyz" or the string "matrix". The default is "xyz". The input is case insensitive and the coordinates will be returned in the specified order.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -366,6 +382,8 @@ class Vector(list):
 
         """
         if not isinstance(vector, list):
+            if not silent:
+                print("Vector.Coordinates - Error: The input vector parameter is not a valid vector. Returning None.")
             return None
         x = round(vector[0], mantissa)
         y = round(vector[1], mantissa)
@@ -390,7 +408,7 @@ class Vector(list):
         return output
     
     @staticmethod
-    def Cross(vectorA, vectorB, mantissa=6, tolerance=0.0001):
+    def Cross(vectorA, vectorB, mantissa: int = 6, tolerance: float = 0.0001, silent: bool = False):
         """
         Returns the cross product of the two input vectors. The resulting vector is perpendicular to the plane defined by the two input vectors.
 
@@ -404,6 +422,8 @@ class Vector(list):
             The length of the desired mantissa. The default is 6.
         tolerance : float, optional
             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
         -------
@@ -411,9 +431,21 @@ class Vector(list):
             The vector representing the cross product of the two input vectors.
 
         """
-        if not isinstance(vectorA, list) or not isinstance(vectorB, list):
+        if not isinstance(vectorA, list):
+            if not silent:
+                print("Vector.Cross - Error: The input vectorA parameter is not a valid vector. Returning None.")
+            return None
+        if not isinstance(vectorB, list):
+            if not silent:
+                print("Vector.Cross - Error: The input vectorB parameter is not a valid vector. Returning None.")
             return None
-        if Vector.Magnitude(vector=vectorA, mantissa=mantissa) < tolerance or Vector.Magnitude(vector=vectorB, mantissa=mantissa) < tolerance:
+        if Vector.Magnitude(vector=vectorA, mantissa=mantissa) < tolerance:
+            if not silent:
+                print("Vector.Cross - Error: The magnitude of the input vectorA parameter is less than the input tolerance parameter. Returning None.")
+            return None
+        if Vector.Magnitude(vector=vectorB, mantissa=mantissa) < tolerance:
+            if not silent:
+                print("Vector.Cross - Error: The magnitude of the input vectorB parameter is less than the input tolerance parameter. Returning None.")
             return None
         vecA = np.array(vectorA)
         vecB = np.array(vectorB)
@@ -423,7 +455,7 @@ class Vector(list):
         return [round(vecC[0], mantissa), round(vecC[1], mantissa), round(vecC[2], mantissa)]
 
     @staticmethod
-    def Dot(vectorA, vectorB, mantissa=6):
+    def Dot(vectorA, vectorB, mantissa: int = 6, tolerance: float = 0.0001, silent: bool = False):
         """
         Returns the dot product of the two input vectors which is a measure of how much they are aligned.
 
@@ -435,6 +467,10 @@ class Vector(list):
             The second vector.
         mantissa : int, optional
             The length of the desired mantissa. The default is 6.
+        tolerance : float, optional
+            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
         -------
@@ -442,6 +478,22 @@ class Vector(list):
             The vector representing the cross product of the two input vectors.
 
         """
+        if not isinstance(vectorA, list):
+            if not silent:
+                print("Vector.Dot - Error: The input vectorA parameter is not a valid vector. Returning None.")
+            return None
+        if not isinstance(vectorB, list):
+            if not silent:
+                print("Vector.Dot - Error: The input vectorB parameter is not a valid vector. Returning None.")
+            return None
+        if Vector.Magnitude(vector=vectorA, mantissa=mantissa) < tolerance:
+            if not silent:
+                print("Vector.Dot - Error: The magnitude of the input vectorA parameter is less than the input tolerance parameter. Returning None.")
+            return None
+        if Vector.Magnitude(vector=vectorB, mantissa=mantissa) < tolerance:
+            if not silent:
+                print("Vector.Dot - Error: The magnitude of the input vectorB parameter is less than the input tolerance parameter. Returning None.")
+            return None
         return round(sum(a*b for a, b in zip(vectorA, vectorB)), mantissa)
     
     @staticmethod
@@ -506,42 +558,6 @@ class Vector(list):
             # Compute bisecting vector
             return False
     
-    @staticmethod
-    def IsParallel(vectorA, vectorB):
-        """
-        Returns True if the input vectors are parallel. Returns False otherwise.
-        
-        Parameters
-        ----------
-        vectorA : list
-            The first input vector.
-        vectorB : list
-            The second input vector.
-            
-        Returns
-        -------
-        bool
-            True if the input vectors are parallel. False otherwise.
-        
-        """
-        import numpy as np
-
-        # Ensure vectors are numpy arrays
-        vector1 = np.array(vectorA)
-        vector2 = np.array(vectorB)
-        
-        # Normalize input vectors
-        vector1_norm = vector1 / np.linalg.norm(vector1)
-        vector2_norm = vector2 / np.linalg.norm(vector2)
-        
-        # Check if the angle between vectors is either 0 or 180 degrees
-        dot_product = np.dot(vector1_norm, vector2_norm)
-        if np.isclose(dot_product, 1.0):
-            return True
-        else:
-            # Compute bisecting vector
-            return False
-    
     @staticmethod
     def IsCollinear(vectorA, vectorB):
         """

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.90'
+__version__ = '0.7.92'

{topologicpy-0.7.90.dist-info → topologicpy-0.7.92.dist-info}/METADATA

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

@@ -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=f4DrZJ2AgwnTwIorJpwuOXtWq501wOMRixMgHZC78so,143843
-topologicpy/Graph.py,sha256=Zxmoy2FAl5m_MGUd62jDeajmZAFlKXVHf1Fy68TrsSw,436694
+topologicpy/Face.py,sha256=2k1vSRK1M-s588RcqGHEalwIHJ9nT3qgx3pU4ktN0dU,150077
+topologicpy/Graph.py,sha256=LJek7dV9bq9uBf_2akAYrETjbSFfoPgLaMsHs4brvc4,455475
 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=d99wryPPXvw7eRw12GVKV-DT6jhlmVq6GsMAjg-E-40,441693
-topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
+topologicpy/Vector.py,sha256=Cl7besf20cAGmyNPh-9gbFAHnRU5ZWSMChJ3VyFIDs4,35416
 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=mYCzbNDO5wSdD-Yv5YhtOF5hGlgyQ-E65V4XiSUOLnk,23
-topologicpy-0.7.90.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.90.dist-info/METADATA,sha256=h8bGLDHNJXflEvDHHSsD0bDwwj39F_AvSqvvwVvi5Ec,10513
-topologicpy-0.7.90.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-topologicpy-0.7.90.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.90.dist-info/RECORD,,
+topologicpy/version.py,sha256=hEe71TmHDfYxdkk064adNlI0kHL1_wHg4VoGMKoeSWM,23
+topologicpy-0.7.92.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.92.dist-info/METADATA,sha256=t-giZYVXIF8phaA32BSO55_r4qGngtkKS_MMHUjD-aA,10513
+topologicpy-0.7.92.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+topologicpy-0.7.92.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.92.dist-info/RECORD,,