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

topologicpy/Cell.py

@@ -913,6 +913,7 @@ class Cell():
 
         """
         from topologicpy.Topology import Topology
+        import math
 
         if not Topology.IsInstance(cell, "Cell"):
             print("Cell.ContainmentStatus - Error: The input cell parameter is not a valid topologic cell. Returning None.")
@@ -920,14 +921,28 @@ class Cell():
         if not Topology.IsInstance(vertex, "Vertex"):
             print("Cell.ContainmentStatus - Error: The input vertex parameter is not a valid topologic vertex. Returning None.")
             return None
+        
+        # topologic.CellUtility.Contains does not seem to respect the input tolerance. Thus we need to send eight additional vertices
+        # to check if any are contained and take the average result.
+        
+        test_vertices = [vertex]
+        if tolerance > 0:
+            test_cell = Cell.Prism(origin=vertex, width=tolerance*2, length=tolerance*2, height=tolerance*2, tolerance=tolerance)
+            test_vertices.extend(Topology.Vertices(test_cell))
         try:
-            status = topologic.CellUtility.Contains(cell, vertex, tolerance) # Hook to Core
-            if status == 0:
-                return 0
-            elif status == 1:
-                return 1
-            else:
-                return 2
+            av_results = []
+            for v in test_vertices:
+                
+                result  = topologic.CellUtility.Contains(cell, v, tolerance) # Hook to Core
+                if result == 0:
+                    status = 0
+                elif result == 1:
+                    status = 1
+                else:
+                    status = 2
+                av_results.append(status)
+            return min(av_results)
+            
         except:
             print("Cell.ContainmentStatus - Error: Could not determine containment status. Returning None.")
             return None

topologicpy/Vertex.py

@@ -1325,8 +1325,8 @@ class Vertex():
         else:
             cells = collect_cells(topology)
             faces = [] if cells else collect_faces(topology)
-            edges = [] if faces else collect_edges(topology)
-            vertices = [] if edges else collect_vertices(topology)
+            edges = [] if faces or cells else collect_edges(topology)
+            vertices = [] if edges or faces or cells else collect_vertices(topology)
         if not cells and not faces and not edges and not vertices:
             return False
 

topologicpy/version.py

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

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

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

@@ -2,7 +2,7 @@ topologicpy/ANN.py,sha256=gpflv4lFypOW789vO7mSkMLaMF_ZftVOCqCvtGr6-JA,47873
 topologicpy/Aperture.py,sha256=wNn5miB_IrGCBYuQ18HXQYRva20dUC3id4AJCulL7to,2723
 topologicpy/BVH.py,sha256=ts0Ru24ILjjfHa54SYNhMc8Jkyxwej1DV0Jv7P_6BoU,22513
 topologicpy/CSG.py,sha256=09la1-xzS9vr-WnV7tpJ0I-mkZ-XY0MRSd5iB50Nfgw,15556
-topologicpy/Cell.py,sha256=xkt9lfutgSwr_1lah1U5n48UnrLIggznNKUmEe2FA2g,177505
+topologicpy/Cell.py,sha256=8HeL2sVgvBWwsWsFD6OkyCIQf3S4JPBWc_xev0Oh1i4,178199
 topologicpy/CellComplex.py,sha256=Kbz63rGeE08bJfMXFvB-AptoKHiaCK5OtiV1wz8Y-Fk,68081
 topologicpy/Cluster.py,sha256=G49AuhJHQ1s819cB5MtVdmAGgkag19IC3dRP1ub1Wh4,58608
 topologicpy/Color.py,sha256=hzSmgBWhiuYc55RSipkQNIgGtgyhC5BqY8AakNYEK-U,24486
@@ -28,12 +28,12 @@ topologicpy/Speckle.py,sha256=-eiTqJugd7pHiHpD3pDUcDO6CGhVyPV14HFRzaqEoaw,18187
 topologicpy/Sun.py,sha256=8S6dhCKfOhUGVny-jEk87Q08anLYMB1JEBKRGCklvbQ,36670
 topologicpy/Topology.py,sha256=BC9JYfxComyAzmXrPdhmXlaFBGmZ_x7-oHl579E4qUY,474458
 topologicpy/Vector.py,sha256=pEC8YY3TeHGfGdeNgvdHjgMDwxGabp5aWjwYC1HSvMk,42236
-topologicpy/Vertex.py,sha256=rdtuOvgySIamN_xTKrETUQYu0fukXHR9EDJ91WeZLMI,90855
+topologicpy/Vertex.py,sha256=oBlBXNrB0ov-lA6uvvPNIiRCZwKa92SS_K5vfp8Elec,90882
 topologicpy/Wire.py,sha256=gjgQUGHdBdXUIijgZc_VIW0E39w-smaVhhdl0jF63fQ,230466
 topologicpy/__init__.py,sha256=RMftibjgAnHB1vdL-muo71RwMS4972JCxHuRHOlU428,928
-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,,
+topologicpy/version.py,sha256=0GBumWosBLrQf5ksbXd1cy8lfG5KK7ZxVU4oNea8mU4,23
+topologicpy-0.8.74.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.74.dist-info/METADATA,sha256=M7FzwXZzuTCTCHrXLwtS-i-APB3DVw3lFld3gbmedHo,10535
+topologicpy-0.8.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.74.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.74.dist-info/RECORD,,