topologicpy 0.7.83__py3-none-any.whl → 0.7.84__py3-none-any.whl

topologicpy/Cell.py

@@ -1967,9 +1967,13 @@ class Cell():
         """
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
-
+        import inspect
+        
         if not Topology.IsInstance(cell, "Cell"):
             print("Cell.RemoveCollinearEdges - Error: The input cell parameter is not a valid cell. Returning None.")
+            curframe = inspect.currentframe()
+            calframe = inspect.getouterframes(curframe, 2)
+            print('caller name:', calframe[1][3])
             return None
         faces = Cell.Faces(cell)
         clean_faces = []

topologicpy/CellComplex.py

@@ -972,9 +972,14 @@ class CellComplex():
         """
         from topologicpy.Cell import Cell
         from topologicpy.Topology import Topology
-
+        import inspect
+        
         if not Topology.IsInstance(cellComplex, "CellComplex"):
             print("CellComplex.RemoveCollinearEdges - Error: The input cellComplex parameter is not a valid cellComplex. Returning None.")
+            print("CellComplex.RemoveCollinearEdges - Inspection:")
+            curframe = inspect.currentframe()
+            calframe = inspect.getouterframes(curframe, 2)
+            print('caller name:', calframe[1][3])
             return None
         cells = CellComplex.Cells(cellComplex)
         clean_cells = []

topologicpy/Edge.py

@@ -1477,7 +1477,7 @@ class Edge():
         svb = Edge.StartVertex(edgeB)
         evb = Edge.EndVertex(edgeB)
         intVertex = None
-        if Edge.IsCollinear(edgeA, edgeB):
+        if Edge.IsCollinear(edgeA, edgeB, tolerance=tolerance):
             if Vertex.IsInternal(svb, edgeA):
                 intVertex = svb
             elif Vertex.IsInternal(evb, edgeA):

topologicpy/Face.py

@@ -594,6 +594,7 @@ class Face():
         # Try the simple method first
         face = None
         ext_boundary = Wire.RemoveCollinearEdges(Shell.ExternalBoundary(shell))
+        #ext_boundary = Shell.ExternalBoundary(shell)
         if Topology.IsInstance(ext_boundary, "Wire"):
             face = Face.ByWire(ext_boundary, silent=silent)
         elif Topology.IsInstance(ext_boundary, "Cluster"):
@@ -652,8 +653,11 @@ class Face():
             for int_boundary in int_boundaries:
                 temp_wires = Topology.Wires(int_boundary)
                 int_wires.append(Topology.RemoveCollinearEdges(temp_wires[0], angTolerance))
+                #int_wires.append(temp_wires[0])
+
             temp_wires = Topology.Wires(ext_boundary)
             ext_wire = Topology.RemoveCollinearEdges(temp_wires[0], angTolerance)
+            #ext_wire = temp_wires[0]
             face = Face.ByWires(ext_wire, int_wires)
             face = Topology.Unflatten(face, origin=origin, direction=normal)
             return face
@@ -2573,9 +2577,13 @@ class Face():
         """
         from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
-
+        import inspect
+        
         if not Topology.IsInstance(face, "Face"):
             print("Face.RemoveCollinearEdges - Error: The input face parameter is not a valid face. Returning None.")
+            curframe = inspect.currentframe()
+            calframe = inspect.getouterframes(curframe, 2)
+            print('caller name:', calframe[1][3])
             return None
         eb = Wire.RemoveCollinearEdges(Face.Wire(face), angTolerance=angTolerance, tolerance=tolerance)
         ib = [Wire.RemoveCollinearEdges(w, angTolerance=angTolerance, tolerance=tolerance) for w in Face.InternalBoundaries(face)]

topologicpy/Shell.py

@@ -1456,9 +1456,13 @@ class Shell():
         """
         from topologicpy.Face import Face
         from topologicpy.Topology import Topology
-
+        import inspect
+        
         if not Topology.IsInstance(shell, "Shell"):
             print("Shell.RemoveCollinearEdges - Error: The input shell parameter is not a valid shell. Returning None.")
