topologicpy 0.7.71__py3-none-any.whl → 0.7.73__py3-none-any.whl

topologicpy/Wire.py

@@ -90,8 +90,19 @@ class Wire():
             # Calculate radius
             radius = np.linalg.norm(circumcenter - p1)
 
+            # Helper function to rotate a point around an arbitrary axis
+            def rotation_matrix_around_axis(axis, theta):
+                cos_theta = np.cos(theta)
+                sin_theta = np.sin(theta)
+                x, y, z = axis
+                return np.array([
+                    [cos_theta + x*x*(1 - cos_theta), x*y*(1 - cos_theta) - z*sin_theta, x*z*(1 - cos_theta) + y*sin_theta],
+                    [y*x*(1 - cos_theta) + z*sin_theta, cos_theta + y*y*(1 - cos_theta), y*z*(1 - cos_theta) - x*sin_theta],
+                    [z*x*(1 - cos_theta) - y*sin_theta, z*y*(1 - cos_theta) + x*sin_theta, cos_theta + z*z*(1 - cos_theta)]
+                ])
+
             # Generate points along the arc
-            def interpolate_on_arc(p_start, p_end, center, radius, n_points):
+            def interpolate_on_arc(p_start, p_end, center, n_points):
                 v_start = p_start - center
                 v_end = p_end - center
                 
@@ -99,31 +110,25 @@ class Wire():
                 axis = np.cross(v_start, v_end)
                 axis = axis / np.linalg.norm(axis)
                 
-                angles = np.linspace(0, angle_between, n_points)
-                arc_points = []
-                
-                for angle in angles:
-                    rotation_matrix = rotation_matrix_around_axis(axis, angle)
-                    point_on_arc = center + np.dot(rotation_matrix, v_start)
-                    arc_points.append(point_on_arc)
-                
-                return arc_points
-
-            # Helper function to rotate a point around an arbitrary axis
-            def rotation_matrix_around_axis(axis, theta):
-                cos_theta = np.cos(theta)
-                sin_theta = np.sin(theta)
-                x, y, z = axis
-                return np.array([
-                    [cos_theta + x*x*(1-cos_theta), x*y*(1-cos_theta) - z*sin_theta, x*z*(1-cos_theta) + y*sin_theta],
-                    [y*x*(1-cos_theta) + z*sin_theta, cos_theta + y*y*(1-cos_theta), y*z*(1-cos_theta) - x*sin_theta],
-                    [z*x*(1-cos_theta) - y*sin_theta, z*y*(1-cos_theta) + x*sin_theta, cos_theta + z*z*(1-cos_theta)]
-                ])
+                # Adjust for symmetry if n_points is even or odd
+                if n_points % 2 == 0:
+                    # For even n_points, generate n_points + 1 and skip the first point for symmetry
+                    angles = np.linspace(0, angle_between, n_points + 1)
+                    arc_points = [center + np.dot(rotation_matrix_around_axis(axis, angle), v_start) for angle in angles]
+                    return [p_start]+arc_points[1:]  # Skip the first point
+                else:
+                    # For odd n_points, include both start, apex, and end points symmetrically
+                    angles = np.linspace(0, angle_between, n_points)
+                    arc_points = [center + np.dot(rotation_matrix_around_axis(axis, angle), v_start) for angle in angles]
+                    return arc_points
 
             # Get points on the arc from p1 to p3 via p2
