topologicpy 0.8.10__py3-none-any.whl → 0.8.11__py3-none-any.whl

topologicpy/Vector.py

@@ -275,13 +275,13 @@ class Vector(list):
         return [x, y, z]
     
     @staticmethod
-    def ByVertices(vertices, normalize: bool = True, mantissa: int = 6):
+    def ByVertices(*vertices, normalize: bool = True, mantissa: int = 6, silent: bool = False):
         """
         Creates a vector by the specified input list of vertices.
 
         Parameters
         ----------
-        vertices : list
+        *vertices : list
             The the input list of topologic vertices. The first element in the list is considered the start vertex. The last element in the list is considered the end vertex.
         normalize : bool , optional
             If set to True, the resulting vector is normalized (i.e. its length is set to 1)
@@ -296,16 +296,59 @@ class Vector(list):
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Topology import Topology
+        from topologicpy.Helper import Helper
+        import inspect
 
-        if not isinstance(vertices, list):
+        if len(vertices) == 0:
+            if not silent:
+                print("Vector.ByVertices - Error: The input vertices parameter is an empty list. Returning None.")
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
             return None
-        if not isinstance(normalize, bool):
+        if len(vertices) == 1:
+            vertices = vertices[0]
+            if isinstance(vertices, list):
+                if len(vertices) == 0:
+                    if not silent:
+                        print("Vector.ByVertices - Error: The input vertices parameter is an empty list. Returning None.")
+                        curframe = inspect.currentframe()
+                        calframe = inspect.getouterframes(curframe, 2)
+                        print('caller name:', calframe[1][3])
+                    return None
+                else:
+                    vertexList = [x for x in vertices if Topology.IsInstance(x, "Vertex")]
+                    if len(vertexList) == 0:
+                        if not silent:
+                            print("Vector.ByVertices - Error: The input vertices parameter does not contain any valid vertices. Returning None.")
+                            curframe = inspect.currentframe()
+                            calframe = inspect.getouterframes(curframe, 2)
+                            print('caller name:', calframe[1][3])
+                        return None
+            else:
+                if not silent:
+                    print("Vector.ByVertices - Warning: The input vertices parameter contains only one vertex. Returning None.")
+                    curframe = inspect.currentframe()
+                    calframe = inspect.getouterframes(curframe, 2)
+                    print('caller name:', calframe[1][3])
+                return None
+        else:
+            vertexList = Helper.Flatten(list(vertices))
+            vertexList = [x for x in vertexList if Topology.IsInstance(x, "Vertex")]
+        if len(vertexList) == 0:
+            if not silent:
+                print("Vector.ByVertices - Error: The input parameters do not contain any valid vertices. Returning None.")
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
             return None
-        vertices = [v for v in vertices if Topology.IsInstance(v, "Vertex")]
-        if len(vertices) < 2:
+
+        if len(vertexList) < 2:
+            if not silent:
+                print("Vector.ByVertices - Error: The input parameters do not contain a minimum of two valid vertices. Returning None.")
             return None
-        v1 = vertices[0]
-        v2 = vertices[-1]
+        v1 = vertexList[0]
+        v2 = vertexList[-1]
         vector = [Vertex.X(v2, mantissa=mantissa)-Vertex.X(v1, mantissa=mantissa), Vertex.Y(v2, mantissa=mantissa)-Vertex.Y(v1, mantissa=mantissa), Vertex.Z(v2, mantissa=mantissa)-Vertex.Z(v1, mantissa=mantissa)]
         if normalize:
             vector = Vector.Normalize(vector)
@@ -673,22 +716,26 @@ class Vector(list):
             return False
     
     @staticmethod
-    def IsCollinear(vectorA, vectorB):
+    def IsCollinear(vectorA, vectorB, tolerance=0.0001):
         """
-        Returns True if the input vectors are collinear (parallel or anti-parallel). Returns False otherwise.
-        
+        Returns True if the input vectors are collinear (parallel or anti-parallel) 
+        within a given tolerance. Returns False otherwise.
+
         Parameters
         ----------
         vectorA : list
             The first input vector.
         vectorB : list
             The second input vector.
+        tolerance : float, optional
+            The desired tolerance for determining collinearity. The default is 0.0001.
             
         Returns
         -------
         bool
-            True if the input vectors are collinear (parallel or anti-parallel). False otherwise.
-        
+            True if the input vectors are collinear (parallel or anti-parallel). 
+            False otherwise.
+
         """
         import numpy as np
 
@@ -700,17 +747,19 @@ class Vector(list):
         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
+        # Check if the dot product is within the tolerance of 1.0 or -1.0
         dot_product = np.dot(vector1_norm, vector2_norm)
-        if np.isclose(dot_product, 1.0) or np.isclose(dot_product, -1.0):
+        if (1.0 - tolerance) <= dot_product <= (1.0 + tolerance) or \
+        (-1.0 - tolerance) <= dot_product <= (-1.0 + tolerance):
             return True
         else:
             return False
     
     @staticmethod
-    def IsParallel(vectorA, vectorB):
+    def IsParallel(vectorA, vectorB, tolerance=0.0001):
         """
