topologicpy 0.8.71__py3-none-any.whl → 0.8.72__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/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topologicpy
-Version: 0.8.71
+Version: 0.8.72
 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.72.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/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=5keU0mboyFEsP7wnOuJd2VXsHYJviiaVppSSn9IAZJE,23
+topologicpy-0.8.72.dist-info/licenses/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.72.dist-info/METADATA,sha256=Ivpypd-BnC6KU2xhc4Q-rsaQpAaFoLWseDSd_NfUYuo,10535
+topologicpy-0.8.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+topologicpy-0.8.72.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.72.dist-info/RECORD,,