+            curframe = inspect.currentframe()
+            calframe = inspect.getouterframes(curframe, 2)
+            print('caller name:', calframe[1][3])
             return None
         faces = Shell.Faces(shell)
         clean_faces = []

topologicpy/Topology.py

@@ -4184,7 +4184,6 @@ class Topology():
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Helper import Helper
         import inspect
-        print("input topologies:", topologies)
 
         topologies_list = []
         if Topology.IsInstance(topologies, "Topology"):
@@ -6749,8 +6748,13 @@ class Topology():
         from topologicpy.Cell import Cell
         from topologicpy.CellComplex import CellComplex
         from topologicpy.Cluster import Cluster
-        
+        import inspect
         if not Topology.IsInstance(topology, "Topology"):
+            if not silent:
+                print("Topology.RemoveCollinearEdges - Error: The input topology parameter is not a valid topology. Returning None.")
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
             return None
         return_topology = topology
         if Topology.IsInstance(topology, "Vertex") or Topology.IsInstance(topology, "Edge"): #Vertex or Edge or Cluster, return the original topology
@@ -6776,7 +6780,7 @@ class Topology():
             topologies += Cluster.FreeEdges(topology)
             faces = Topology.Faces(topology)
             for face in faces:
-                topologies.append(Face.RemoveCollinearEdges(topology, angTolerance=angTolerance, tolerance=tolerance))
+                topologies.append(Face.RemoveCollinearEdges(face, angTolerance=angTolerance, tolerance=tolerance))
             return_topology = Topology.SelfMerge(Cluster.ByTopologies(topologies), tolerance=tolerance)
         return return_topology
 
@@ -9045,7 +9049,7 @@ class Topology():
         r_shells = Topology.Shells(return_topology)
         r_cells = Topology.Cells(return_topology)
         r_cellComplexes = Topology.CellComplexes(return_topology)
-        
+
         for i, t in enumerate(r_vertices):
             t = Topology.SetDictionary(t, Topology.Dictionary(vertices[i]), silent=True)
         for i, t in enumerate(r_edges):

topologicpy/Vertex.py

@@ -1110,13 +1110,18 @@ class Vertex():
         import inspect
 
         if not Topology.IsInstance(vertex, "Vertex"):
-            print("Called from:", inspect.stack()[1][3])
             if not silent:
                 print("Vertex.IsInternal - Error: The input vertex parameter is not a valid vertex. Returning None.", vertex, topology)
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
             return None
         if not Topology.IsInstance(topology, "Topology"):
             if not silent:
                 print("Vertex.IsInternal - Error: The input topology parameter is not a valid topology. Returning None.")
+                curframe = inspect.currentframe()
+                calframe = inspect.getouterframes(curframe, 2)
+                print('caller name:', calframe[1][3])
             return None
 
         if Topology.IsInstance(topology, "Vertex"):

topologicpy/Wire.py

