topologicpy 0.7.19__py3-none-any.whl → 0.7.20__py3-none-any.whl

topologicpy/Face.py

@@ -189,7 +189,13 @@ class Face():
         from topologicpy.Topology import Topology
 
         br_wire = Wire.BoundingRectangle(topology=topology, optimize=optimize, tolerance=tolerance)
+        if not Topology.IsInstance(br_wire, "Wire"):
+            print("Face.BoundingRectangle - Warning: Could not create base wire. Returning None.")
+            return None
         br_face = Face.ByWire(br_wire)
+        if not Topology.IsInstance(br_face, "Face"):
+            print("Face.BoundingRectangle - Warning: Could not create face from base wire. Returning None.")
+            return None
         br_face = Topology.SetDictionary(br_face, Topology.Dictionary(br_wire))
         return br_face
     
@@ -225,7 +231,11 @@ class Face():
         if not Topology.IsInstance(wire, "Wire"):
             print("Face.ByEdges - Error: Could not create the required wire. Returning None.")
             return None
-        return Face.ByWire(wire, tolerance=tolerance)
+        face = Face.ByWire(wire, tolerance=tolerance)
+        if not Topology.IsInstance(face, "Face"):
+            print("Face.ByEdges - Warning: Could not create face from base wire. Returning None.")
+            return None
+        return face
 
     @staticmethod
     def ByEdgesCluster(cluster, tolerance: float = 0.0001):
@@ -255,7 +265,11 @@ class Face():
         if len(edges) < 1:
             print("Face.ByEdgesCluster - Warning: The input cluster parameter does not contain any valid edges. Returning None.")
             return None
-        return Face.ByEdges(edges, tolerance=tolerance)
+        face = Face.ByEdges(edges, tolerance=tolerance)
+        if not Topology.IsInstance(face, "Face"):
+            print("Face.ByEdgesCluster - Warning: Could not create face from edges. Returning None.")
+            return None
+        return face
 
     @staticmethod
     def ByOffset(face, offset: float = 1.0, tolerance: float = 0.0001):
@@ -289,7 +303,11 @@ class Face():
         offset_internal_boundaries = []
         for internal_boundary in internal_boundaries:
             offset_internal_boundaries.append(Wire.ByOffset(wire=internal_boundary, offset=offset, bisectors=False, tolerance=tolerance))
-        return Face.ByWires(offset_external_boundary, offset_internal_boundaries, tolerance=tolerance)
+        face = Face.ByWires(offset_external_boundary, offset_internal_boundaries, tolerance=tolerance)
+        if not Topology.IsInstance(face, "Face"):
+            print("Face.ByOffset - Warning: Could not create face from wires. Returning None.")
+            return None
+        return face
     
     @staticmethod
     def ByShell(shell, origin= None, angTolerance: float = 0.1, tolerance: float = 0.0001, silent=False):

topologicpy/Graph.py

@@ -280,7 +280,7 @@ class Graph:
         vertexLabelKey : str , optional
             The returned vertices are labelled according to the dictionary values stored under this key.
             If the vertexLabelKey does not exist, it will be created and the vertices are labelled numerically and stored in the vertex dictionary under this key. The default is "label".
-        edgeWeightKey : str , optional
+        edgeKey : str , optional
             If set, the edges' dictionaries will be searched for this key to set their weight. If the key is set to "length" (case insensitive), the length of the edge will be used as its weight. If set to None, a weight of 1 will be used. The default is "Length".
         reverse : bool , optional
                 If set to True, the vertices are sorted in reverse order (only if vertexKey is set). Otherwise, they are not. The default is False.
@@ -515,8 +515,10 @@ class Graph:
             The input graph.
         edge : topologic_core.Edge
             The input edge.
-        transferDictionaries : bool, optional
-            If set to True, the dictionaries of the edge and its vertices are transferred to the graph.
+        transferVertexDictionaries : bool, optional
+            If set to True, the dictionaries of the vertices are transferred to the graph.
+        transferEdgeDictionaries : bool, optional
+            If set to True, the dictionaries of the edges are transferred to the graph.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 

topologicpy/Shell.py

@@ -1419,6 +1419,7 @@ class Shell():
             shell = Topology.RemoveCoplanarFaces(shell, epsilon=epsilon, tolerance=tolerance)
         except:
             pass
+        shell = Topology.Unflatten(shell, origin=origin, direction=normal)
         return shell
     
     @staticmethod
@@ -1519,11 +1520,18 @@ class Shell():
         if not Topology.IsInstance(face, "Face"):
             return None
         roof = Wire.Skeleton(face, tolerance=tolerance)
-        if not roof:
+        if not (Topology.IsInstance(roof, "Wire") or Topology.IsInstance(roof, "Cluster")):
+            print("Shell.Skeleton - Error: Could not create base skeleton wire. Returning None.")
             return None
         br = Wire.BoundingRectangle(roof) #This works even if it is a Cluster not a Wire
