topologicpy 0.7.76__py3-none-any.whl → 0.7.77__py3-none-any.whl

topologicpy/Face.py

@@ -1281,7 +1281,7 @@ class Face():
         return return_list
 
     @staticmethod
-    def ExternalBoundary(face):
+    def ExternalBoundary(face, silent=False):
         """
         Returns the external boundary (closed wire) of the input face.
 
@@ -1289,6 +1289,8 @@ class Face():
         ----------
         face : topologic_core.Face
             The input face.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -1300,6 +1302,10 @@ class Face():
         from topologicpy.Wire import Wire
         from topologicpy.Topology import Topology
 
+        if not Topology.IsInstance(face, "face"):
+            if not silent:
+                print("Face.ExternalBoundary - Error: The input face parameter is not a topologic face. Returning None.")
+            return None
         eb = face.ExternalBoundary() # Hook to Core
         return eb
     

topologicpy/Graph.py

@@ -1880,9 +1880,9 @@ class Graph:
         else:
             node_keys = [nodeIDHeader, nodeLabelHeader, "mask"]+nodeFeaturesKeys
         if len(edgeFeaturesKeys) == 0:
-            edge_keys = [edgeLabelHeader, "mask", edgeFeaturesHeader]
+            edge_keys = [edgeSRCHeader, edgeDSTHeader, edgeLabelHeader, "mask", edgeFeaturesHeader]
         else:
-            edge_keys = [edgeLabelHeader, "mask"]+edgeFeaturesKeys
+            edge_keys = [edgeSRCHeader, edgeDSTHeader, edgeLabelHeader, "mask"]+edgeFeaturesKeys
         if len(graphFeaturesKeys) == 0:
             graph_keys = [graphIDHeader, graphLabelHeader, graphFeaturesHeader]
         else:
@@ -1975,11 +1975,11 @@ class Graph:
                     mask = 0
                 features = row[edgeFeaturesHeader]
                 if len(edgeFeaturesKeys) == 0:
-                    values = [label, mask, features]
+                    values = [src_id, dst_id, label, mask, features]
                 else:
                     featureList = features.split(",")
                     featureList = [float(s) for s in featureList]
-                    values = [label, mask]+featureList
+                    values = [src_id, dst_id, label, mask]+featureList
                 if not (src_id == dst_id) and not [src_id, dst_id] in es and not [dst_id, src_id] in es:
                     es.append([src_id, dst_id])
                     try:

topologicpy/Topology.py

@@ -2160,12 +2160,13 @@ class Topology():
             for key in keys:
                 if python_dict[key].__class__ == ezdxf.acc.vector.Vec3:
                     python_dict[key] = list(python_dict[key])
+            rgb_list = None
             try:
-                r,g,b = entity.rgb
+                rgb_list = entity.rgb   
             except:
                 rgb_list = get_layer_color(file.layers, entity.dxf.layer)
-                if rgb_list == None:
-                    rgb_list = [0,0,0]
+            if rgb_list == None:
+                rgb_list = [0,0,0]
             python_dict['color'] = rgb_list
             python_dict['type'] = entity_type
             d = Dictionary.ByPythonDictionary(python_dict)
@@ -8295,32 +8296,42 @@ class Topology():
             The list of subtopologies.
 
         """
+        from topologicpy.Face import Face
+
         if not Topology.IsInstance(topology, "Topology"):
             print("Topology.SubTopologies - Error: the input topology parameter is not a valid topology. Returning None.")
             return None
         if Topology.TypeAsString(topology).lower() == subTopologyType.lower():
             return [topology]
+        
         subTopologies = []