@@ -2966,12 +2966,107 @@ class Wire():
         if direction != [0, 0, 1]:
             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):
         """
         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 wire without collinear edges, or the original wire if no modifications were necessary.
+        """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+        from topologicpy.Wire import Wire
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Topology import Topology
+
+        def cleanup(wire):
+            """Fuses vertices and removes edges below the tolerance distance."""
+            vertices = Vertex.Fuse(Topology.Vertices(wire), tolerance=tolerance)
+            edges = Topology.Edges(wire)
+            new_edges = []
+
+            for edge in edges:
+                sv = vertices[Vertex.Index(Edge.StartVertex(edge), vertices, tolerance=tolerance)]
+                ev = vertices[Vertex.Index(Edge.EndVertex(edge), vertices, tolerance=tolerance)]
+                if Vertex.Distance(sv, ev) > tolerance:
+                    new_edges.append(Edge.ByVertices([sv, ev]))
+
+            return Topology.SelfMerge(Cluster.ByTopologies(new_edges, silent=silent), tolerance=tolerance) if new_edges else wire
+
+        def remove_collinear_vertices(wire):
+            """Removes collinear vertices from a wire."""
+            if not Topology.IsInstance(wire, "Wire"):
+                return wire
+
+            vertices = Topology.Vertices(wire)
+            filtered_vertices = []
+
+            for i, vertex in enumerate(vertices):
+                edges = Topology.SuperTopologies(topology=vertex, hostTopology=wire, topologyType="edge")
+
+                if len(edges) != 2:
+                    filtered_vertices.append(vertex)
+                elif not Edge.IsCollinear(edges[0], edges[1], tolerance=tolerance):
+                    filtered_vertices.append(vertex)
+
+            if len(filtered_vertices) > 2:
+                return Wire.ByVertices(filtered_vertices, close=wire.IsClosed())
+            elif len(filtered_vertices) == 2:
+                return Edge.ByStartVertexEndVertex(filtered_vertices[0], filtered_vertices[1], tolerance=tolerance, silent=True)
+            else:
+                return wire
+
+        # Main function logic
+        if Topology.IsInstance(wire, "Cluster"):
+            wires = Topology.Wires(wire)
+            processed_wires = [Wire.RemoveCollinearEdges(w, angTolerance, tolerance, silent) for w in wires]
+            if len(processed_wires) == 0:
+                if not silent:
+                    print("Wire.RemoveCollinearEdges - Error: No wires were produced. Returning None.")
+                return None
+            elif len(processed_wires) == 1:
+                return Topology.SelfMerge(processed_wires[0])
+            else:
+                return Topology.SelfMerge(Cluster.ByTopologies(processed_wires, silent=silent))
+
+        if not Topology.IsInstance(wire, "Wire"):
+            if not silent:
+                print(f"Wire.RemoveCollinearEdges - Error: Input is not a valid wire. Returning None.")
+            return None
+
+        new_wire = cleanup(wire)
+        wires = Wire.Split(new_wire) if not Wire.IsManifold(new_wire) else [new_wire]
+
+        processed_wires = [remove_collinear_vertices(w) for w in wires]
+
+        if len(processed_wires) == 0:
+            return wire
+        elif len(processed_wires) == 1:
+            return Topology.SelfMerge(processed_wires[0])
+        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
@@ -3051,8 +3146,6 @@ class Wire():
                 return result
         if not Topology.IsInstance(wire, "Wire"):
             if not silent:
-                print("The wire is:", wire)
-                Topology.Show(wire)
                 print("Wire.RemoveCollinearEdges - Error: The input wire parameter is not a valid wire. Returning None.")
                 curframe = inspect.currentframe()
                 calframe = inspect.getouterframes(curframe, 2)

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.83'
+__version__ = '0.7.84'

{topologicpy-0.7.83.dist-info → topologicpy-0.7.84.dist-info}/METADATA

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

@@ -1,16 +1,16 @@
 topologicpy/ANN.py,sha256=m_WxD1lgQqDhUpaM20Lia6TmJACDYaAE96wigsi-99U,47932
 topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
 topologicpy/BVH.py,sha256=mKVCAu9K8qzcWXtPDVH5usXZV1DNNNJl4n3rU5Lh1ZM,12931
-topologicpy/Cell.py,sha256=2izd-YGqy897_JHHgrGlIo5WwUeEIWVD3KspV1z_sj8,107860
-topologicpy/CellComplex.py,sha256=5PtnRrDx_3zmtt4aTosxK9XBzZtayzaOC50pkJiIlFY,51170
+topologicpy/Cell.py,sha256=j6e0Hk5GVlCPXhwc39Qo3pSpWZF4nv4uCZojdg3uXO8,108046
+topologicpy/CellComplex.py,sha256=DbSiVZ-_J8vXud1cm69p9Te9sTJUB-_zE3rgbhqKw5E,51424
 topologicpy/Cluster.py,sha256=51q5G1L5xAzRMfVU8YBXhq0g3g2X9aVNcahU-vYZRrI,55672
 topologicpy/Color.py,sha256=wPhA7rLr9BTZsWYUUVnQpbmL5ZMkGlDSsa8f3S5B-d4,20250
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=0AsGoz48pGTye_F4KcJopNjD9STeQ50LHc6PPvERFaA,31932
-topologicpy/Edge.py,sha256=9u9SdUxuenLUIK26xwFvPoYV34p0dCfXmHHBxdgvAdM,67164
+topologicpy/Edge.py,sha256=k71TGaJRERI2vgygDu-pYprUgu49N9UApcCxCorQyzc,67185
 topologicpy/EnergyModel.py,sha256=AqTtmXE35SxvRXhG3vYAQd7GQDW-6HtjYPHua6ME4Eg,53762
