topologicpy 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

topologicpy/Edge.py

@@ -597,9 +597,10 @@ class Edge():
 
 
     @staticmethod
-    def IsCollinear(edgeA, edgeB, mantissa: int = 6, angTolerance: float = 0.1, tolerance: float = 0.0001) -> bool:
+    def IsCollinear(edgeA, edgeB, mantissa: int = 6, tolerance: float = 0.0001) -> bool:
         """
         Return True if the two input edges are collinear. Returns False otherwise.
+        This code is based on a contribution by https://github.com/gaoxipeng
 
         Parameters
         ----------
@@ -609,8 +610,6 @@ class Edge():
             The second input edge.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
-        angTolerance : float , optional
-            The angular tolerance used for the test. The default is 0.1.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -622,25 +621,42 @@ class Edge():
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Topology import Topology
+        import numpy as np
 
         if not Topology.IsInstance(edgeA, "Edge"):
-            print("Edge.IsCollinear - Error: The input edgeA parameter is not a valid topologic edge. Returning None.")
+            print("Edge.IsCollinear - Error: The input parameter edgeA is not a valid edge. Returning None")
             return None
         if not Topology.IsInstance(edgeB, "Edge"):
-            print("Edge.IsCollinear - Error: The input edgeB parameter is not a valid topologic edge. Returning None.")
+            print("Edge.IsCollinear - Error: The input parameter edgeB is not a valid edge. Returning None")
             return None
-        ang = Edge.Angle(edgeA, edgeB, mantissa=mantissa, bracket=True)
-        svA = Edge.StartVertex(edgeA)
-        evA = Edge.EndVertex(edgeA)
-        svB = Edge.StartVertex(edgeB)
-        evB = Edge.EndVertex(edgeB)
-        d1 = Vertex.Distance(svA, svB)
-        d2 = Vertex.Distance(svA, evB)
-        d3 = Vertex.Distance(evA, svB)
-        d4 = Vertex.Distance(evA, evB)
-        if (d1 < tolerance or d2 < tolerance or d3 < tolerance or d4 < tolerance) and (abs(ang) < angTolerance or (abs(180 - ang) < angTolerance)):
-            return True
-        return False
+        if Edge.Length(edgeA) < tolerance:
+            print("Edge.IsCollinear - Error: The length of edgeA is less than the tolerance. Returning None")
+            return None
+        if Edge.Length(edgeB) < tolerance:
+            print("Edge.IsCollinear - Error: The length of edgeB is less than the tolerance. Returning None")
+            return None
+        # Calculate coefficients A, B, C from edgeA
+        start_a = Edge.StartVertex(edgeA)
+        end_a = Edge.EndVertex(edgeA)
+        A = Vertex.Y(end_a, mantissa=mantissa) - Vertex.Y(start_a, mantissa=mantissa)
+        B = -(Vertex.X(end_a, mantissa=mantissa) - Vertex.X(start_a, mantissa=mantissa))
+        norm = np.sqrt(A ** 2 + B ** 2)
+        A /= norm
+        B /= norm
+        C = -(A * Vertex.X(start_a, mantissa=mantissa) + B * Vertex.Y(start_a, mantissa=mantissa))
+
+        # Calculate perpendicular distance for start vertex of edgeB
+        start_b = Edge.StartVertex(edgeB)
+        x0, y0 = Vertex.X(start_b, mantissa=mantissa), Vertex.Y(start_b, mantissa=mantissa)
+        distance_start = abs(A * x0 + B * y0 + C)
+
+        # Calculate perpendicular distance for end vertex of edgeB
+        end_b = Edge.EndVertex(edgeB)
+        x0, y0 = Vertex.X(end_b, mantissa=mantissa), Vertex.Y(end_b, mantissa=mantissa)
+        distance_end = abs(A * x0 + B * y0 + C)
+
+        # Check if both distances are within tolerance
+        return bool(distance_start < tolerance) and bool(distance_end < tolerance)
     
     @staticmethod
     def IsParallel(edgeA, edgeB, mantissa: int = 6, angTolerance: float = 0.1) -> bool:

topologicpy/Face.py

@@ -927,7 +927,19 @@ class Face():
             The external boundary of the input face.
 
         """
