topologicpy 0.4.36__py3-none-any.whl → 0.4.38__py3-none-any.whl

topologicpy/Vertex.py

@@ -5,10 +5,62 @@ from topologicpy.Topology import Topology
 import collections
 
 class Vertex(Topology):
+    @staticmethod
+    def AreCollinear(vertices: list, tolerance: float = 0.0001):
+        """
+        Returns True if the input list of vertices form a straight line. Returns False otherwise.
+
+        Parameters
+        ----------
+        vertices : list
+            The input list of vertices.
+        tolerance : float, optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        bool
+            True if the input vertices are on the same side of the face. False otherwise.
+
+        """
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Topology import Topology
+        from topologicpy.Vector import Vector
+
+        def areCollinear(vertices, tolerance=0.0001):
+            point1 = [Vertex.X(vertices[0]), Vertex.Y(vertices[0]), Vertex.Z(vertices[0])]
+            point2 = [Vertex.X(vertices[1]), Vertex.Y(vertices[1]), Vertex.Z(vertices[1])]
+            point3 = [Vertex.X(vertices[2]), Vertex.Y(vertices[2]), Vertex.Z(vertices[2])]
+
+            vector1 = [point2[0] - point1[0], point2[1] - point1[1], point2[2] - point1[2]]
+            vector2 = [point3[0] - point1[0], point3[1] - point1[1], point3[2] - point1[2]]
+
+            cross_product_result = Vector.Cross(vector1, vector2, tolerance=tolerance)
+            return cross_product_result == None
+        
+        if not isinstance(vertices, list):
+            print("Vertex.AreCollinear - Error: The input list of vertices is not a valid list. Returning None.")
+            return None
+        vertexList = [x for x in vertices if isinstance(x, topologic.Vertex)]
+        if len(vertexList) < 2:
+            print("Vertex.AreCollinear - Error: The input list of vertices does not contain sufficient valid vertices. Returning None.")
+            return None
+        if len(vertexList) < 3:
+            return True # Any two vertices can form a line!
+        cluster = Topology.SelfMerge(Cluster.ByTopologies(vertexList))
+        vertexList = Topology.Vertices(cluster)
+        slices = []
+        for i in range(2,len(vertexList)):
+            slices.append([vertexList[0], vertexList[1], vertexList[i]])
+        for slice in slices:
+            if not areCollinear(slice, tolerance=tolerance):
+                return False
+        return True
+    
     @staticmethod
     def AreIpsilateral(vertices: list, face: topologic.Face) -> bool:
         """
-        Returns True if the two input vertices are on the same side of the input face. Returns False otherwise. If at least one of the vertices is on the face, this method return True.
+        Returns True if the input list of vertices form a straight line. Returns False otherwise. If at least one of the vertices is on the face, this method return True.
 
         Parameters
         ----------

topologicpy/Wire.py

@@ -10,7 +10,7 @@ import numpy as np
 
 class Wire(topologic.Wire):
     @staticmethod
-    def BoundingRectangle(topology: topologic.Topology, optimize: int = 0) -> topologic.Wire:
+    def BoundingRectangle(topology: topologic.Topology, optimize: int = 0, tolerance=0.0001) -> topologic.Wire:
         """
         Returns a wire representing a bounding rectangle of the input topology. The returned wire contains a dictionary with key "zrot" that represents rotations around the Z axis. If applied the resulting wire will become axis-aligned.
 
@@ -20,6 +20,8 @@ class Wire(topologic.Wire):
             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.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
         
         Returns
         -------
@@ -33,7 +35,10 @@ class Wire(topologic.Wire):
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
+        from topologicpy.Vector import Vector
         from random import sample
+        import time
+
 
         def br(topology):
             vertices = []
@@ -54,16 +59,23 @@ class Wire(topologic.Wire):
 
         world_origin = Vertex.ByCoordinates(0,0,0)
 
-        xTran = None
-        # Create a sample face
-        while not xTran:
-            vertices = Topology.SubTopologies(topology=topology, subTopologyType="vertex")
-            v = sample(vertices, 3)
-            w = Wire.ByVertices(v)
-            f = Face.ByWire(w)
-            f = Face.Flatten(f)
-            dictionary = Topology.Dictionary(f)
-            xTran = Dictionary.ValueAtKey(dictionary,"xTran")
+        vertices = Topology.SubTopologies(topology=topology, subTopologyType="vertex")
+        start = time.time()
+        period = 0
+        result = True
+        while result and period < 30:
+            vList = sample(vertices, 3)
+            result = Vertex.AreCollinear(vList)
+            end = time.time()
+            period = end - start
+        if result == True:
+            print("Wire.BoundingRectangle - Error: Could not find three vertices that are not colinear within 30 seconds. Returning None.")
+            return None
+        w = Wire.ByVertices(vList)
+        f = Face.ByWire(w)
+        f = Face.Flatten(f)
+        dictionary = Topology.Dictionary(f)
+        xTran = Dictionary.ValueAtKey(dictionary,"xTran")
         yTran = Dictionary.ValueAtKey(dictionary,"yTran")
         zTran = Dictionary.ValueAtKey(dictionary,"zTran")
         phi = Dictionary.ValueAtKey(dictionary,"phi")