-topologicpy/Face.py,sha256=tfsm7RSYZ7UbKAhUlUqfPQX4_96UuTJXXo6okTU9lm8,141831
+topologicpy/Face.py,sha256=IAAueOqHOw3Kn_ZPxxBKgVgC5fFdcuiLMC1HeOPI92Y,142159
 topologicpy/Graph.py,sha256=ZhMVB6ntuhIgTrKLUPryeAJFFBF0cnRsNgESbaohOiw,416914
 topologicpy/Grid.py,sha256=9N6PE84qCm40TRi2WtlVZSBwXXr47zHpscEpZHg_JW4,18205
 topologicpy/Helper.py,sha256=vUWbnZJxn0e9YsFUNyJ5Dee8Nh6TmDp9uCzCk4e0qAA,21897
@@ -20,17 +20,17 @@ topologicpy/Neo4j.py,sha256=t52hgE9cVsqkGc7m7fjRsLnyfRHakVHwdvF4ms7ow78,22342
 topologicpy/Plotly.py,sha256=z7xs9Ra2OwJNv5NMapH27R6didS8UMpjZIN35ZnAQcE,113501
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
-topologicpy/Shell.py,sha256=8OJjlWk9eCZ3uGOTht6ZVrcMczCafw-YWoDGueaz7eg,87673
+topologicpy/Shell.py,sha256=xYpGxQ1x7hKVYD03_zhEY77lbDAsffttKYZWKiZAsNs,87859
 topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=nTthwB8vmfdpfoP8tTQCUhHr29WhjuV7l0btAI1rHkQ,433216
+topologicpy/Topology.py,sha256=9X9Y2Y1tXe_oefNp6oQRG6v7ZgmIec5pZ7KiBxSXKNY,433499
 topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
-topologicpy/Vertex.py,sha256=uHBSDrU5Wc3Eg8_-Se0czcTKNmhhBORUw7c3Mo0ZRz4,73460
-topologicpy/Wire.py,sha256=o6MlOjubkJ_f5s1tUamizCsoPKvcQ2OudtJv0yCF-2o,186477
+topologicpy/Vertex.py,sha256=7oEu6xXl1vi8M_HFnPT66W8OO8Eb3eab2oKvgzzLK-A,73737
+topologicpy/Wire.py,sha256=e9vN5nRIUIqwA0bElVB6Vrto862OXJ97iDHhc-JEt3s,190501
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=Uj6-kAXgUUYCxdsrUyFr-xt-NFJYmXeo-tJWkJPzKSE,23
-topologicpy-0.7.83.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.83.dist-info/METADATA,sha256=k4zYNOlhOqX64ck0YBOhF1u0LdmVQkO1uyiJl6n71HU,10513
-topologicpy-0.7.83.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-topologicpy-0.7.83.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.83.dist-info/RECORD,,
+topologicpy/version.py,sha256=U66vZMAESD9QWsvrRbFl3J6Cqc8Xv9QpUU903eulUJI,23
+topologicpy-0.7.84.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.84.dist-info/METADATA,sha256=WKYqAGNwpDTkn9KOQDEUQkV7w5v-v4jCEuzpnemh7Cs,10513
+topologicpy-0.7.84.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+topologicpy-0.7.84.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.84.dist-info/RECORD,,