+        if not Topology.IsInstance(br, "Wire"):
+            print("Shell.Skeleton - Error: Could not create a bounding rectangle wire. Returning None.")
+            return None
         br = Topology.Scale(br, Topology.Centroid(br), 1.5, 1.5, 1)
         bf = Face.ByWire(br, tolerance=tolerance)
+        if not Topology.IsInstance(bf, "Face"):
+            print("Shell.Skeleton - Error: Could not create a bounding rectangle face. Returning None.")
+            return None
         large_shell = Topology.Boolean(bf, roof, operation="slice", tolerance=tolerance)
         if not large_shell:
             return None
@@ -1536,6 +1544,9 @@ class Shell():
             if len(internalBoundaries) == 0:
                 final_faces.append(f)
         shell = Shell.ByFaces(final_faces, tolerance=tolerance)
+        if not Topology.IsInstance(shell, "Shell"):
+            print("Shell.Skeleton - Error: Could not create shell. Returning None.")
+            return None
         return shell
 
     @staticmethod

topologicpy/Wire.py

@@ -152,7 +152,9 @@ class Wire(Topology):
         topology : topologic_core.Topology
             The input topology.
         optimize : int , optional
-            If set to an integer from 1 (low optimization) to 10 (high optimization), the method will attempt to optimize the bounding rectangle so that it reduces its surface area. The default is 0 which will result in an axis-aligned bounding rectangle. The default is 0.
+            If set to an integer from 1 (low optimization) to 10 (high optimization), the method will attempt to optimize the bounding rectangle so that it reduces its surface area.
+            The minimum optimization number of 0 will result in an axis-aligned bounding rectangle.
+            A maximum optimization number of 10 will attempt to reduce the bounding rectangle's area by 50%. The default is 0.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         tolerance : float , optional
@@ -190,9 +192,11 @@ class Wire(Topology):
         if not Topology.IsInstance(topology, "Topology"):
             return None
 
-        world_origin = Vertex.Origin()
 
         vertices = Topology.SubTopologies(topology=topology, subTopologyType="vertex")
+        if Vertex.AreCollinear(vertices, mantissa=mantissa, tolerance=tolerance):
+            print("Wire.BoundingRectangle - Error: All vertices of the input topology parameter are collinear and thus no bounding rectangle can be created. Returning None.")
+            return None
         start = time.time()
         period = 0
         result = True
@@ -205,7 +209,13 @@ class Wire(Topology):
             print("Wire.BoundingRectangle - Error: Could not find three vertices that are not colinear within 30 seconds. Returning None.")
             return None
         w = Wire.ByVertices(vList)
+        if not Topology.IsInstance(w, "Wire"):
+            print("Wire.BoundingRectangle - Error: Could not create wire from three vertices. Returning None.")
+            return None
         f = Face.ByWire(w, tolerance=tolerance)
+        if not Topology.IsInstance(f, "Face"):
+            print("Wire.BoundingRectangle - Error: Could not create face from wire. Returning None.")
+            return None
         f_origin = Topology.Centroid(f)
         normal = Face.Normal(f, mantissa=mantissa)
         topology = Topology.Flatten(topology, origin=f_origin, direction=normal)
@@ -224,7 +234,7 @@ class Wire(Topology):
         origin = Topology.Centroid(topology)
         optimize = min(max(optimize, 0), 10)
         if optimize > 0:
-            factor = (round(((11 - optimize)/30 + 0.57), 2))
+            factor = 1.0 - float(optimize)*0.05 # This will give a range of 0 to 0.5. Equivalent to a maximum 50% reduction in area.
             flag = False
             for n in range(10, 0, -1):
                 if flag:
@@ -240,7 +250,7 @@ class Wire(Topology):
                     w = abs(maxX - minX)
                     l = abs(maxY - minY)
                     area = l*w
-                    if area < orig_area*factor:
+                    if area <= orig_area*factor: # If new area is less than or equal to a certain percentage of the original area then break. e.g. if area is less than or qual to 50% of original area then break.
                         best_area = area
                         best_z = z
                         best_br = [minX, minY, maxX, maxY]
@@ -253,7 +263,6 @@ class Wire(Topology):
                         
         else:
             best_br = boundingRectangle
-
         minX, minY, maxX, maxY = best_br
         vb1 = Vertex.ByCoordinates(minX, minY, 0)
         vb2 = Vertex.ByCoordinates(maxX, minY, 0)

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.19'
+__version__ = '0.7.20'

{topologicpy-0.7.19.dist-info → topologicpy-0.7.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.19
+Version: 0.7.20
 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.19.dist-info → topologicpy-0.7.20.dist-info}/RECORD