@@ -149,21 +161,14 @@ class Wire(topologic.Wire):
             The created wire.
 
         """
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Topology import Topology
         if not isinstance(edges, list):
             return None
         edgeList = [x for x in edges if isinstance(x, topologic.Edge)]
         if len(edgeList) < 1:
             return None
-        wire = None
-        for anEdge in edgeList:
-            if anEdge.Type() == 2:
-                if wire == None:
-                    wire = topologic.Wire.ByEdges([anEdge])
-                else:
-                    try:
-                        wire = wire.Merge(anEdge)
-                    except:
-                        continue
+        wire = Topology.SelfMerge(Cluster.ByTopologies(edgeList))
         if wire.Type() != 4:
             wire = None
         return wire

topologicpy/__init__.py

@@ -2,7 +2,7 @@ import sys
 import os, re
 from sys import platform
 
-__version__ = '0.4.36'
+__version__ = '0.4.38'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 if platform == 'win32':

{topologicpy-0.4.36.dist-info → topologicpy-0.4.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.36
+Version: 0.4.38
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 Project-URL: Homepage, https://github.com/wassimj/TopologicPy

{topologicpy-0.4.36.dist-info → topologicpy-0.4.38.dist-info}/RECORD

@@ -2,28 +2,28 @@ topologicpy/Aperture.py,sha256=kuplpOvicYMPDDghEREs3hZa8XvcWi5m4eJf9rVfI-o,1343
 topologicpy/Cell.py,sha256=QEWgDcaqu4K6LpDxxMDeKNxqOh0tx72Aoa1Ux-z8lNQ,72885
 topologicpy/CellComplex.py,sha256=b-JBSWJhIEvtxaT8JYj4DnHmJwt4EiqLFe2SpufYmFg,29478
 topologicpy/Cluster.py,sha256=qkLwIHPJbTa4rFmRI-d6K9dq7HzcTZoL7ypHxwdKVzc,32569
-topologicpy/Color.py,sha256=MWEXKVdx2OXs2W4GXEeJm-VJ7OnwDo9cmUGRhrJAflw,7914
+topologicpy/Color.py,sha256=7ObLb4hxOOH6SyTCE-NRM5aBXd8KLBEJcM8fxDX3M88,9174
 topologicpy/Context.py,sha256=cPxfxUScXcJVafSTnCTCNpRzBGSbu90D5i6uu26S5us,1643
 topologicpy/DGL.py,sha256=F2pB1B3sjZwHU1nxJXCmu-xr3elk_inSCMfK6AE8mkE,131278
 topologicpy/Dictionary.py,sha256=WKzY0laNMvUDQAWjkUeU6_jWYdYdK79cPWLHZK64SR8,18620
 topologicpy/Edge.py,sha256=GS5N1a5MSkb2ZnGx0aGEbazPfJGGBiYV6UIvTr09edE,35603
 topologicpy/EnergyModel.py,sha256=A-MlZ7gvOWcFRMP0QxodNSs9Shv9FLuWaSRTdNWGstk,50524
 topologicpy/Face.py,sha256=u8fjAp8hYSSKZVS789cQlBDcM-_10FWd792LK7-57so,76074
-topologicpy/Graph.py,sha256=_Vkb35QshHXag5nAXBR9b_rm9vOj_Easd7zEM-T4wlo,241154
+topologicpy/Graph.py,sha256=zhhv46bgj4-fMXmdip2wRW6rQZnl3M7OZfkhiFRQAoU,251120
 topologicpy/Grid.py,sha256=rArW8J3vkhWt8dx9NDzCSyu4oMowUpsly7rEhsLPFII,16449
 topologicpy/Helper.py,sha256=wpq9S2Bi11fcfY8SLHFi6TV4LXmO3pKeiIIKK460pj0,9465
 topologicpy/Honeybee.py,sha256=Vy8e0Chv2EkzqyNcaK3y4QeSj89yY5pdbE8GZgVQyGw,19153
 topologicpy/Matrix.py,sha256=GHd_o714eEWbTOhRM5X-fXcgsV5yYJJSj6xFdnkwC14,7625
 topologicpy/Neo4j.py,sha256=EpfkjAQgoxYJjk7UvadBJxasTJbGjI8IEY8LthHMotI,18297
-topologicpy/Plotly.py,sha256=6-3fCtoifg7-lQ7RkKrVW6Aev3OHSs2rGQOIw58vk18,90561
+topologicpy/Plotly.py,sha256=ytCpr_F7-jfwYetv0LTA1rB7rO_oiN6ZeAP4J-W-x7I,91321
 topologicpy/Polyskel.py,sha256=jz5k5H6p4QRWe3bbMnyYbP9Iji6EQ1wdk3qQvcnbg08,15156
-topologicpy/Shell.py,sha256=PSoHiFGV6Oxr2XGgG1PJ7P5-LFNDdRJlFG6c02C_0Cg,64235
+topologicpy/Shell.py,sha256=uQbuHYTOZ6Wfl4E_RBlsVyyBcy4AYxuJjw-XmgPLyJU,67832
 topologicpy/Speckle.py,sha256=JBS2SW-KpV11XQON_aNwoBuyHdMNQlhcsaOEWqKUcp4,13959
-topologicpy/Topology.py,sha256=3eUA16OtBko1NYWkgaosmPiCPKSUMaNP3-y-QU6_gz4,257078
+topologicpy/Topology.py,sha256=8WhqssjLaNGvnpm9ptywrSUYgRgBX13b_To52hv_VaM,256764
 topologicpy/Vector.py,sha256=TE0Rt7SZ4NQD0YR3ty3crhb7BYbRws_UJ-lj2ihxPXU,17988
-topologicpy/Vertex.py,sha256=hx6PXH8uhJClPGJ4vnGhFsmW5b8ijvAR8iifwTOSZBY,32020
-topologicpy/Wire.py,sha256=xdTJB7ZWoU9Cxp3e_PCrQMYaqDFQDCjXkrlGrqIjlu4,108688
-topologicpy/__init__.py,sha256=sJuAqaLvUlrXy1xRjmPhDUYwhSPXP21p2AAAbfgz9Q4,662
+topologicpy/Vertex.py,sha256=c-MF4Fj2K-L1z5JbTP6GUXnhux4zF6CTUOM5HKLe8KI,34342
+topologicpy/Wire.py,sha256=yiRKCax-4fd4SSMJOy-Jj4Da6opPKn5rCIpFPTX5C10,109015
+topologicpy/__init__.py,sha256=0cPB6iiTHbBY1ZFTyixoUYvEw9llzLEKLhAFd47m1DY,662
 topologicpy/bin/linux/topologic/__init__.py,sha256=qdj8gyp_GtYre27ZdFiVdLzLViOgX62woBZLTy9K91c,58
 topologicpy/bin/linux/topologic/topologic.cpython-310-x86_64-linux-gnu.so,sha256=uvar01STZ8qu1c8fRmtYdVnK8evxBv305QScASXY9go,1852112
 topologicpy/bin/linux/topologic/topologic.cpython-311-x86_64-linux-gnu.so,sha256=42yjVWetFu_qn6-eZcDxgd_A8SQN_wHqkdw91txKt9U,1852112
@@ -66,8 +66,8 @@ topologicpy/bin/windows/topologic/topologic.cp310-win_amd64.pyd,sha256=F0sPLuMpD
 topologicpy/bin/windows/topologic/topologic.cp311-win_amd64.pyd,sha256=aBAJQj3OmJ58MOAF1ZIFybL_5fFK7FNR9hrIps6b6pc,1551872
 topologicpy/bin/windows/topologic/topologic.cp38-win_amd64.pyd,sha256=aLgNf54nbJmGc7Tdmkuy-V0m6B9zLxabIbpRwAy7cBA,1551360
 topologicpy/bin/windows/topologic/topologic.cp39-win_amd64.pyd,sha256=_8cp205hiRxkFHtzQQOweA4DhCPk8caH4kTVLWGQeVw,1411584
-topologicpy-0.4.36.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.4.36.dist-info/METADATA,sha256=nab4lpkA39Y1lKnKiTqK0Ictw-_-1XbxlFeNtK9wxvk,6973
-topologicpy-0.4.36.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-topologicpy-0.4.36.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.4.36.dist-info/RECORD,,
+topologicpy-0.4.38.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.4.38.dist-info/METADATA,sha256=SiOBjtu6NY-6q9S7-tijvCABIh4-SgskBtQqkV7iM94,6973
+topologicpy-0.4.38.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+topologicpy-0.4.38.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.4.38.dist-info/RECORD,,

{topologicpy-0.4.36.dist-info → topologicpy-0.4.38.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.0)
+Generator: bdist_wheel (0.41.1)
 Root-Is-Purelib: true
 Tag: py3-none-any