-        return face.ExternalBoundary()
+        from topologicpy.Vector import Vector
+        from topologicpy.Wire import Wire
+        from topologicpy.Topology import Topology
+
+        eb = face.ExternalBoundary()
+        f_dir = Face.Normal(face)
+        faceVertices = Topology.Vertices(eb)
+        temp_face = Face.ByWire(eb)
+        temp_dir = Face.Normal(temp_face)
+        if Vector.IsAntiParallel(f_dir, temp_dir):
+            faceVertices.reverse()
+        eb = Wire.ByVertices(faceVertices)
+        return eb
     
     @staticmethod
     def FacingToward(face, direction: list = [0,0,-1], asVertex: bool = False, tolerance: float = 0.0001) -> bool:
@@ -2313,7 +2325,7 @@ class Face():
             The external boundary of the input face.
 
         """
-        return face.ExternalBoundary()
+        return Face.ExternalBoundary(face)
     
     @staticmethod
     def Wires(face) -> list:

topologicpy/Topology.py

@@ -3979,6 +3979,8 @@ class Topology():
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Face import Face
+        from topologicpy.Vector import Vector
         
         def getSubTopologies(topology, subTopologyClass):
             topologies = []
@@ -4053,6 +4055,7 @@ class Topology():
         elif (Topology.Type(topology) > Topology.TypeID("Face")):
             _ = topology.Faces(None, topFaces)
         for aFace in topFaces:
+            f_dir = Face.Normal(aFace)
             ib = []
             _ = aFace.InternalBoundaries(ib)
             if(len(ib) > 0):
@@ -4060,6 +4063,10 @@ class Topology():
                 for aTriFace in triFaces:
                     wire = aTriFace.ExternalBoundary()
                     faceVertices = getSubTopologies(wire, topologic.Vertex)
+                    temp_face = Face.ByWire(wire)
+                    temp_dir = Face.Normal(temp_face)
+                    if Vector.IsAntiParallel(f_dir, temp_dir):
+                        faceVertices.reverse()
                     f = []
                     for aVertex in faceVertices:
                         try:
@@ -4073,6 +4080,10 @@ class Topology():
                 wire =  aFace.ExternalBoundary()
                 #wire = topologic.WireUtility.RemoveCollinearEdges(wire, 0.1) #This is an angle Tolerance
                 faceVertices = getSubTopologies(wire, topologic.Vertex)
+                temp_face = Face.ByWire(wire)
+                temp_dir = Face.Normal(temp_face)
+                if Vector.IsAntiParallel(f_dir, temp_dir):
+                    faceVertices.reverse()
                 f = []
                 for aVertex in faceVertices:
                     try:

topologicpy/Vector.py

@@ -526,7 +526,6 @@ class Vector(list):
         if np.isclose(dot_product, 1.0) or np.isclose(dot_product, -1.0):
             return True
         else:
-            # Compute bisecting vector
             return False
     
     @staticmethod

topologicpy/Wire.py

@@ -485,7 +485,7 @@ class Wire(Topology):
                     if len(st) > 1:
                         e1 = st[0]
                         e2 = st[1]
-                        if not Edge.IsCollinear(e1, e2, angTolerance=angTolerance, tolerance=tolerance):
+                        if not Edge.IsCollinear(e1, e2, tolerance=tolerance):
                             e1 = Edge.Reverse(e1, tolerance=tolerance)
                             bisector = Edge.ByVertices([vertices[i], newVertices[i]], tolerance=tolerance)
                             nv = Edge.VertexByDistance(bisector, distance=finalMiterThreshold, origin=Edge.StartVertex(bisector), tolerance=0.0001)
@@ -510,7 +510,7 @@ class Wire(Topology):
             for v in vertices:
                 edges = Topology.SuperTopologies(v, c, topologyType="edge")
                 if len(edges) == 2:
-                    if not Edge.IsCollinear(edges[0], edges[1], angTolerance=angTolerance, tolerance=tolerance):
+                    if not Edge.IsCollinear(edges[0], edges[1], tolerance=tolerance):
                         adjacentVertices = Topology.AdjacentTopologies(v, c)
                         total = 0
                         for adjV in adjacentVertices:
@@ -2210,7 +2210,7 @@ class Wire(Topology):
                 edges = []
                 _ = aVertex.Edges(wire, edges)
                 if len(edges) > 1:
-                    if not Edge.IsCollinear(edges[0], edges[1], angTolerance=angTolerance, tolerance=tolerance):
+                    if not Edge.IsCollinear(edges[0], edges[1], tolerance=tolerance):
                         wire_verts.append(aVertex)
                 else:
                     wire_verts.append(aVertex)

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.0'
+__version__ = '0.7.2'

{topologicpy-0.7.0.dist-info → topologicpy-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.0
+Version: 0.7.2
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: GNU AFFERO GENERAL PUBLIC LICENSE

{topologicpy-0.7.0.dist-info → topologicpy-0.7.2.dist-info}/RECORD

@@ -6,9 +6,9 @@ topologicpy/Color.py,sha256=UlmRcCSOhqcM_OyMWz4t3Kr75KcgXDhz3uctAJ2n7Ic,18031
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=RpkLnAzjg6arY7cEMs2pDFYzRdkerVg1Wbm9hcE3QaM,138991
 topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,25891
-topologicpy/Edge.py,sha256=1Kg1-xkz1_9SVF9M2UuSf04uMuearTfhXMhM9XD3poA,49477
+topologicpy/Edge.py,sha256=ktCp2VgBj-QvrUQ0oagTZG2QErth9cilzaBhhHeYNB8,50321
 topologicpy/EnergyModel.py,sha256=UBLim01lZLikVQmJAHEeja-KvF4tgzTxsSxwNDaezz4,52500
-topologicpy/Face.py,sha256=AgCtQ96QRb5Vej1fpiYp4S_GSDtxu50SKV0XgTVgnqQ,96750
+topologicpy/Face.py,sha256=BOU6hN-4uCaXW_lbvuOlntrz_Q0jEiL5tIHAFuqWw_U,97195
 topologicpy/Graph.py,sha256=GsWySXL-cTd7bl-QWpl3Aw9Hr0KyACzIa4iRenTB63s,368030
 topologicpy/Grid.py,sha256=XM0iQtQbMQoYHf7S0ppSe-dxy93Y9VpI_vUkElWqnYA,17050
 topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
@@ -20,14 +20,14 @@ topologicpy/Polyskel.py,sha256=MYHKFOQBlUNqoUhAdOcKRIHpSk0dWWVrZgXK34NkvFM,15936
 topologicpy/Shell.py,sha256=6hidTQ6MW5q_es-WbTeI_yt7Sd7BMxWU_qfoherVZhE,74343
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=3tYb8kssU882lE1gEWg2mxDvCCY_LAVElkyUT6wa-ZU,36935
-topologicpy/Topology.py,sha256=t8Zc25xRNsJWu2e4n_hQ08WjRFBVRm1ujuSueBYauiU,292372
-topologicpy/Vector.py,sha256=4mvvValXDCXFzLupjC_lpsr7LxKVXLmVZUe6H3Fo7f8,29604
+topologicpy/Topology.py,sha256=oXZZGGklFeVMIcKorVXM5RFMbCnoYcjdrScTIodSQng,292911
+topologicpy/Vector.py,sha256=FHbrCb9GVLOUV_kqcplh4D88CVxlID6qX_wEQOw4rD0,29565
 topologicpy/Vertex.py,sha256=YgbbCcqABvb97z2-yEytpp5T3yoZPlQplR_vMQkQ9OA,65180
-topologicpy/Wire.py,sha256=Q8jpH797oSkjso-ipAxsCs6ta2BxTHrYuBbSLewmV0w,138505
+topologicpy/Wire.py,sha256=MUEboxo11kMgwnZySSkwiyzBG2wv0wPiinf2cW4UVv8,138424
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=09hol5ovL6ArILJIJZ-MiscnOjKa6RjaETmtdgJpW2c,22
-topologicpy-0.7.0.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-topologicpy-0.7.0.dist-info/METADATA,sha256=zHBR-EYUrl66gK-J54RV5KYBg_h2bxXX5tfQMXJ4El0,46950
-topologicpy-0.7.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.0.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.0.dist-info/RECORD,,
+topologicpy/version.py,sha256=0eAFjnFVSWI6_301EfFzaXJIiwNScF9GpeINoCLd-XM,22
+topologicpy-0.7.2.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
+topologicpy-0.7.2.dist-info/METADATA,sha256=mUXBHGbD8IpLymaCvTw5wyJmhssEstUU57P6bXuYFkk,46950
+topologicpy-0.7.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.2.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.2.dist-info/RECORD,,