-        Returns True if the input vectors are parallel. Returns False otherwise.
+        Returns True if the input vectors are parallel within a given tolerance.
+        Returns False otherwise.
         
         Parameters
         ----------
@@ -718,12 +767,13 @@ class Vector(list):
             The first input vector.
         vectorB : list
             The second input vector.
+        tolerance : float, optional
+            The desired tolerance for determining parallelism. The default is 0.0001.
             
         Returns
         -------
         bool
             True if the input vectors are parallel. False otherwise.
-        
         """
         import numpy as np
 
@@ -735,14 +785,13 @@ class Vector(list):
         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
+        # Check if the dot product is within the tolerance of 1.0
         dot_product = np.dot(vector1_norm, vector2_norm)
-        if np.isclose(dot_product, 1.0):
+        if (1.0 - tolerance) <= dot_product <= (1.0 + tolerance):
             return True
         else:
-            # Compute bisecting vector
             return False
-    
+
     @staticmethod
     def IsSame(vectorA, vectorB, tolerance=0.0001):
         """

topologicpy/Vertex.py

@@ -1806,6 +1806,63 @@ class Vertex():
                 separated_vertices[i] = Topology.SetDictionary(separated_vertices[i], d)
         return separated_vertices
 
+    @staticmethod
+    def Transform(vertex, matrix, mantissa: int = 6, silent: bool = False):
+        """
+        Transforms a 3D vertex using a 4x4 transformation matrix.
+
+        Parameters
+        ----------
+        vertex : topologic_core.Vertex
+            The input vertex
+        matrix : list
+            The 4x4 transformation matrix.
+        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
+        -------
+        topologic_core.Vertex
+            The transformed vertex.
+        """
+        from topologicpy.Topology import Topology
+
+        if not Topology.IsInstance(vertex, "vertex"):
+            if not silent:
+                print("Vertex.Transform - Error: The input vertex parameter is not a valid vertex. Returning None.")
+            return None
+        
+        if not isinstance(matrix, list):
+            if not silent:
+                print("Vertex.Transform - Error: The input matrix parameter is not a valid 4X4 matrix. Returning None.")
+            return None
+        
+        matrix = np.array(matrix)  # Convert list to numpy array if necessary
+    
+        # Check if the shape of the matrix is (4, 4)
+        if not matrix.shape == (4, 4):
+            if not silent:
+                print("Vertex.Transform - Error: The input matrix parameter is not a valid 4X4 matrix. Returning None.")
+            return None
+        
+        # Convert the vertex to a 4D homogeneous coordinate
+        coords = Vertex.Coordinates(vertex, mantissa=mantissa)
+        homogeneous_coords= np.array([coords[0], coords[1], coords[2], 1.0])
+        
+        # Perform matrix multiplication
+        transformed_coords = np.dot(matrix, homogeneous_coords)
+        
+        # Convert back to 3D by dividing by w
+        if not np.isclose(transformed_coords[3], 0):  # Avoid division by zero
+            transformed_coords /= transformed_coords[3]
+        
+        # Return the transformed (x', y', z') as a list
+        coords = transformed_coords[:3].tolist()
+        coords = [round(v, mantissa) for v in coords]
+        return Vertex.ByCoordinates(coords)
+    
     @staticmethod
     def X(vertex, mantissa: int = 6) -> float:
         """

topologicpy/Wire.py

@@ -3596,7 +3596,6 @@ class Wire():
             baseWire = Topology.Orient(baseWire, origin=origin, dirA=[0, 0, 1], dirB=direction)
         return baseWire
 
-
     @staticmethod
     def RemoveCollinearEdges(wire, angTolerance: float = 0.1, tolerance: float = 0.0001, silent: bool = False):
         """
@@ -3690,124 +3689,6 @@ class Wire():
         else:
             return Topology.SelfMerge(Cluster.ByTopologies(processed_wires, silent=silent))
 
