topologicpy 0.8.71__py3-none-any.whl → 0.8.73__py3-none-any.whl

topologicpy/Topology.py

@@ -224,9 +224,17 @@ class Topology():
             The input topology with the apertures added to it.
 
         """
+        from topologicpy.Vertex import Vertex
         from topologicpy.Dictionary import Dictionary
         from topologicpy.BVH import BVH
         
+        def best_candidate(aperture, candidates, tolerance=0.0001):
+            ap_iv = Topology.InternalVertex(aperture)
+            for candidate in candidates:
+                if Vertex.IsInternal(ap_iv, candidate, tolerance=tolerance):
+                    return candidate
+            return None
+
         if not Topology.IsInstance(topology, "Topology"):
             print("Topology.AddApertures - Error: The input topology parameter is not a valid topology. Returning None.")
             return None
@@ -256,16 +264,20 @@ class Topology():
             bvh = BVH.ByTopologies(Topology.SubTopologies(topology, subTopologyType=subTopologyType), silent=True)
             used = []
             for aperture in apertures:
-                result = BVH.Clashes(bvh, aperture)
-                if isinstance(result, list):
-                    if len(result) > 0:
-                        subTopology = result[0]
-                        if Topology.IsInstance(subTopology, "topology"):
-                            used.append(subTopology)
-                            if exclusive == True:
-                                if subTopology in used:
-                                    continue
-                            subTopology = Topology.AddContent(subTopology, [aperture], subTopologyType="self", tolerance=tolerance)
+                candidates = BVH.Clashes(bvh, aperture)
+                if isinstance(candidates, list):
+                    if len(candidates) == 0:
+                        return topology
+                    elif len(candidates) == 1:
+                        subTopology = candidates[0]
+                    if len(candidates) > 0:
+                        subTopology = best_candidate(aperture, candidates, tolerance=tolerance)
+                    if Topology.IsInstance(subTopology, "topology"):
+                        used.append(subTopology)
+                        if exclusive == True:
+                            if subTopology in used:
+                                continue
+                        subTopology = Topology.AddContent(subTopology, [aperture], subTopologyType="self", tolerance=tolerance)
         return topology
     
     @staticmethod
@@ -292,6 +304,8 @@ class Topology():
         """
 
         from topologicpy.Context import Context
+        from topologicpy.Dictionary import Dictionary
+
 
         if not Topology.IsInstance(topology, "Topology"):
             print("Topology.AddContent - Error: the input topology parameter is not a valid topology. Returning None.")
@@ -311,14 +325,20 @@ class Topology():
         if not subTopologyType.lower() in ["self", "cellcomplex", "cell", "shell", "face", "wire", "edge", "vertex"]:
             print("Topology.AddContent - Error: the input subtopology type parameter is not a recognized type. Returning None.")
             return None
+        
+        copy_contents = [Topology.Copy(x) for x in contents]
+        for i, content in enumerate(contents):
+            d = Topology.Dictionary(content)
+            copy_contents[i] = Topology.SetDictionary(copy_contents[i], d)
+
         if subTopologyType.lower() == "self":
             context = Context.ByTopologyParameters(topology)
-            for content in contents:
+            for content in copy_contents:
                 content.AddContext(context) # Hook to Core
                 topology.AddContent(content) # Hook to Core
         else:
             t = Topology.TypeID(subTopologyType)
-            topology.AddContents(contents, t) # Hook to Core
+            topology.AddContents(copy_contents, t) # Hook to Core
         return topology
     
     @staticmethod

topologicpy/Vertex.py

@@ -1135,22 +1135,11 @@ class Vertex():
         topology,
         maxLeafSize: int = 4,
         identify: bool = False,