-            arc1 = interpolate_on_arc(p1, p2, circumcenter, radius, n//2)
-            arc2 = interpolate_on_arc(p2, p3, circumcenter, radius, n//2)
-
+            if n <= 1: # Special case for number of edges == 1 or less.
+                return [p1, p3]
+            if n == 2: # Special case for number of edges == 2.
+                return [p1, p2, p3]
+            arc1 = interpolate_on_arc(p1, p2, circumcenter, (n+1) // 2)
+            arc2 = interpolate_on_arc(p2, p3, circumcenter, (n+1) // 2)
             return np.vstack([arc1, arc2])
         
         if not Topology.IsInstance(startVertex, "Vertex"):
@@ -143,17 +148,6 @@ class Wire():
         for arc_point in arc_points:
             vertices.append(Vertex.ByCoordinates(list(arc_point)))
         arc = Wire.ByVertices(vertices, close=False)
-        if not Topology.IsInstance(arc, "Wire"):
-            if not silent:
-                print("Wire.Arc - Error: Could not create an arc. Returning None.")
-            return None
-        # Reinterpolate the arc with equal segments
-        vertices = []
-        for i in range(0,sides+1,1):
-            u = i/sides
-            v = Wire.VertexByParameter(arc, u)
-            vertices.append(v)
-        arc = Wire.ByVertices(vertices, close=close)
         if not Topology.IsInstance(arc, "Wire"):
             if not silent:
                 print("Wire.Arc - Error: Could not create an arc. Returning None.")
@@ -253,11 +247,11 @@ class Wire():
             for aVertex in vertices:
                 x.append(Vertex.X(aVertex, mantissa=mantissa))
                 y.append(Vertex.Y(aVertex, mantissa=mantissa))
-            minX = min(x)
-            minY = min(y)
+            x_min = min(x)
+            y_min = min(y)
             maxX = max(x)
             maxY = max(y)
-            return [minX, minY, maxX, maxY]
+            return [x_min, y_min, maxX, maxY]
 
         if not Topology.IsInstance(topology, "Topology"):
             return None
@@ -290,12 +284,12 @@ class Wire():
         topology = Topology.Flatten(topology, origin=f_origin, direction=normal)
         
         boundingRectangle = br(topology)
-        minX = boundingRectangle[0]
-        minY = boundingRectangle[1]
+        x_min = boundingRectangle[0]
+        y_min = boundingRectangle[1]
         maxX = boundingRectangle[2]
         maxY = boundingRectangle[3]
-        w = abs(maxX - minX)
-        l = abs(maxY - minY)
+        w = abs(maxX - x_min)
+        l = abs(maxY - y_min)
         best_area = l*w
         orig_area = best_area
         best_z = 0
@@ -315,28 +309,28 @@ class Wire():
                     if flag:
                         break
                     t = Topology.Rotate(topology, origin=origin, axis=[0, 0, 1], angle=z)
-                    minX, minY, maxX, maxY = br(t)
-                    w = abs(maxX - minX)
-                    l = abs(maxY - minY)
+                    x_min, y_min, maxX, maxY = br(t)
+                    w = abs(maxX - x_min)
+                    l = abs(maxY - y_min)
                     area = l*w
                     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]
+                        best_br = [x_min, y_min, maxX, maxY]
                         flag = True
                         break
                     if area < best_area:
                         best_area = area
                         best_z = z
-                        best_br = [minX, minY, maxX, maxY]
+                        best_br = [x_min, y_min, maxX, maxY]
                         
         else:
             best_br = boundingRectangle
-        minX, minY, maxX, maxY = best_br
-        vb1 = Vertex.ByCoordinates(minX, minY, 0)
-        vb2 = Vertex.ByCoordinates(maxX, minY, 0)
+        x_min, y_min, maxX, maxY = best_br
+        vb1 = Vertex.ByCoordinates(x_min, y_min, 0)
+        vb2 = Vertex.ByCoordinates(maxX, y_min, 0)
         vb3 = Vertex.ByCoordinates(maxX, maxY, 0)
-        vb4 = Vertex.ByCoordinates(minX, maxY, 0)
+        vb4 = Vertex.ByCoordinates(x_min, maxY, 0)
 
         boundingRectangle = Wire.ByVertices([vb1, vb2, vb3, vb4], close=True)
         boundingRectangle = Topology.Rotate(boundingRectangle, origin=origin, axis=[0, 0, 1], angle=-best_z)
@@ -3463,20 +3457,20 @@ class Wire():
             vertices.append(Vertex.ByCoordinates(x, y, z))
             ang = ang + angOffset
         
-        minX = min(xList)
+        x_min = min(xList)
         maxX = max(xList)
-        minY = min(yList)
+        y_min = min(yList)
         maxY = max(yList)
         radius = radiusA + radiusB*turns*0.5
         baseWire = Wire.ByVertices(vertices, close=False)
         if placement.lower() == "center":
             baseWire = Topology.Translate(baseWire, 0, 0, -height*0.5)
         if placement.lower() == "lowerleft":
-            baseWire = Topology.Translate(baseWire, -minX, -minY, 0)
+            baseWire = Topology.Translate(baseWire, -x_min, -y_min, 0)
         elif placement.lower() == "upperleft":
-            baseWire = Topology.Translate(baseWire, -minX, -maxY, 0)
+            baseWire = Topology.Translate(baseWire, -x_min, -maxY, 0)
         elif placement.lower() == "lowerright":
-            baseWire = Topology.Translate(baseWire, -maxX, -minY, 0)
+            baseWire = Topology.Translate(baseWire, -maxX, -y_min, 0)
         elif placement.lower() == "upperright":
             baseWire = Topology.Translate(baseWire, -maxX, -maxY, 0)
         if direction != [0, 0, 1]:

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.71'
+__version__ = '0.7.73'

{topologicpy-0.7.71.dist-info → topologicpy-0.7.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.71
+Version: 0.7.73
 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.7.73.dist-info/RECORD

@@ -0,0 +1,36 @@
+topologicpy/ANN.py,sha256=XAuUjNvDRK1hhXfo82S-zXmnAPZGEdHJMRdfpu0aJ8I,47901
+topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
+topologicpy/BVH.py,sha256=mKVCAu9K8qzcWXtPDVH5usXZV1DNNNJl4n3rU5Lh1ZM,12931
+topologicpy/Cell.py,sha256=2izd-YGqy897_JHHgrGlIo5WwUeEIWVD3KspV1z_sj8,107860
+topologicpy/CellComplex.py,sha256=5PtnRrDx_3zmtt4aTosxK9XBzZtayzaOC50pkJiIlFY,51170
+topologicpy/Cluster.py,sha256=51q5G1L5xAzRMfVU8YBXhq0g3g2X9aVNcahU-vYZRrI,55672
+topologicpy/Color.py,sha256=wPhA7rLr9BTZsWYUUVnQpbmL5ZMkGlDSsa8f3S5B-d4,20250
+topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
+topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
+topologicpy/Dictionary.py,sha256=0AsGoz48pGTye_F4KcJopNjD9STeQ50LHc6PPvERFaA,31932
+topologicpy/Edge.py,sha256=9u9SdUxuenLUIK26xwFvPoYV34p0dCfXmHHBxdgvAdM,67164
+topologicpy/EnergyModel.py,sha256=AqTtmXE35SxvRXhG3vYAQd7GQDW-6HtjYPHua6ME4Eg,53762
+topologicpy/Face.py,sha256=q7x6auTju6IS3mdOhhXZdU3rqKSuJCE-5EOfxofDDMI,124348
+topologicpy/Graph.py,sha256=ULniT6Notyt9D-2AGws1B87FiVCV0qQp1bxgD0qpLQY,390517
+topologicpy/Grid.py,sha256=9N6PE84qCm40TRi2WtlVZSBwXXr47zHpscEpZHg_JW4,18205
+topologicpy/Helper.py,sha256=Sv35czP_j0oLDeJcN8usswUm4U3auiK1LQ_Z_HBvxxg,21716
+topologicpy/Honeybee.py,sha256=HfTaEV1R8K1xOVQQy9sBOhBTF_ap8A2RxZOYhirp_Mw,21835
+topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
+topologicpy/Neo4j.py,sha256=t52hgE9cVsqkGc7m7fjRsLnyfRHakVHwdvF4ms7ow78,22342
+topologicpy/Plotly.py,sha256=-Ewc-MPR7wI0Ml_NHoBOMLAJQjFTZRAPbSvVcv9q_Wg,118227
+topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
+topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
+topologicpy/Shell.py,sha256=8OJjlWk9eCZ3uGOTht6ZVrcMczCafw-YWoDGueaz7eg,87673
+topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
+topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
+topologicpy/Topology.py,sha256=J1eTBp8esd9jwcQ4fY82uTjJtj6r9WiaGIZmevRxxDQ,406736
+topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
+topologicpy/Vertex.py,sha256=ZS6xK89JKokBKc0W8frdRhhuzR8c-dI1TTLt7pTf1iA,71032
+topologicpy/Wire.py,sha256=eVet2OToVsXi9AkDYo35LpfMPqJ6aKGD6QkiU4-Jvs8,182271
+topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
+topologicpy/version.py,sha256=_EZM97Nx9ZHcqJT-3j_L8-CxcswiiAnQpZx_aTh--Yc,23
+topologicpy-0.7.73.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.73.dist-info/METADATA,sha256=DXCQK7AXT5405KD8O3PBcTDNL0gEjLfwM802I_H8QH4,10493
+topologicpy-0.7.73.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+topologicpy-0.7.73.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.73.dist-info/RECORD,,

{topologicpy-0.7.71.dist-info → topologicpy-0.7.73.dist-info}/WHEEL

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

topologicpy-0.7.71.dist-info/RECORD

@@ -1,36 +0,0 @@
-topologicpy/ANN.py,sha256=XAuUjNvDRK1hhXfo82S-zXmnAPZGEdHJMRdfpu0aJ8I,47901
-topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
-topologicpy/BVH.py,sha256=dfVQyn5OPN1_50nusS0AxAcmUfqTzpl0vWT7RBEz-WM,12870
-topologicpy/Cell.py,sha256=2izd-YGqy897_JHHgrGlIo5WwUeEIWVD3KspV1z_sj8,107860
-topologicpy/CellComplex.py,sha256=ecGrxnczeBOaTTiYiVRsUpfGaYHhydyf_KhlxNk4t3w,47611
-topologicpy/Cluster.py,sha256=nuJtXpmwBtT8j9HeRORv0c4NIvqt7DcheY0nxB3nTq8,55664
-topologicpy/Color.py,sha256=FrxX2yILqWvYrqD8kBaknfMfOR_phJOmhvTvFc07bY4,18065
-topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
-topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
-topologicpy/Dictionary.py,sha256=cURg452wwk2WeSxWY46ncgAUo5XD1c2c5EtO6ESZHaY,27304
-topologicpy/Edge.py,sha256=--D035FBJa9hfPSPrPsNQluq1NHx7d3IGnklxbH-9qo,66928
-topologicpy/EnergyModel.py,sha256=AqTtmXE35SxvRXhG3vYAQd7GQDW-6HtjYPHua6ME4Eg,53762
-topologicpy/Face.py,sha256=vKtqoXmxLCC23QNg7Mk5PfFZACnbKh04vWRDoFCz1jw,124344
-topologicpy/Graph.py,sha256=CfyYvm-oFCURM3XpctekI-4qsOG2B6lZxgjD3WZlysQ,385478
-topologicpy/Grid.py,sha256=9N6PE84qCm40TRi2WtlVZSBwXXr47zHpscEpZHg_JW4,18205
-topologicpy/Helper.py,sha256=i-AfI29NMsZXBaymjilfvxQbuS3wpYbpPw4RWu1YCHs,16358
-topologicpy/Honeybee.py,sha256=HfTaEV1R8K1xOVQQy9sBOhBTF_ap8A2RxZOYhirp_Mw,21835
-topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
-topologicpy/Neo4j.py,sha256=t52hgE9cVsqkGc7m7fjRsLnyfRHakVHwdvF4ms7ow78,22342
-topologicpy/Plotly.py,sha256=cs0LBOVm6WerT_F4IcFvQSRq_fYB9eVwRKiH2ogBgAI,109785
-topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
-topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
-topologicpy/Shell.py,sha256=CyMXuHoua_-lGGOr-1bgZa1VGpNsBGOe-dmkwhek-xY,87639
-topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
-topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=9DPTumt9kr9Su5b3RE8l_gLQSRalYHqf79tVHiy_aQM,400055
-topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
-topologicpy/Vertex.py,sha256=ZS6xK89JKokBKc0W8frdRhhuzR8c-dI1TTLt7pTf1iA,71032
-topologicpy/Wire.py,sha256=Ci2RSYCL4JPEBDKjP9B-yFfxI73TnPVxY_1eDzy1Iog,182073
-topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=szrQeCdVCeZvANqYLZIpNzGjG1Hr4s6VgJvFSRkblPk,23
-topologicpy-0.7.71.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.71.dist-info/METADATA,sha256=X-lNLlqlnoe8kwm3_KNuE6y5MzmnSDTxTHcKplvOlTw,10493
-topologicpy-0.7.71.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-topologicpy-0.7.71.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.71.dist-info/RECORD,,