topologicpy 0.7.50__py3-none-any.whl → 0.7.52__py3-none-any.whl

topologicpy/Wire.py

@@ -310,7 +310,7 @@ class Wire():
         return Wire.ByEdges(edges, tolerance=tolerance)
 
     @staticmethod
-    def ByOffset(wire, offset: float = 1.0, offsetKey: str = "offset", stepOffsetA: float = 0, stepOffsetB: float = 0, stepOffsetKeyA: str = "stepOffsetA", stepOffsetKeyB: str = "stepOffsetB", reverse: bool = False, bisectors: bool = False, transferDictionaries: bool = False, tolerance: float = 0.0001,  silent: bool = False):
+    def ByOffset(wire, offset: float = 1.0, offsetKey: str = "offset", stepOffsetA: float = 0, stepOffsetB: float = 0, stepOffsetKeyA: str = "stepOffsetA", stepOffsetKeyB: str = "stepOffsetB", reverse: bool = False, bisectors: bool = False, transferDictionaries: bool = False, tolerance: float = 0.0001,  silent: bool = False, numWorkers: int = None):
         """
         Creates an offset wire from the input wire. A positive offset value results in an offset to the interior of an anti-clockwise wire.
 
@@ -340,6 +340,10 @@ class Wire():
             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.
+        numWorkers : int , optional
+            Number of workers run in parallel to process. If you set it to 1, no parallel processing will take place.
+            The default is None which causes the algorithm to use twice the number of cpu cores in the host computer.
+
         
         Returns
         -------
@@ -355,12 +359,43 @@ class Wire():
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
+        from topologicpy.Helper import Helper
+
+        def transfer_dictionaries_by_selectors(object, selectors, tranVertices=False, tranEdges=False, tranFaces=True, tolerance=0.0001):
+            if tranVertices == True:
+                vertices = Topology.Vertices(object)
+                for vertex in vertices:
+                    for selector in selectors:
+                        d = Vertex.Distance(selector, vertex)
+                        if d < tolerance:
+                            vertex = Topology.SetDictionary(vertex, Topology.Dictionary(selector), silent=True)
+                            break
+            if tranEdges == True:
+                edges = Topology.Edges(object)
+                for edge in edges:
+                    for selector in selectors:
+                        d = Vertex.Distance(selector, edge)
+                        if d < tolerance:
+                            edge = Topology.SetDictionary(edge, Topology.Dictionary(selector), silent=True)
+                            break
+            
+            if tranFaces == True:
+                faces = Topology.Faces(object)
+                for face in faces:
+                    for selector in selectors:
+                        d = Vertex.Distance(selector, face)
+                        if d < tolerance:
+                            face = Topology.SetDictionary(face, Topology.Dictionary(selector), silent=True)
+                            break
+            return object
 
         if not Topology.IsInstance(wire, "Wire"):
             if not silent:
                 print("Wire.ByOffset - Error: The input wire parameter is not a valid wire. Returning None.")
                 return None
         
+        temp_face = Face.ByWire(wire)
+        original_area = Face.Area(temp_face)
         if reverse == True:
             fac = -1
         else:
@@ -372,14 +407,16 @@ class Wire():
         flat_wire = Topology.Flatten(wire, direction=temp_normal, origin=origin)
         normal = Face.Normal(temp_face)
         flat_wire = Topology.Flatten(wire, direction=normal, origin=origin)
+        original_edges = Topology.Edges(wire)
         edges = Topology.Edges(flat_wire)
+        original_edges = Topology.Edges(wire)
         offsets = []
         offset_edges = []
         final_vertices = []
         bisectors_list = []
         edge_dictionaries = []
-        for edge in edges:
-            d = Topology.Dictionary(edge)
+        for i, edge in enumerate(edges):
+            d = Topology.Dictionary(original_edges[i])
             d_offset = Dictionary.ValueAtKey(d, offsetKey)
             if d_offset == None:
                 d_offset = offset
@@ -406,7 +443,7 @@ class Wire():
                         if bisectors == True:
                             bisectors_list.append(Edge.ByVertices(v_a, v1))
                         if transferDictionaries == True:
-                            v1 = Topology.SetDictionary(v1, Topology.Dictionary(v_a))
+                            v1 = Topology.SetDictionary(v1, Topology.Dictionary(v_a), silent=True)
                             edge_dictionaries.append(Topology.Dictionary(edges[i]))
                         final_vertices.append(v1)
                     else:
@@ -463,15 +500,15 @@ class Wire():
                         v1_2 = Topology.TranslateByDirectionDistance(Edge.StartVertex(o_edge_a),
                                                                      direction = Edge.Direction(o_edge_a),
                                                                      distance = d_stepOffsetB)
+                        if transferDictionaries == True:
+                            v1_1 = Topology.SetDictionary(v1_1, Topology.Dictionary(v_a), silent=True)
+                            v1_2 = Topology.SetDictionary(v1_2, Topology.Dictionary(v_a), silent=True)
+                            edge_dictionaries.append(Topology.Dictionary(v_a))
+                            edge_dictionaries.append(Topology.Dictionary(edges[i]))
                         bisectors_list.append(Edge.ByVertices(v_a, v1_1))
                         bisectors_list.append(Edge.ByVertices(v_a, v1_2))
                         final_vertices.append(v1_1)
                         final_vertices.append(v1_2)
-                        if transferDictionaries == True:
-                            v1_1 = Topology.SetDictionary(v1_1, Topology.Dictionary(v_a))
-                            v1_2 = Topology.SetDictionary(v1_2, Topology.Dictionary(v_a))
-                            edge_dictionaries.append(Topology.Dictionary(v_a))
-                            edge_dictionaries.append(Topology.Dictionary(edges[i]))
         v_a = Edge.EndVertex(edges[-1])
         if Wire.IsClosed(wire) == False:
             v1 = Edge.EndVertex(offset_edges[-1])
@@ -481,21 +518,33 @@ class Wire():
             if bisectors == True:
                 bisectors_list.append(Edge.ByVertices(v_a, v1))
         
-
+        
+        wire_edges = []
+        for i in range(len(final_vertices)-1):
+            v1 = final_vertices[i]
+            v2 = final_vertices[i+1]
+            wire_edges.append(Edge.ByVertices(v1,v2))
+        if Wire.IsClosed(wire):
+            v1 = final_vertices[-1]
+            v2 = final_vertices[0]
+            wire_edges.append(Edge.ByVertices(v1,v2))
+        
         return_wire = Wire.ByVertices(final_vertices, close=Wire.IsClosed(wire))
-        wire_edges = Topology.Edges(return_wire)
+        return_wire_edges = Topology.Edges(return_wire)
+        #wire_edges = Topology.Edges(return_wire)
         if transferDictionaries == True:
-            for i, wire_edge in enumerate(wire_edges):
-                wire_edge = Topology.SetDictionary(wire_edge, edge_dictionaries[i], silent=True)
-        if not Topology.IsInstance(return_wire, "Wire"):
-            if not silent:
-                print("Wire.ByOffset - Warning: The resulting wire is not well-formed, please check your offsets.")
-        else:
-            if not Wire.IsManifold(return_wire) and bisectors == False:
+            if not len(wire_edges) == len(edge_dictionaries):
                 if not silent:
-                    print("Wire.ByOffset - Warning: The resulting wire is non-manifold, please check your offsets.")
+                        print("Length of Wire Edges:", len(wire_edges))
+                        print("Length of Edge Dictionaries:", len(edge_dictionaries))
+                        print("Wire.ByOffset - Warning: The resulting wire is not well-formed, offsets may not be applied correctly. Please check your offsets.")
+            for i, wire_edge in enumerate(wire_edges):
+                if len(edge_dictionaries) > 0:
+                    temp_dictionary = edge_dictionaries[min(i,len(edge_dictionaries)-1)]
+                    wire_edge = Topology.SetDictionary(wire_edge, temp_dictionary, silent=True)
+                    return_wire_edges[i] = Topology.SetDictionary(return_wire_edges[i], temp_dictionary, silent=True)
         if bisectors == True:
-            temp_return_wire = Topology.SelfMerge(Cluster.ByTopologies(Topology.Edges(return_wire)+bisectors_list))
+            temp_return_wire = Topology.SelfMerge(Cluster.ByTopologies(wire_edges+bisectors_list))
             if transferDictionaries == True:
                 sel_vertices = Topology.Vertices(return_wire)
                 sel_vertices += Topology.Vertices(flat_wire)
@@ -506,9 +555,39 @@ class Wire():
                     c = Topology.Centroid(edge)
                     c = Topology.SetDictionary(c, d)
                     sel_edges.append(c)
-                temp_return_wire = Topology.TransferDictionariesBySelectors(temp_return_wire, sel_vertices, tranVertices=True)
-                temp_return_wire = Topology.TransferDictionariesBySelectors(temp_return_wire, sel_edges, tranEdges=True)
+                temp_return_wire = Topology.TransferDictionariesBySelectors(temp_return_wire, sel_vertices, tranVertices=True, numWorkers=numWorkers)
+                temp_return_wire = Topology.TransferDictionariesBySelectors(temp_return_wire, sel_edges, tranEdges=True, numWorkers=numWorkers)
+                
             return_wire = temp_return_wire
+        
+        if not Topology.IsInstance(return_wire, "Wire"):
+            if not silent:
+                print("Wire.ByOffset - Warning: The resulting wire is not well-formed, please check your offsets.")
+        else:
+            if not Wire.IsManifold(return_wire) and bisectors == False:
+                if not silent:
+                    print("Wire.ByOffset - Warning: The resulting wire is non-manifold, please check your offsets.")
+                    print("Pursuing a workaround, but it will take a LONG time.")
+                cycles = Wire.Cycles(return_wire, maxVertices = len(final_vertices))
+                distances = []
+                for cycle in cycles:
+                    #cycle_face = Face.ByWire(cycle)
+                    cycle_centroid = Topology.Centroid(cycle)
+                    distance = Vertex.Distance(origin, cycle_centroid)
+                    distances.append(distance)
+                cycles = Helper.Sort(cycles, distances)
+                return_cycle = Wire.Reverse(cycles[0])
+                sel_edges = []
+                for temp_edge in wire_edges:
+                    x = Topology.Centroid(temp_edge)
+                    d = Topology.Dictionary(temp_edge)
+                    x = Topology.SetDictionary(x, d)
+                    sel_edges.append(x)
+                print("Transfering Vertex Dictionaries")
+                return_cycle = Topology.TransferDictionariesBySelectors(return_cycle, Topology.Vertices(return_wire), tranVertices=True, tolerance=tolerance, numWorkers=numWorkers)
+                print("Transfering Edge Dictionaries")
+                return_cycle = Topology.TransferDictionariesBySelectors(return_cycle, sel_edges, tranEdges=True, tolerance=tolerance, numWorkers=numWorkers)
+                return_wire = return_cycle
         return_wire = Topology.Unflatten(return_wire, direction=normal, origin=origin)
         if transferDictionaries == True:
             return_wire = Topology.SetDictionary(return_wire, Topology.Dictionary(wire), silent=True)
@@ -738,7 +817,7 @@ class Wire():
                     if not(([i1, i2] in g_edges) or ([i2, i1] in g_edges)):
                         g_edges.append([i1, i2])
                 used.append(end)
-        new_wire = Topology.ByGeometry(vertices=g_vertices, edges=g_edges, faces=[], outputMode="wire")
+        new_wire = Topology.SelfMerge(Topology.ByGeometry(vertices=g_vertices, edges=g_edges, faces=[]))
         return new_wire
 
     @staticmethod

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.50'
+__version__ = '0.7.52'

{topologicpy-0.7.50.dist-info → topologicpy-0.7.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.50
+Version: 0.7.52
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.50.dist-info → topologicpy-0.7.52.dist-info}/RECORD

@@ -3,33 +3,33 @@ topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
 topologicpy/Cell.py,sha256=uZ1gNVlfVtpi6sNgyfazP_nqe7mPjarE7MYzf8KoEI4,107930
 topologicpy/CellComplex.py,sha256=x474N-lo1krpdIGrWRAFRdDup5a_1V-mLORTS6ZGZ7M,48227
 topologicpy/Cluster.py,sha256=TZXuxzdaUr6OHSWnjWpjCOMlVj6YHBH8aUVbDVsncVA,54999
-topologicpy/Color.py,sha256=UlmRcCSOhqcM_OyMWz4t3Kr75KcgXDhz3uctAJ2n7Ic,18031
+topologicpy/Color.py,sha256=FrxX2yILqWvYrqD8kBaknfMfOR_phJOmhvTvFc07bY4,18065
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
-topologicpy/Dictionary.py,sha256=KqJ29YyE23Y3Xc6XmKLSCZXRfBvm-OEOxlMZ4dt-rfM,27094
+topologicpy/Dictionary.py,sha256=X_WARSYtWtYIsEUKdLH-plZmGZ3pHz_FBFxxeHGHdrU,27065
 topologicpy/Edge.py,sha256=vhYHkobSLGSWV-oe2oJFFDobqFToDyb7s71yQ840AAA,65166
 topologicpy/EnergyModel.py,sha256=XcCP55VW5WHDIIKcURijmBOZEgNUDEn_V9h5EejkntA,53876
-topologicpy/Face.py,sha256=pn0LGusTPKLrHEMhY94_Bs3rc4wUpIyEqyW9q-ftdG0,115379
-topologicpy/Graph.py,sha256=1dtcE342b6d7cTiMbtUWWOud6Vu0vHaf4HP2eG_-iqg,402544
+topologicpy/Face.py,sha256=7GCYo4ATkMW1skiv4gXOVARM29A7Buim9lTQu57B22Y,115489
+topologicpy/Graph.py,sha256=capDrtqrvNSyivrcRnHDIEGgO43ZxjqykeFiGBV3GIA,402880
 topologicpy/Grid.py,sha256=3-sn7CHWGcXk18XCnHjsUttNJTWwmN63g_Insj__p04,18218
 topologicpy/Helper.py,sha256=i-AfI29NMsZXBaymjilfvxQbuS3wpYbpPw4RWu1YCHs,16358
 topologicpy/Honeybee.py,sha256=vcBECJlgWVjNNdD9ZmjNik_pA1Y_ZNoOorsQb2CiyGA,21965
 topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=YvtF7RYUMATEZ8iHwFwK_MOxEDyARby2DTI2CCK6-cI,19694
-topologicpy/Plotly.py,sha256=o0JWE51lViK-UJUpIpf2Yusk_vTX5hfNMyFXFinKSRg,106048
+topologicpy/Plotly.py,sha256=Aaq6D9D7gov5OrfoKLs_j3LJfdkCC-Gh8GaU5n2UOGQ,106199
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=3U59QObO56EBwrvaplGeLZhbTao0gJCYhWm3oTpjFAE,109505
 topologicpy/Shell.py,sha256=joahFtpRQTWJpQOmi3qU4Xe0Sx2XXeayHlXTNx8CzMk,87610
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=NONehbPs2Z0J-BaQXRUChCZfTzJSzVngkhojKSxSij8,382087
+topologicpy/Topology.py,sha256=ZhfTwA-qwgISDJftRVB1l5DdbfI4fMBJ0kNbH2WFQMs,419038
 topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 topologicpy/Vertex.py,sha256=bLY60YWoMsgCgHk7F7k9F93Sq2FJ6AzUcTfJ83NZfHA,71107
-topologicpy/Wire.py,sha256=9EJE0Iq3nGz5X7Suy6xxjmuOpfV49By6WH98UAL_7m4,153532
+topologicpy/Wire.py,sha256=POd3_jjSXsLV6OiH6PvGZvA3AS5OpesDI5Fahn59daI,158034
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=gEkNhj8f1k7FiRl8ltgMlJxkt4i1ODTsl0_a2BsR4wI,23
-topologicpy-0.7.50.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.50.dist-info/METADATA,sha256=bQrEvJSs5DBgeaLDmx_HZPF_Qz_rZCXSLa3YUuOa33s,10918
-topologicpy-0.7.50.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-topologicpy-0.7.50.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.50.dist-info/RECORD,,
+topologicpy/version.py,sha256=ojid7jrMog3tWPPKrqrquVx5_TXLYp_7tfVq6IeQYaE,23
+topologicpy-0.7.52.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.52.dist-info/METADATA,sha256=q3XykClIfWtok_A1P6zYFpjyA4yHUJGNhcStZyOjAeM,10918
+topologicpy-0.7.52.dist-info/WHEEL,sha256=ixB2d4u7mugx_bCBycvM9OzZ5yD7NmPXFRtKlORZS2Y,91
+topologicpy-0.7.52.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.52.dist-info/RECORD,,

{topologicpy-0.7.50.dist-info → topologicpy-0.7.52.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any