@@ -1,4 +1,4 @@
-topologicpy/ANN.py,sha256=MPgMJxJVdEt0ETpxt1TliUosByDEqKQcKq7iqrJjRXc,53073
+topologicpy/ANN.py,sha256=H_L81-RLdmzL0wehqcZz9IUgRENFxIH7mYxS3aKL7oE,48982
 topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
 topologicpy/Cell.py,sha256=1AAruEDSUJqQFED7fL5-nTon2lR1FrkZxo59iEHOCY0,99833
 topologicpy/CellComplex.py,sha256=Fd70Dj7E4LqV5O-7kcCCYnrFEyqheZvxc0YWktm0EL8,47440
@@ -9,8 +9,8 @@ topologicpy/DGL.py,sha256=5jNn1L8F8REx1-oAh9sr_cfil0R5kUuueCNDKwNU_GM,138991
 topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,25891
 topologicpy/Edge.py,sha256=f7LjP662_yoqopAXBh1Gqv8DvdzvfM_heJTP2XnFskY,58447
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
-topologicpy/Face.py,sha256=1J1dnS3tNnaoFQyWdWjn9YnHldyiN-J67IjytIT0-R4,108142
-topologicpy/Graph.py,sha256=JM4N6EShvDspFcE9_E027HKAkHhZ5e5UD4I9LxlRfmA,391560
+topologicpy/Face.py,sha256=DpV4ZOurOmqV3H3cDZG8FIt9NSm1DspYQjSIwfyzJjE,109083
+topologicpy/Graph.py,sha256=tafjhTMr4cixcQnyj6FaIeDucc0SGTwn7kNFtnU4Q0U,391685
 topologicpy/Grid.py,sha256=Cpzs9l5-SptMQbUR8AvbbIOHrGMGlK0Qx8FWmQBgvX0,18497
 topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
 topologicpy/Honeybee.py,sha256=dlr5OEH93q51ZmEgvi8PXGfCHBDAjIZ1cm38Rft1Bz4,20235
@@ -18,17 +18,17 @@ topologicpy/Matrix.py,sha256=VV-kbT0Qt5QO38HRFJmD4IMnQUzYbLjBF4xaFAqLh3Q,8352
 topologicpy/Neo4j.py,sha256=Gy2PS4Ky8BNhohKreoV4zgzW9OXCjhSwiZF_Aq21_wU,19589
 topologicpy/Plotly.py,sha256=6ZYVAvSSDtoHZ7OsofIDwOKRDF_CTE_UOEzEtcxHAuU,98845
 topologicpy/Polyskel.py,sha256=pNawz5lnvy4oTzCL91fGY2PblW2hmcYBdT5268m2RZs,19743
-topologicpy/Shell.py,sha256=fdMhCKH5Oq2id16XjTWRe8-06jZ8z8LnrVqMR-33F3s,79144
+topologicpy/Shell.py,sha256=gQZb0LEdzHjvQbjEOX5wT9fOYB71E6WkPLz9Kr1i4_s,79903
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=mN3RzlslcZT3APUtwmWIXVbPkJ6OcKTaTf6338gbMJE,37152
 topologicpy/Topology.py,sha256=arsO_TXFLt_M0ulUIKIOgI-xn-gjrtwKlT6Je2_R-ZU,338696
 topologicpy/Vector.py,sha256=G4mIIcE5Y-EHfiNV_rxiOz8pJeV3NMEwLu5EOgM0gKA,32653
 topologicpy/Vertex.py,sha256=bD3JnNhizbp6HFhHRve2LK_y5w27jytCbsagOLxKjZQ,71198
-topologicpy/Wire.py,sha256=vkDmfHjV7_ejZmrnCWFf4zdhhoI88ZDWY9Su_TQwjas,143577
+topologicpy/Wire.py,sha256=ujU77xbwsmZqMmlIhfAlmJsM32ZXWoxCSM7Pc7Yj4T0,144545
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=UOy-EMduBicLVj1Dfuz2h9Dr9n4BtAE9AAVmMLbBN6s,23
-topologicpy-0.7.19.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.19.dist-info/METADATA,sha256=SYu8MxTVov2F8IWtiwnK1YLB_kEPdVrhEjn8omSXefU,10916
-topologicpy-0.7.19.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-topologicpy-0.7.19.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.19.dist-info/RECORD,,
+topologicpy/version.py,sha256=VIiPuXuXNrG_S2UPdi_XO4PF0FZA9CnJGIDymw2UNro,23
+topologicpy-0.7.20.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.20.dist-info/METADATA,sha256=kVffMsaS5-2HNrTirl-E14NV4ugX2IVruTcXx98-UXw,10916
+topologicpy-0.7.20.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+topologicpy-0.7.20.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.20.dist-info/RECORD,,