-        if subTopologyType.lower() == "vertex":
-            _ = topology.Vertices(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "edge":
-            _ = topology.Edges(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "wire":
-            _ = topology.Wires(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "face":
-            _ = topology.Faces(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "shell":
-            _ = topology.Shells(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "cell":
-            _ = topology.Cells(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "cellcomplex":
-            _ = topology.CellComplexes(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "cluster":
-            _ = topology.Clusters(None, subTopologies) # Hook to Core
-        elif subTopologyType.lower() == "aperture":
-            _ = topology.Apertures(None, subTopologies) # Hook to Core
-        if not subTopologies:
-            return [] # Make sure to return an empty list instead of None
+
+        # Spcecial case for faces to return vertices in CW/CCW order.
+        if Topology.IsInstance(topology, "face") and (subTopologyType.lower() == "vertex" or subTopologyType.lower() == "edge"):
+            wires = Face.Wires(topology)
+            for wire in wires:
+                subTopologies += Topology.SubTopologies(wire, subTopologyType=subTopologyType)
+        else:
+            if subTopologyType.lower() == "vertex":
+                _ = topology.Vertices(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "edge":
+                _ = topology.Edges(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "wire":
+                _ = topology.Wires(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "face":
+                _ = topology.Faces(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "shell":
+                _ = topology.Shells(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "cell":
+                _ = topology.Cells(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "cellcomplex":
+                _ = topology.CellComplexes(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "cluster":
+                _ = topology.Clusters(None, subTopologies) # Hook to Core
+            elif subTopologyType.lower() == "aperture":
+                _ = topology.Apertures(None, subTopologies) # Hook to Core
+            if not subTopologies:
+                return [] # Make sure to return an empty list instead of None
         return subTopologies
 
     

topologicpy/Wire.py

@@ -3242,18 +3242,27 @@ class Wire():
         return roof
     
     @staticmethod
-    def Simplify(wire, tolerance=0.0001):
+    def Simplify(wire, method='douglas-peucker', tolerance=0.0001, silent=False):
         """
-        Simplifies the input wire edges based on the Douglas Peucker algorthim. See https://en.wikipedia.org/wiki/Ramer%E2%80%93Douglas%E2%80%93Peucker_algorithm
-        Part of this code was contributed by gaoxipeng. See https://github.com/wassimj/topologicpy/issues/35
+        Simplifies the input wire edges based on the selected algorithm: Douglas-Peucker or Visvalingam–Whyatt.
         
         Parameters
         ----------
         wire : topologic_core.Wire
             The input wire.
+        method : str, optional
+            The simplification method to use: 'douglas-peucker' or 'visvalingam-whyatt' or 'reumann-witkam'.
+            The default is 'douglas-peucker'.
         tolerance : float , optional
-            The desired tolerance. The default is 0.0001. Edges shorter than this length will be removed.
-
+            The desired tolerance.
+            If using the douglas-peucker method, edge lengths shorter than this amount will be removed.
+            If using the visvalingam-whyatt method, triangulare areas less than is amount will be removed.
+            If using the Reumann-Witkam method, the tolerance specifies the maximum perpendicular distance allowed
+            between any point and the current line segment; points falling within this distance are discarded.
+            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
@@ -3264,7 +3273,7 @@ class Wire():
         from topologicpy.Edge import Edge
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
-        
+
         def perpendicular_distance(point, line_start, line_end):
             # Calculate the perpendicular distance from a point to a line segment
             x0 = point.X()
@@ -3284,15 +3293,12 @@ class Wire():
                 points = wire
             else:
                 points = Topology.Vertices(wire)
-                # points.insert(0, points.pop())
             if len(points) <= 2:
                 return points
 
-            # Use the first and last points in the list as the starting and ending points
             start_point = points[0]
             end_point = points[-1]
 
-            # Find the point with the maximum distance
             max_distance = 0
             max_index = 0
 
@@ -3302,19 +3308,79 @@ class Wire():
                     max_distance = d
                     max_index = i
 
-            # If the maximum distance is less than the tolerance, no further simplification is needed
             if max_distance <= tolerance:
                 return [start_point, end_point]
 
-            # Recursively simplify
             first_segment = douglas_peucker(points[:max_index + 1], tolerance)
             second_segment = douglas_peucker(points[max_index:], tolerance)
 
-            # Merge the two simplified segments
             return first_segment[:-1] + second_segment
-        
+
+        def visvalingam_whyatt(wire, tolerance):
+            if isinstance(wire, list):
+                points = wire
+            else:
+                points = Topology.Vertices(wire)
+
+            if len(points) <= 2:
+                return points
+
+            # Calculate the effective area for each point except the first and last
+            def effective_area(p1, p2, p3):
+                # Triangle area formed by p1, p2, and p3
+                return 0.5 * abs(p1.X() * (p2.Y() - p3.Y()) + p2.X() * (p3.Y() - p1.Y()) + p3.X() * (p1.Y() - p2.Y()))
+
+            # Keep track of effective areas
+            areas = [None]  # First point has no area
+            for i in range(1, len(points) - 1):
+                area = effective_area(points[i - 1], points[i], points[i + 1])
+                areas.append((area, i))
+            areas.append(None)  # Last point has no area
+
+            # Sort points by area in ascending order
+            sorted_areas = sorted([(area, idx) for area, idx in areas[1:-1] if area is not None])
+
+            # Remove points with area below the tolerance threshold
+            remove_indices = {idx for area, idx in sorted_areas if area < tolerance}
+
+            # Construct the simplified list of points
+            simplified_points = [point for i, point in enumerate(points) if i not in remove_indices]
+
+            return simplified_points
+
+        def reumann_witkam(wire, tolerance):
+            if isinstance(wire, list):
+                points = wire
+            else:
+                points = Topology.Vertices(wire)
+            
+            if len(points) <= 2:
+                return points
+
+            simplified_points = [points[0]]
+            start_point = points[0]
+            i = 1
+
+            while i < len(points) - 1:
+                end_point = points[i]
+                next_point = points[i + 1]
+                dist = perpendicular_distance(next_point, start_point, end_point)
+
+                # If the next point is outside the tolerance corridor, add the current end_point
+                if dist > tolerance:
+                    simplified_points.append(end_point)
+                    start_point = end_point
+
+                i += 1
+
+            # Always add the last point
+            simplified_points.append(points[-1])
+
+            return simplified_points
+
         if not Topology.IsInstance(wire, "Wire"):
-            print("Wire.Simplify = Error: The input wire parameter is not a Wire. Returning None.")
+            if not silent:
+                print("Wire.Simplify = Error: The input wire parameter is not a Wire. Returning None.")
             return None
         if not Wire.IsManifold(wire):
             wires = Wire.Split(wire)
@@ -3324,12 +3390,31 @@ class Wire():
                     if Edge.Length(w) > tolerance:
                         new_wires.append(w)
                 elif Topology.IsInstance(w, "Wire"):
-                    new_wires.append(Wire.Simplify(w, tolerance=tolerance))
+                    new_wires.append(Wire.Simplify(w, method=method, tolerance=tolerance, silent=silent))
             return_wire = Topology.SelfMerge(Cluster.ByTopologies(new_wires))
             return return_wire
+
+        new_vertices = []
+        if 'douglas' in method.lower(): #douglas-peucker
+            new_vertices = douglas_peucker(wire, tolerance=tolerance)
+        elif 'vis' in method.lower(): # 'visvalingam-whyatt'
+            new_vertices = visvalingam_whyatt(wire, tolerance=tolerance)
+        elif 'reu' in method.lower(): # 'reumann-witkam'
+            new_vertices = reumann_witkam(wire, tolerance=tolerance)
+        else:
+            if not silent:
+                print(f"Wire.Simplify - Warning: Unknown method ({method}). Please use 'douglas-peucker' or 'visvalingam-whyatt' or 'reumann-witkam'. Defaulting to 'douglas-peucker'.")
+            new_vertices = douglas_peucker(wire, tolerance=tolerance)
         
-        new_vertices = douglas_peucker(wire, tolerance=tolerance)
+        if len(new_vertices) < 2:
+            if not silent:
+                print("Wire.Simplify - Warning: Could not generate enough vertices for a simplified wire. Returning the original wire.")
+            wire
         new_wire = Wire.ByVertices(new_vertices, close=Wire.IsClosed(wire))
+        if not Topology.IsInstance(new_wire, "wire"):
+            if not silent:
+                print("Wire.Simplify - Warning: Could not generate a simplified wire. Returning the original wire.")
+            return wire
         return new_wire
 
     @staticmethod

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.76'
+__version__ = '0.7.77'

{topologicpy-0.7.76.dist-info → topologicpy-0.7.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.76
+Version: 0.7.77
 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
@@ -36,6 +36,7 @@ Requires-Dist: tqdm
 Requires-Dist: plotly
 Requires-Dist: lark
 Requires-Dist: specklepy
+Requires-Dist: webcolors
 Requires-Dist: topologic_core>=7.0.1
 Provides-Extra: test
 Requires-Dist: pytest-xdist>=2.4.0; extra == "test"

{topologicpy-0.7.76.dist-info → topologicpy-0.7.77.dist-info}/RECORD

@@ -10,8 +10,8 @@ topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=0AsGoz48pGTye_F4KcJopNjD9STeQ50LHc6PPvERFaA,31932
 topologicpy/Edge.py,sha256=9u9SdUxuenLUIK26xwFvPoYV34p0dCfXmHHBxdgvAdM,67164
 topologicpy/EnergyModel.py,sha256=AqTtmXE35SxvRXhG3vYAQd7GQDW-6HtjYPHua6ME4Eg,53762
-topologicpy/Face.py,sha256=9E3AaTCkcENwmTbFgyZKkdmhjVXHO_q9clQSji2685M,124363
-topologicpy/Graph.py,sha256=BuSg8ilbZd2Qqoenmtw5FrkSe1fDLFS6jshljvq4dOs,416822
+topologicpy/Face.py,sha256=mS7LI3qIo2jfQbibpInArRfXMmTZd7xU8IdvRYUIGSU,124747
+topologicpy/Graph.py,sha256=ZhMVB6ntuhIgTrKLUPryeAJFFBF0cnRsNgESbaohOiw,416914
 topologicpy/Grid.py,sha256=9N6PE84qCm40TRi2WtlVZSBwXXr47zHpscEpZHg_JW4,18205
 topologicpy/Helper.py,sha256=Sv35czP_j0oLDeJcN8usswUm4U3auiK1LQ_Z_HBvxxg,21716
 topologicpy/Honeybee.py,sha256=HfTaEV1R8K1xOVQQy9sBOhBTF_ap8A2RxZOYhirp_Mw,21835
@@ -23,14 +23,14 @@ topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 topologicpy/Shell.py,sha256=8OJjlWk9eCZ3uGOTht6ZVrcMczCafw-YWoDGueaz7eg,87673
 topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=J1eTBp8esd9jwcQ4fY82uTjJtj6r9WiaGIZmevRxxDQ,406736
+topologicpy/Topology.py,sha256=NwJVI2_X7mvDouuDniIOwx67uL8xOhifjKSlitY3QEM,407275
 topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=ZS6xK89JKokBKc0W8frdRhhuzR8c-dI1TTLt7pTf1iA,71032
-topologicpy/Wire.py,sha256=eVet2OToVsXi9AkDYo35LpfMPqJ6aKGD6QkiU4-Jvs8,182271
+topologicpy/Wire.py,sha256=pLhdos_kZwvIdzsQlVGb2jtZ4dK8ATTmEsZHDnAGBxk,185972
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=3M8WghUyEKh4Nub9zc52IBDUVRayyZVk2cK9zf5M-VY,23
-topologicpy-0.7.76.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.76.dist-info/METADATA,sha256=iMOr84bFL_JI4Gr37GGBrxyIb6i7TOZxJaCKcIHHj_0,10488
-topologicpy-0.7.76.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-topologicpy-0.7.76.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.76.dist-info/RECORD,,
+topologicpy/version.py,sha256=sHWG-4WQq90h5-L0FW6KGjszP6rHlEFGr3Ne1xb3AB0,23
+topologicpy-0.7.77.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.77.dist-info/METADATA,sha256=SdpjwqIH1H5l6-QgeWLo59SF8T7-y8jp0lsi2PeUtYY,10513
+topologicpy-0.7.77.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+topologicpy-0.7.77.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.77.dist-info/RECORD,,