-    @staticmethod
-    def RemoveCollinearEdges_old(wire, angTolerance: float = 0.1, tolerance: float = 0.0001, silent: bool = False):
-        """
-        Removes any collinear edges in the input wire.
-
-        Parameters
-        ----------
-        wire : topologic_core.Wire
-            The input wire.
-        angTolerance : float , optional
-            The desired angular tolerance. The default is 0.1.
-        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
-        -------
-        topologic_core.Wire
-            The created wire without any collinear edges.
-
-        """
-        from topologicpy.Vertex import Vertex
-        from topologicpy.Edge import Edge
-        from topologicpy.Cluster import Cluster
-        from topologicpy.Topology import Topology
-        import inspect
-        
-        def cleanup(wire, tolerance=0.0001):
-            vertices = Topology.Vertices(wire)
-            vertices = Vertex.Fuse(vertices, tolerance=tolerance)
-            edges = Topology.Edges(wire)
-            new_edges = []
-            for edge in edges:
-                sv = Edge.StartVertex(edge)
-                sv = vertices[Vertex.Index(sv, vertices, tolerance=tolerance)]
-                ev = Edge.EndVertex(edge)
-                ev = vertices[Vertex.Index(ev, vertices, tolerance=tolerance)]
-                if Vertex.Distance(sv, ev) > tolerance:
-                    new_edges.append(Edge.ByVertices([sv,ev]))
-            if len(new_edges) > 0:
-                return Topology.SelfMerge(Cluster.ByTopologies(new_edges, silent=silent), tolerance=tolerance)
-            return wire
-        
-        def rce(wire, angTolerance=0.1):
-            if not Topology.IsInstance(wire, "Wire"):
-                return wire
-            final_wire = None
-            vertices = []
-            wire_verts = []
-            try:
-                vertices = Topology.Vertices(wire)
-            except:
-                return wire
-            for aVertex in vertices:
-                edges = []
-                _ = aVertex.Edges(wire, edges)
-                if len(edges) > 1:
-                    if not Edge.IsCollinear(edges[0], edges[1], tolerance=tolerance):
-                        wire_verts.append(aVertex)
-                else:
-                    wire_verts.append(aVertex)
-            if len(wire_verts) > 2:
-                if wire.IsClosed():
-                    final_wire = Wire.ByVertices(wire_verts, close=True, tolerance=tolerance)
-                else:
-                    final_wire = Wire.ByVertices(wire_verts, close=False, tolerance=tolerance)
-            elif len(wire_verts) == 2:
-                final_wire = Edge.ByStartVertexEndVertex(wire_verts[0], wire_verts[1], tolerance=tolerance, silent=True)
-            return final_wire
-        
-        if Topology.IsInstance(wire, "cluster"):
-            wires = Topology.Wires(wire)
-            temp_wires = []
-            for w in wires:
-                temp_w = Wire.RemoveCollinearEdges(w)
-                if not temp_w == None:
-                    temp_wires.append(temp_w)
-            if len(temp_wires) > 0:
-                result = Topology.SelfMerge(Cluster.ByTopologies(temp_w))
-                return result
-        if not Topology.IsInstance(wire, "Wire"):
-            if not silent:
-                print("Wire.RemoveCollinearEdges - Error: The input wire parameter is not a valid wire. Returning None.")
-                curframe = inspect.currentframe()
-                calframe = inspect.getouterframes(curframe, 2)
-                print('caller name:', calframe[1][3])
-            return None
-        new_wire = cleanup(wire, tolerance=tolerance)
-        if not Wire.IsManifold(new_wire):
-            wires = Wire.Split(new_wire)
-        else:
-            wires = [new_wire]
-        returnWires = []
-        for aWire in wires:
-            if not Topology.IsInstance(aWire, "Wire"):
-                returnWires.append(aWire)
-            else:
-                returnWires.append(rce(aWire, angTolerance=angTolerance))
-        if len(returnWires) == 1:
-            returnWire = returnWires[0]
-            if Topology.IsInstance(returnWire, "Edge"):
-                return Wire.ByEdges([returnWire], tolerance=tolerance)
-            elif Topology.IsInstance(returnWire, "Wire"):
-                return returnWire
-            else:
-                return wire
-        elif len(returnWires) > 1:
-            returnWire = Topology.SelfMerge(Cluster.ByTopologies(returnWires, silent=silent))
-            if Topology.IsInstance(returnWire, "Edge"):
-                return Wire.ByEdges([returnWire], tolerance=tolerance)
-            elif Topology.IsInstance(returnWire, "Wire"):
-                return returnWire
-            else:
-                return wire
-        else:
-            return wire
-    
     @staticmethod
     def Representation(wire, normalize: bool = True, rotate: bool = True, mantissa: int = 6, tolerance: float = 0.0001):
         """

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.10'
+__version__ = '0.8.11'

{topologicpy-0.8.10.dist-info → topologicpy-0.8.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: topologicpy
-Version: 0.8.10
+Version: 0.8.11
 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.10.dist-info → topologicpy-0.8.11.dist-info}/RECORD

@@ -10,27 +10,27 @@ topologicpy/DGL.py,sha256=M_znFtyPBJJz-iXLYZs2wwBj24fhevIo739dGha0chM,139041
 topologicpy/Dictionary.py,sha256=t0O7Du-iPq46FyKqZfcjHfsUK1E8GS_e67R2V5cpkbw,33186
 topologicpy/Edge.py,sha256=yxkCVDYBflJNEYxnjMmlyvbkpg8TNy7y5bSH3yQ4jzs,71418
 topologicpy/EnergyModel.py,sha256=UoQ9Jm-hYsN383CbcLKw-y6BKitRHj0uyh84yQ-8ACg,53856
-topologicpy/Face.py,sha256=a6rPTdgf4yhoH29kwV_48U_XYtdvNWdHnkErmMBp2CU,180759
-topologicpy/Graph.py,sha256=6pRgWtkq9a5p7uXiPq2O4yMEJZG6H7A5wA44bjGOP3s,497470
+topologicpy/Face.py,sha256=tn3PI-t9rXikgI1QMclw0PFwQ5vvyLi-wJKqZZZ9xmw,182755
+topologicpy/Graph.py,sha256=hrJYK0CboyxNjCRLoc75PeQzf9uI64OVxDyevbJUlZg,498342
 topologicpy/Grid.py,sha256=2s9cSlWldivn1i9EUz4OOokJyANveqmRe_vR93CAndI,18245
 topologicpy/Helper.py,sha256=4H5KPiv_eiEs489UOOyGLe9RaeoZIfmMh3mk_YCHmXg,29100
 topologicpy/Honeybee.py,sha256=Y_El6M8x3ixvvIe_VcRiwj_4C89ZZg5_WlT7adbCkpw,21849
-topologicpy/Matrix.py,sha256=ydw0EH4rZcGBFeLmBHPIyuk57DVKKL3M1GcArkFsYxM,10941
+topologicpy/Matrix.py,sha256=mqcCk14kM9OOwJPwd9ce-8SFM0IxS3jYb2XpWhVjUAc,19503
 topologicpy/Neo4j.py,sha256=BKOF29fRgXmdpMGkrNzuYbyqgCJ6ElPPMYlfTxXiVbc,22392
-topologicpy/Plotly.py,sha256=xfd_c2Mcam5KP-gDD-esl42RVXW5TSJsUCCqhUg1VFk,115788
+topologicpy/Plotly.py,sha256=RU_VioIRLGIYzwyKI9OQHOx9OxxGppdpagysgTbdxIE,115942
 topologicpy/Polyskel.py,sha256=DDUayC29LI1EkxdK09F0DgGyH-NCOU1LE3J2Imz0rEI,19832
 topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 topologicpy/Shell.py,sha256=--dJoSdz6BapxVEyG2DI0W5apO_xwLORj5qmR15yl2Y,87983
 topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=zFNNxiXRsDURF4FABfU3aG0mEp-qYYmxjADksYXRIgI,463941
-topologicpy/Vector.py,sha256=rwMKNJQs7SsWc7bhGuxHAjkJA8s0w46xnY0Xo2zOPR0,39590
-topologicpy/Vertex.py,sha256=70bee44uuf1d-uk3kL_pKPJKduJLdjve14mmLpcaT3s,78511
-topologicpy/Wire.py,sha256=CYd8M774E6Pv9vDIrOoKWV6nKo2tNOi3xREQL9WE808,233433
+topologicpy/Topology.py,sha256=mhRKJlFJLe_IGxj_bQ5lbK277YKod7PLXWzZ2Suq8ng,465493
+topologicpy/Vector.py,sha256=GkGt-aJ591IJ2IPffMAudvITLDPi2qZibZc4UAav6m8,42407
+topologicpy/Vertex.py,sha256=xr8KSgKnx-hgVp-eIvMPAKRv04R-wk-_4zc57xVyEqE,80793
+topologicpy/Wire.py,sha256=x7tOeR1o5qi5cXp_d9JrQrSXfYztCWiBC1OnVl6Yp7A,228463
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=xfh7QQ1d8queik59T_oYOabvDZyIi-O8o2ByZ-QACcQ,23
-topologicpy-0.8.10.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.10.dist-info/METADATA,sha256=MDU41HIFzabAK1nEmY8rsdZDpwG3vwgBi7PMc9Tzp_Y,10513
-topologicpy-0.8.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-topologicpy-0.8.10.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.10.dist-info/RECORD,,
+topologicpy/version.py,sha256=37n3GuNviuek888I4WoUQ7KvWprxXex9ltIoHwZWFxM,23
+topologicpy-0.8.11.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.11.dist-info/METADATA,sha256=_ggJ77QM3ok-OsVcQdXNC6Er-VH_AuQg3tZroNFpyYk,10513
+topologicpy-0.8.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+topologicpy-0.8.11.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.11.dist-info/RECORD,,