-        tolerance: float = 0.0006,
-        silent: bool = True,
-    ) -> bool:
+        tolerance: float = 0.0001,
+        silent: bool = False,
+    ):
         """
-        Returns True if `vertex` lies inside (or on the boundary of) `topology`.
-
-        Broad-phase:
-        - Build a BVH over Cells (3D) or Faces (2D) using BVH.ByTopologies.
-        - Query via BVH.Clashes(bvh, vertex) to get only nearby primitives.
-
-        Narrow-phase (geometric, no Topology.IsInternal):
-        - Boundary snap: if Vertex.Distance(vertex, primitive) <= tolerance -> inside.
-        - 3D: Cast a ray (+X direction). For each candidate Cell, intersect the ray with its Faces.
-                For each intersected Face: project face polygon(s) to 2D (dominant-axis drop) and
-                test point-in-polygon (outer minus holes). Odd number of valid intersections => inside.
-        - 2D: Project the Face loops to 2D and do point-in-polygon (outer minus holes).
+        Returns True if the input vertex lies inside the input topology.
 
         Parameters
         ----------
@@ -1166,9 +1155,9 @@ class Vertex():
         identify: bool, optional
             If set to True, a tuple is returned where the identified subTopology is returned (e.g. (True, edge)). Default is False.
         tolerance : float, optional
-            Distance and numeric tolerance. Default 1e-7.
-        silent : bool, optional
-            Suppress non-critical prints.
+            The desired tolerance. Default 0.0001.
+        silent : bool , optional
+            If set to True, error and warning messages are suppressed. Default is False.
 
         Returns
         -------
@@ -1191,11 +1180,6 @@ class Vertex():
         # --------------------------
         # Utilities
         # --------------------------
-        def v_coords(v):
-            return Vertex.X(v), Vertex.Y(v), Vertex.Z(v)
-
-        def vec_sub(a, b):
-            return (a[0]-b[0], a[1]-b[1], a[2]-b[2])
 
         def vec_dot(a, b):
             return a[0]*b[0] + a[1]*b[1] + a[2]*b[2]
@@ -1212,29 +1196,6 @@ class Vertex():
                 return (0.0, 0.0, 0.0)
             return (a[0]/l, a[1]/l, a[2]/l)
 
-        # Plane from 3 points
-        def face_plane(face):
-            # Returns (n, d) where plane: n·X + d = 0; n is unit normal.
-            # Use first 3 distinct points of the external boundary.
-            w_ext = Face.ExternalBoundary(face)
-            verts = Wire.Vertices(w_ext)
-            pts = [v_coords(v) for v in verts]
-            # Find non-collinear triplet
-            p0 = pts[0]
-            n = None
-            for i in range(1, len(pts)-1):
-                v1 = vec_sub(pts[i], p0)
-                v2 = vec_sub(pts[i+1], p0)
-                n_try = vec_cross(v1, v2)
-                if vec_len(n_try) > 1e-15:
-                    n = vec_norm(n_try)
-                    break
-            if n is None:
-                # Degenerate face; assign arbitrary normal
-                n = (1.0, 0.0, 0.0)
-            d = -vec_dot(n, p0)
-            return n, d
-
         def dominant_axis(n):
             # Return axis to drop when projecting to 2D (index 0=x,1=y,2=z)
             ax = abs(n[0]); ay = abs(n[1]); az = abs(n[2])
@@ -1252,13 +1213,6 @@ class Vertex():
             else:
                 return (p[0], p[1])
 
-        def ray_plane_intersection(orig, dirv, n, d):
-            # Solve n·(orig + t*dir) + d = 0  -> t = -(n·orig + d) / (n·dir)
-            ndotdir = vec_dot(n, dirv)
-            if abs(ndotdir) < 1e-15:
-                return None  # parallel
-            t = -(vec_dot(n, orig) + d) / ndotdir
-            return t
 
         # 2D point-in-polygon (ray crossing). Polygon is list of 2D points (closed or open).
         def pip_ray_cross_2d(pt, poly):
@@ -1300,38 +1254,6 @@ class Vertex():
                     return False
             return True
 
-        def face_loops_2d(face, drop_axis):
-            # Returns (outer2d, [hole2d,...])
-            w_ext = Face.ExternalBoundary(face)
-            outer_vs = Wire.Vertices(w_ext)
-            outer = [project_point(v_coords(v), drop_axis) for v in outer_vs]
-
-            holes_2d = []
-            try:
-                inner_wires = Face.InternalBoundaries(face) or []
-            except Exception:
-                inner_wires = []
-            for w in inner_wires:
-                vs = Wire.Vertices(w)
-                holes_2d.append([project_point(v_coords(v), drop_axis) for v in vs])
-            return outer, holes_2d
-
-        # Ray casting against one face; returns hit-point (3D) if the ray hits inside the face.
-        def ray_hits_face(orig, dirv, face, tol=1e-12):
-            n, d = face_plane(face)
-            t = ray_plane_intersection(orig, dirv, n, d)
-            if t is None or t < -tol:
-                return None  # behind or parallel
-            # Intersection point
-            ip = (orig[0] + t*dirv[0], orig[1] + t*dirv[1], orig[2] + t*dirv[2])
-            # Project to 2D in face's dominant plane and do PIP against loops
-            ax = dominant_axis(n)
-            outer2d, holes2d = face_loops_2d(face, ax)
-            ip2d = project_point(ip, ax)
-            if polygon_with_holes_contains_2d(ip2d, outer2d, holes2d):
-                return ip
-            return None
-
         # 2D containment in an Edge
         def point_in_vertex(vtx, vertex, tol):
             # Boundary snap first
@@ -1348,7 +1270,12 @@ class Vertex():
         
         # 2D containment in a Face (vertex assumed coplanar or nearly so)
         def point_in_face(vtx, face, tol):
-            status = topologic.FaceUtility.IsInside(face, vtx, tol)
+            dist = Vertex.PerpendicularDistance(vtx, face)
+            if dist <= tol:
+                vtx2 = Vertex.Project(vtx, face)
+                status = topologic.FaceUtility.IsInside(face, vtx2, tol)
+            else:
+                status = False
             return status
 
         # 3D containment in a Cell via ray casting (+X direction)
@@ -1360,7 +1287,7 @@ class Vertex():
         # Check if inside AABB
         # --------------------------
         points = [Vertex.Coordinates(v) for v in Topology.Vertices(topology)]
-        aabb = AABB.from_points(points)
+        aabb = AABB.from_points(points, pad=tolerance)
         if not aabb.contains_point(Vertex.Coordinates(vertex)):
             return False
 

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.71'
+__version__ = '0.8.73'

{topologicpy-0.8.71.dist-info → topologicpy-0.8.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.71
+Version: 0.8.73
 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.71.dist-info → topologicpy-0.8.73.dist-info}/RECORD

@@ -26,14 +26,14 @@ topologicpy/ShapeGrammar.py,sha256=KYsKDLXWdflAcYMAIz84AUF-GMkbTmaBDd2-ovbilqU,2
 topologicpy/Shell.py,sha256=JBTw3T1CjJt3ZPTjG1eBU2Oe2n_helW9ioML_bYK2_U,98545
 topologicpy/Speckle.py,sha256=-eiTqJugd7pHiHpD3pDUcDO6CGhVyPV14HFRzaqEoaw,18187
 topologicpy/Sun.py,sha256=8S6dhCKfOhUGVny-jEk87Q08anLYMB1JEBKRGCklvbQ,36670
-topologicpy/Topology.py,sha256=9reHlXzUXYbXt0FJbThL3Wr0JEF2oAHuNRerU2BshxM,473587
+topologicpy/Topology.py,sha256=BC9JYfxComyAzmXrPdhmXlaFBGmZ_x7-oHl579E4qUY,474458
 topologicpy/Vector.py,sha256=pEC8YY3TeHGfGdeNgvdHjgMDwxGabp5aWjwYC1HSvMk,42236
-topologicpy/Vertex.py,sha256=eO74ZcuQUmiEHy5-Xyn7YDlt3R7YKoqB-BEwF-TUcDM,94101
+topologicpy/Vertex.py,sha256=rdtuOvgySIamN_xTKrETUQYu0fukXHR9EDJ91WeZLMI,90855
 topologicpy/Wire.py,sha256=gjgQUGHdBdXUIijgZc_VIW0E39w-smaVhhdl0jF63fQ,230466
 topologicpy/__init__.py,sha256=RMftibjgAnHB1vdL-muo71RwMS4972JCxHuRHOlU428,928
-topologicpy/version.py,sha256=49ezdJH-CaZn_7E1pYgol2MJ6KVA4JWjsEILF4g69nI,23
-topologicpy-0.8.71.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.71.dist-info/METADATA,sha256=eJ0CeTYd_RvHdNXNjmyK1IRQzZqzuEDmqSuwbdLAGEY,10535
-topologicpy-0.8.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-topologicpy-0.8.71.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.71.dist-info/RECORD,,
+topologicpy/version.py,sha256=6R_YGb083s4RIeitSxsh0BGKzotjy9BcSCbEAIQwb9I,23
+topologicpy-0.8.73.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.73.dist-info/METADATA,sha256=-GgQ5YJnlTUt5r8E0HUKhSTb6Da1CSIGWq7iFcYTUQE,10535
+topologicpy-0.8.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.73.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.73.dist-info/RECORD,,